swc

commit 4b5d2a86499fb1f96f5699f1655f11380d83e97c
parent 211d941e66e642f63e294b543529c30cc144abb7
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 14 Jun 2013 01:23:54 -0700

Prefix modifier enums

Diffstat:
M
binding.h
 | 
10
+++++-----
M
compositor.c
 | 
2
+-

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/binding.h b/binding.h
@@ -4,11 +4,11 @@
 #include <stdint.h>
 #include <linux/input.h>
 
-#define MOD_CTRL    (1 << 0)
-#define MOD_ALT     (1 << 1)
-#define MOD_SUPER   (1 << 2)
-#define MOD_SHIFT   (1 << 3)
-#define MOD_ANY     (-1)
+#define SWC_MOD_CTRL    (1 << 0)
+#define SWC_MOD_ALT     (1 << 1)
+#define SWC_MOD_SUPER   (1 << 2)
+#define SWC_MOD_SHIFT   (1 << 3)
+#define SWC_MOD_ANY     (-1)
 
 typedef void (* swc_binding_handler_t)(uint32_t time, uint32_t value,
                                        void * data);
diff --git a/compositor.c b/compositor.c
@@ -73,7 +73,7 @@ static void handle_key(struct wl_keyboard_grab * grab, uint32_t time,
 
         wl_array_for_each(binding, &compositor->key_bindings)
         {
-            if (binding->value == keysym && (binding->modifiers == MOD_ANY
+            if (binding->value == keysym && (binding->modifiers == SWC_MOD_ANY
                 || binding->modifiers == seat->active_modifiers))
             {
                 binding->handler(time, keysym, binding->data);