mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-x11: Move input creation before output

Browse Source 
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>
This commit is contained in:
Daniel Stone
2012-06-22 13:21:34 +01:00
committed by Kristian Høgsberg
parent abb9dcdd1f
commit 22815f9115
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-x11.c
+3 -3
View File
@@ -910,6 +910,9 @@ x11_compositor_create(struct wl_display *display,
config_file) < 0) config_file) < 0)
return NULL; return NULL;
if (x11_input_create(c, no_input) < 0)
return NULL;
for (i = 0, x = 0; i < count; i++) { for (i = 0, x = 0; i < count; i++) {
if (x11_compositor_create_output(c, x, 0, width, height, if (x11_compositor_create_output(c, x, 0, width, height,
fullscreen, no_input) < 0) fullscreen, no_input) < 0)
@@ -917,9 +920,6 @@ x11_compositor_create(struct wl_display *display,
x += width; x += width;
} }
if (x11_input_create(c, no_input) < 0)
return NULL;
c->xcb_source = c->xcb_source =
wl_event_loop_add_fd(c->base.input_loop, wl_event_loop_add_fd(c->base.input_loop,
xcb_get_file_descriptor(c->conn), xcb_get_file_descriptor(c->conn),