From 22ba60e514e074e4bdee1529aa8d22600712f001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 12 Mar 2012 01:18:24 -0400 Subject: [PATCH] x11: Move the xcb fd to the input loop This way, we handle input just before repaint, similar to the drm backend. --- src/compositor-x11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index c227063b..fe147c71 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -762,7 +762,6 @@ x11_compositor_create(struct wl_display *display, int width, int height, int count, int fullscreen) { struct x11_compositor *c; - struct wl_event_loop *loop; xcb_screen_iterator_t s; int i, x; @@ -808,10 +807,9 @@ x11_compositor_create(struct wl_display *display, if (x11_input_create(c) < 0) return NULL; - loop = wl_display_get_event_loop(c->base.wl_display); - c->xcb_source = - wl_event_loop_add_fd(loop, xcb_get_file_descriptor(c->conn), + wl_event_loop_add_fd(c->base.input_loop, + xcb_get_file_descriptor(c->conn), WL_EVENT_READABLE, x11_compositor_handle_event, c); wl_event_source_check(c->xcb_source);