mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to work with scanner that doesn't hardcode wl_*

Browse Source 
This lets us drop the wl_ prefix for the un-officual screenshooter protocol.
This commit is contained in:
Kristian Høgsberg 2011-04-18 10:33:25 -04:00
parent 91342c6081
commit cf57dc52ff
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clients/screenshot.c
View File

@ -39,10 +39,10 @@ static void
handle_global(struct wl_display *display, uint32_t id, handle_global(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data) const char *interface, uint32_t version, void *data)
{ {
struct wl_screenshooter **screenshooter = data; struct screenshooter **screenshooter = data;
if (strcmp(interface, "screenshooter") == 0) if (strcmp(interface, "screenshooter") == 0)
*screenshooter = wl_screenshooter_create(display, id, 1); *screenshooter = screenshooter_create(display, id, 1);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -50,7 +50,7 @@ int main(int argc, char *argv[])
struct wl_display *display; struct wl_display *display;
GMainLoop *loop; GMainLoop *loop;
GSource *source; GSource *source;
struct wl_screenshooter *screenshooter; struct screenshooter *screenshooter;
display = wl_display_connect(NULL); display = wl_display_connect(NULL);
if (display == NULL) { if (display == NULL) {
@ -70,7 +70,7 @@ int main(int argc, char *argv[])
source = wl_glib_source_new(display); source = wl_glib_source_new(display);
g_source_attach(source, NULL); g_source_attach(source, NULL);
wl_screenshooter_shoot(screenshooter); screenshooter_shoot(screenshooter);
g_idle_add((GSourceFunc) g_main_loop_quit, loop); g_idle_add((GSourceFunc) g_main_loop_quit, loop);
g_main_loop_run(loop); g_main_loop_run(loop);

10
compositor/screenshooter.c
View File

@ -23,13 +23,13 @@
#include "compositor.h" #include "compositor.h"
#include "screenshooter-server-protocol.h" #include "screenshooter-server-protocol.h"
struct wl_screenshooter { struct screenshooter {
struct wl_object base; struct wl_object base;
struct wlsc_compositor *ec; struct wlsc_compositor *ec;
}; };
static void static void
screenshooter_shoot(struct wl_client *client, struct wl_screenshooter *shooter) screenshooter_shoot(struct wl_client *client, struct screenshooter *shooter)
{ {
struct wlsc_compositor *ec = shooter->ec; struct wlsc_compositor *ec = shooter->ec;
struct wlsc_output *output; struct wlsc_output *output;
@ -65,20 +65,20 @@ screenshooter_shoot(struct wl_client *client, struct wl_screenshooter *shooter)
} }
} }
struct wl_screenshooter_interface screenshooter_implementation = { struct screenshooter_interface screenshooter_implementation = {
screenshooter_shoot screenshooter_shoot
}; };
void void
screenshooter_create(struct wlsc_compositor *ec) screenshooter_create(struct wlsc_compositor *ec)
{ {
struct wl_screenshooter *shooter; struct screenshooter *shooter;
shooter = malloc(sizeof *shooter); shooter = malloc(sizeof *shooter);
if (shooter == NULL) if (shooter == NULL)
return; return;
shooter->base.interface = &wl_screenshooter_interface; shooter->base.interface = &screenshooter_interface;
shooter->base.implementation = shooter->base.implementation =
(void(**)(void)) &screenshooter_implementation; (void(**)(void)) &screenshooter_implementation;
shooter->ec = ec; shooter->ec = ec;