commit 4151e5a

Michael Forney  ·  2013-11-20 02:40:51 +0000 UTC
parent 0c0b025 
Add setup_compositor initialization function
2 files changed,  +8, -1
M libswc/compositor.c
M libswc/swc.c
M libswc/compositor.c
+0, -1 
1@@ -348,7 +348,6 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
2     }
3 
4     swc_seat_add_event_sources(&compositor->seat, event_loop);
5-    compositor->seat.keyboard.handler = swc_binding_handler;
6     compositor->seat.pointer.handler = &pointer_handler;
7     wl_signal_add(&compositor->seat.pointer.event_signal,
8                   &compositor->pointer_listener);
M libswc/swc.c
+8, -0 
 1@@ -25,6 +25,7 @@
 2 #include "binding.h"
 3 #include "compositor.h"
 4 #include "shell.h"
 5+#include "window.h"
 6 
 7 static struct
 8 {
 9@@ -34,6 +35,11 @@ static struct
10 struct swc_compositor * compositor = &swc.compositor;
11 const struct swc_manager * swc_manager;
12 
13+static void setup_compositor()
14+{
15+    swc.compositor.seat.keyboard.handler = swc_binding_handler;
16+}
17+
18 bool swc_initialize(struct wl_display * display,
19                     const struct swc_manager * manager)
20 {
21@@ -59,6 +65,8 @@ bool swc_initialize(struct wl_display * display,
22         goto error2;
23     }
24 
25+    setup_compositor();
26+
27     return true;
28 
29   error2: