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

Use wl_display_bind() for binding to globals

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-08-19 14:41:57 -04:00
parent d9551a3377
commit f790c79ec7
6 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-egl.c
+4 -3
View File
@@ -299,7 +299,7 @@ compositor_handle_visual(void *data,
switch (token) {
case WL_COMPOSITOR_VISUAL_PREMULTIPLIED_ARGB32:
d->premultiplied_argb_visual =
wl_visual_create(d->display, id, 1);
wl_display_bind(d->display, id, &wl_visual_interface);
break;
}
}
@@ -315,11 +315,12 @@ display_handle_global(struct wl_display *display, uint32_t id,
struct display *d = data;
if (strcmp(interface, "wl_compositor") == 0) {
d->compositor = wl_compositor_create(display, id, 1);
d->compositor =
wl_display_bind(display, id, &wl_compositor_interface);
wl_compositor_add_listener(d->compositor,
&compositor_listener, d);
} else if (strcmp(interface, "wl_shell") == 0) {
d->shell = wl_shell_create(display, id, 1);
d->shell = wl_display_bind(display, id, &wl_shell_interface);
}
}
clients/simple-shm.c
+8 -5
View File
@@ -152,7 +152,8 @@ compositor_handle_visual(void *data,
switch (token) {
case WL_COMPOSITOR_VISUAL_XRGB32:
d->xrgb_visual = wl_visual_create(d->display, id, 1);
d->xrgb_visual = wl_display_bind(d->display,
id, &wl_visual_interface);
break;
}
}
@@ -168,13 +169,14 @@ display_handle_global(struct wl_display *display, uint32_t id,
struct display *d = data;
if (strcmp(interface, "wl_compositor") == 0) {
d->compositor = wl_compositor_create(display, id, 1);
d->compositor =
wl_display_bind(display, id, &wl_compositor_interface);
wl_compositor_add_listener(d->compositor,
&compositor_listener, d);
} else if (strcmp(interface, "wl_shell") == 0) {
d->shell = wl_shell_create(display, id, 1);
d->shell = wl_display_bind(display, id, &wl_shell_interface);
} else if (strcmp(interface, "wl_shm") == 0) {
d->shm = wl_shm_create(display, id, 1);
d->shm = wl_display_bind(display, id, &wl_shm_interface);
}
}
@@ -192,6 +194,7 @@ static struct display *
create_display(void)
{
struct display *display;
int i;
display = malloc(sizeof *display);
display->display = wl_display_connect(NULL);
@@ -203,7 +206,7 @@ create_display(void)
wl_display_get_fd(display->display, event_mask_update, display);
while (!display->xrgb_visual)
while (display->xrgb_visual)
wl_display_roundtrip(display->display);
return display;