commit ffdbaf6

Style

 1@@ -36,7 +36,10 @@ struct binding
 2     void * data;
 3 };
 4 
 5-static struct wl_array key_bindings;
 6+static struct
 7+{
 8+    struct wl_array keys;
 9+} bindings;
10 
11 static bool handle_key(struct swc_keyboard * keyboard, uint32_t time,
12                        uint32_t key, uint32_t state)
13@@ -58,7 +61,7 @@ static bool handle_key(struct swc_keyboard * keyboard, uint32_t time,
14 
15         if (num_keysyms == 1)
16         {
17-            wl_array_for_each(binding, &key_bindings)
18+            wl_array_for_each(binding, &bindings.keys)
19             {
20                 if (binding->value == keysyms[0]
21                     && (binding->modifiers == keyboard->modifiers
22@@ -79,20 +82,20 @@ static struct swc_keyboard_handler binding_handler = {
23     .key = &handle_key,
24 };
25 
26-const struct swc_bindings_global swc_bindings_global = {
27+const struct swc_bindings_global bindings_global = {
28     .keyboard_handler = &binding_handler
29 };
30 
31 bool swc_bindings_initialize()
32 {
33-    wl_array_init(&key_bindings);
34+    wl_array_init(&bindings.keys);
35 
36     return true;
37 }
38 
39 void swc_bindings_finalize()
40 {
41-    wl_array_release(&key_bindings);
42+    wl_array_release(&bindings.keys);
43 }
44 
45 EXPORT
46@@ -101,7 +104,7 @@ void swc_add_key_binding(uint32_t modifiers, uint32_t value,
47 {
48     struct binding * binding;
49 
50-    binding = wl_array_add(&key_bindings, sizeof *binding);
51+    binding = wl_array_add(&bindings.keys, sizeof *binding);
52     binding->value = value;
53     binding->modifiers = modifiers;
54     binding->handler = handler;

 1@@ -69,7 +69,7 @@ struct swc_drm_buffer * swc_drm_buffer_get(struct wl_resource * resource)
 2     {
 3         return wl_resource_get_user_data(resource);
 4     }
 5-    else
 6-        return NULL;
 7+
 8+    return NULL;
 9 }
10 

1@@ -28,7 +28,7 @@ static struct
2     struct wl_list devices;
3 } seat;
4 
5-const struct swc_seat_global swc_seat_global = {
6+const struct swc_seat_global seat_global = {
7     .pointer = &seat.pointer,
8     .keyboard = &seat.keyboard,
9     .data_device = &seat.data_device

 1@@ -37,13 +37,13 @@
 2 
 3 #include <libudev.h>
 4 
 5-extern const struct swc_seat_global swc_seat_global;
 6-extern const struct swc_bindings_global swc_bindings_global;
 7+extern const struct swc_seat_global seat_global;
 8+extern const struct swc_bindings_global bindings_global;
 9 static struct swc_compositor compositor;
10 
11 struct swc swc = {
12-    .seat = &swc_seat_global,
13-    .bindings = &swc_bindings_global,
14+    .seat = &seat_global,
15+    .bindings = &bindings_global,
16     .compositor = &compositor
17 };
18