diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-11-07 14:27:23 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-11-07 14:27:23 -0500 |
| commit | fb59084fbf03b738276579e121defcc6a586301d (patch) | |
| tree | c61fd19f2c181a0c00c4c3e2619a29f7f69ff2dc /background.c | |
| parent | 7f77bd8fbedee8a8a1fbb26776084ccaffc2a087 (diff) | |
Add glib main loop integration, use it in flower client.
Diffstat (limited to 'background.c')
| -rw-r--r-- | background.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/background.c b/background.c index 19748eb..429216d 100644 --- a/background.c +++ b/background.c @@ -94,15 +94,14 @@ static uint32_t name_pixbuf(int fd, GdkPixbuf *pixbuf) } 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; @@ -124,13 +123,13 @@ 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]); surface = wl_display_create_surface(display); @@ -153,9 +152,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); } |