commit 4b5d2a8

Michael Forney  ·  2013-06-14 08:23:54 +0000 UTC
parent 211d941 
Prefix modifier enums
2 files changed,  +6, -6
M binding.h
M compositor.c
M binding.h
+5, -5 
 1@@ -4,11 +4,11 @@
 2 #include <stdint.h>
 3 #include <linux/input.h>
 4 
 5-#define MOD_CTRL    (1 << 0)
 6-#define MOD_ALT     (1 << 1)
 7-#define MOD_SUPER   (1 << 2)
 8-#define MOD_SHIFT   (1 << 3)
 9-#define MOD_ANY     (-1)
10+#define SWC_MOD_CTRL    (1 << 0)
11+#define SWC_MOD_ALT     (1 << 1)
12+#define SWC_MOD_SUPER   (1 << 2)
13+#define SWC_MOD_SHIFT   (1 << 3)
14+#define SWC_MOD_ANY     (-1)
15 
16 typedef void (* swc_binding_handler_t)(uint32_t time, uint32_t value,
17                                        void * data);
M compositor.c
+1, -1 
1@@ -73,7 +73,7 @@ static void handle_key(struct wl_keyboard_grab * grab, uint32_t time,
2 
3         wl_array_for_each(binding, &compositor->key_bindings)
4         {
5-            if (binding->value == keysym && (binding->modifiers == MOD_ANY
6+            if (binding->value == keysym && (binding->modifiers == SWC_MOD_ANY
7                 || binding->modifiers == seat->active_modifiers))
8             {
9                 binding->handler(time, keysym, binding->data);