[PATCH weston 07/14] compositor-x11: Move input creation before output

[Daniel Stone]

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 at fooishbar.org>
---
 src/compositor-x11.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index d50261d..d8dbacb 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),
-- 
1.7.10