mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-02-15 22:05:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add glib main loop integration, use it in flower client.

Browse source
This commit is contained in:
Kristian Høgsberg 2008-11-07 14:27:23 -05:00
parent 7f77bd8fbe
commit fb59084fbf
9 changed files with 194 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pointer.c
View file

@ -98,15 +98,14 @@ draw_pointer(int width, int height)
}
static int
connection_update(struct wl_connection *connection,
uint32_t mask, void *data)
connection_update(uint32_t mask, void *data)
{
struct pollfd *p = data;
p->events = 0;
if (mask & WL_CONNECTION_READABLE)
if (mask & WL_DISPLAY_READABLE)
p->events |= POLLIN;
if (mask & WL_CONNECTION_WRITABLE)
if (mask & WL_DISPLAY_WRITABLE)
p->events |= POLLOUT;
return 0;
@ -142,13 +141,12 @@ int main(int argc, char *argv[])
return -1;
}
display = wl_display_create(socket_name,
connection_update, &p[0]);
display = wl_display_create(socket_name);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
}
p[0].fd = wl_display_get_fd(display);
p[0].fd = wl_display_get_fd(display, connection_update, &p[0]);
pointer.width = 16;
pointer.height = 16;
@ -168,9 +166,9 @@ int main(int argc, char *argv[])
poll(p, 1, -1);
mask = 0;
if (p[0].revents & POLLIN)
mask |= WL_CONNECTION_READABLE;
mask |= WL_DISPLAY_READABLE;
if (p[0].revents & POLLOUT)
mask |= WL_CONNECTION_WRITABLE;
mask |= WL_DISPLAY_WRITABLE;
wl_display_iterate(display, mask);
}