x11: Move the xcb fd to the input loop

This way, we handle input just before repaint, similar to the drm backend.
Kristian Høgsberg 13 years ago
parent aa6019e125
commit 22ba60e514
  1. 6
      src/compositor-x11.c

@ -762,7 +762,6 @@ x11_compositor_create(struct wl_display *display,
int width, int height, int count, int fullscreen) int width, int height, int count, int fullscreen)
{ {
struct x11_compositor *c; struct x11_compositor *c;
struct wl_event_loop *loop;
xcb_screen_iterator_t s; xcb_screen_iterator_t s;
int i, x; int i, x;
@ -808,10 +807,9 @@ x11_compositor_create(struct wl_display *display,
if (x11_input_create(c) < 0) if (x11_input_create(c) < 0)
return NULL; return NULL;
loop = wl_display_get_event_loop(c->base.wl_display);
c->xcb_source = 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, WL_EVENT_READABLE,
x11_compositor_handle_event, c); x11_compositor_handle_event, c);
wl_event_source_check(c->xcb_source); wl_event_source_check(c->xcb_source);

Loading…
Cancel
Save