swc

commit 4151e5a61bfaceddd50cc30d3ed2785f5fa72b7e
parent 0c0b02572c2a0676b1297fe8c2d1df1bcc1b9208
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 19 Nov 2013 18:40:51 -0800

Add setup_compositor initialization function

Diffstat:
M
libswc/compositor.c
 | 
1
-
M
libswc/swc.c
 | 
8
++++++++

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -348,7 +348,6 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
     }
 
     swc_seat_add_event_sources(&compositor->seat, event_loop);
-    compositor->seat.keyboard.handler = swc_binding_handler;
     compositor->seat.pointer.handler = &pointer_handler;
     wl_signal_add(&compositor->seat.pointer.event_signal,
                   &compositor->pointer_listener);
diff --git a/libswc/swc.c b/libswc/swc.c
@@ -25,6 +25,7 @@
 #include "binding.h"
 #include "compositor.h"
 #include "shell.h"
+#include "window.h"
 
 static struct
 {
@@ -34,6 +35,11 @@ static struct
 struct swc_compositor * compositor = &swc.compositor;
 const struct swc_manager * swc_manager;
 
+static void setup_compositor()
+{
+    swc.compositor.seat.keyboard.handler = swc_binding_handler;
+}
+
 bool swc_initialize(struct wl_display * display,
                     const struct swc_manager * manager)
 {
@@ -59,6 +65,8 @@ bool swc_initialize(struct wl_display * display,
         goto error2;
     }
 
+    setup_compositor();
+
     return true;
 
   error2: