Revert "compositor-x11: Move the x11 event handler to the display loop"

This reverts commit 6deb09ef8a.

(Derek says he has an improved version in the works.)
dev
Bryce Harrington 10 years ago
parent e90ea44a02
commit 3bebe6461a
  1. 4
      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);

Loading…
Cancel
Save