diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2015-01-27 14:12:56 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-01-27 14:12:56 -0800 |
| commit | 3bebe6461a9de5d8c5c7da0261c70cd250fa1fde (patch) | |
| tree | 98b44d0986ebf6ea8d67a14ef71fa81d6b1844bc | |
| parent | e90ea44a02e3652c0a310f8548a6f54a63649d60 (diff) | |
| download | weston-3bebe6461a9de5d8c5c7da0261c70cd250fa1fde.tar.gz weston-3bebe6461a9de5d8c5c7da0261c70cd250fa1fde.tar.bz2 weston-3bebe6461a9de5d8c5c7da0261c70cd250fa1fde.zip | |
Revert "compositor-x11: Move the x11 event handler to the display loop"
This reverts commit 6deb09ef8a72164947cdfa5f2414e292c7672c9c.
(Derek says he has an improved version in the works.)
| -rw-r--r-- | src/compositor-x11.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 194749e3..58634461 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -1470,7 +1470,6 @@ x11_compositor_create(struct wl_display *display, struct x11_compositor *c; struct x11_output *output; struct weston_config_section *section; - struct wl_event_loop *loop; xcb_screen_iterator_t s; int i, x = 0, output_count = 0; int width, height, scale, count; @@ -1596,9 +1595,8 @@ x11_compositor_create(struct wl_display *display, x = pixman_region32_extents(&output->base.region)->x2; } - loop = wl_display_get_event_loop(c->base.wl_display); c->xcb_source = - wl_event_loop_add_fd(loop, + wl_event_loop_add_fd(c->base.input_loop, xcb_get_file_descriptor(c->conn), WL_EVENT_READABLE, x11_compositor_handle_event, c); |