commit 7332f3a

Michael Forney  ·  2013-11-24 10:15:25 +0000 UTC
parent 9acb8bf
Move binding struct from swc.h -> binding.c
2 files changed,  +10, -10
+10, -2
 1@@ -28,12 +28,20 @@
 2 
 3 #include <wayland-util.h>
 4 
 5+struct binding
 6+{
 7+    uint32_t value;
 8+    uint32_t modifiers;
 9+    swc_binding_handler_t handler;
10+    void * data;
11+};
12+
13 static struct wl_array key_bindings;
14 
15 static bool handle_key(struct swc_keyboard * keyboard, uint32_t time,
16                        uint32_t key, uint32_t state)
17 {
18-    struct swc_binding * binding;
19+    struct binding * binding;
20     char keysym_name[64];
21 
22     if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
23@@ -97,7 +105,7 @@ EXPORT
24 void swc_add_key_binding(uint32_t modifiers, uint32_t value,
25                          swc_binding_handler_t handler, void * data)
26 {
27-    struct swc_binding * binding;
28+    struct binding * binding;
29 
30     binding = wl_array_add(&key_bindings, sizeof *binding);
31     binding->value = value;
+0, -8
 1@@ -170,14 +170,6 @@ struct swc_screen
 2 typedef void (* swc_binding_handler_t)(uint32_t time, uint32_t value,
 3                                        void * data);
 4 
 5-struct swc_binding
 6-{
 7-    uint32_t value;
 8-    uint32_t modifiers;
 9-    swc_binding_handler_t handler;
10-    void * data;
11-};
12-
13 void swc_add_key_binding(uint32_t modifiers, uint32_t value,
14                          swc_binding_handler_t handler, void * data);
15