Convert Weston modifier #defines to an enum
To avoid any possible collision between the disparate XKB and Weston
modifier namespaces.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/compositor.h b/src/compositor.h
index 40301ae..8cf0ce8 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -48,6 +48,12 @@
struct weston_seat;
struct weston_output;
+enum weston_keyboard_modifier {
+ MODIFIER_CTRL = (1 << 0),
+ MODIFIER_ALT = (1 << 1),
+ MODIFIER_SUPER = (1 << 2),
+};
+
struct weston_mode {
uint32_t flags;
int32_t width, height;
@@ -161,7 +167,7 @@
struct wl_listener drag_surface_destroy_listener;
int32_t hotspot_x, hotspot_y;
struct wl_list link;
- uint32_t modifier_state;
+ enum weston_keyboard_modifier modifier_state;
int hw_cursor;
struct wl_surface *saved_kbd_focus;
struct wl_listener saved_kbd_focus_listener;
@@ -299,10 +305,6 @@
} xkb_info;
};
-#define MODIFIER_CTRL (1 << 8)
-#define MODIFIER_ALT (1 << 9)
-#define MODIFIER_SUPER (1 << 10)
-
enum weston_output_flags {
WL_OUTPUT_FLIPPED = 0x01
};
@@ -513,7 +515,7 @@
struct weston_binding *
weston_compositor_add_binding(struct weston_compositor *compositor,
uint32_t key, uint32_t button, uint32_t axis,
- uint32_t modifier,
+ enum weston_keyboard_modifier modifier,
weston_binding_handler_t binding, void *data);
void
weston_binding_destroy(struct weston_binding *binding);