diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-06-22 13:21:34 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-06-22 11:52:06 -0400 |
| commit | 22815f9115a6f03fd7be7009beaabe9490e5b927 (patch) | |
| tree | 065cbdde16dc69728c0a9ecd12125a6f723594dc | |
| parent | abb9dcdd1fc7431c191d3fc3987bb50d97e673f6 (diff) | |
compositor-x11: Move input creation before output
So we can set up XKB masks and be sure to get the right events before
we set up our window.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | src/compositor-x11.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index d50261dc..d8dbacbf 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -910,6 +910,9 @@ x11_compositor_create(struct wl_display *display, config_file) < 0) return NULL; + if (x11_input_create(c, no_input) < 0) + return NULL; + for (i = 0, x = 0; i < count; i++) { if (x11_compositor_create_output(c, x, 0, width, height, fullscreen, no_input) < 0) @@ -917,9 +920,6 @@ x11_compositor_create(struct wl_display *display, x += width; } - if (x11_input_create(c, no_input) < 0) - return NULL; - c->xcb_source = wl_event_loop_add_fd(c->base.input_loop, xcb_get_file_descriptor(c->conn), |