swc

commit 1f848d1cbea3cf6bde85a85d592bc550a13ed012
parent 7332f3acf23a32e1d3ae77e2057724e42fe984e7
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 24 Nov 2013 02:22:28 -0800

keyboard: Remove modifier sub-struct

Diffstat:
M
libswc/keyboard.c
 | 
17
++++++++---------
M
libswc/keyboard.h
 | 
13
+++++--------

2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/libswc/keyboard.c b/libswc/keyboard.c
@@ -160,13 +160,12 @@ void swc_keyboard_handle_key(struct swc_keyboard * keyboard, uint32_t time,
     mods_latched = xkb_state_serialize_mods(xkb->state, XKB_STATE_LATCHED);
     mods_locked = xkb_state_serialize_mods(xkb->state, XKB_STATE_LOCKED);
     mods_active = mods_depressed | mods_latched;
-
     group = xkb_state_serialize_layout(xkb->state, XKB_STATE_LAYOUT_EFFECTIVE);
 
-    if (mods_depressed != keyboard->modifiers.mods_depressed
-        || mods_latched != keyboard->modifiers.mods_latched
-        || mods_locked != keyboard->modifiers.mods_locked
-        || group != keyboard->modifiers.group)
+    if (mods_depressed != keyboard->mods_depressed
+        || mods_latched != keyboard->mods_latched
+        || mods_locked != keyboard->mods_locked
+        || group != keyboard->group)
     {
         if (keyboard->focus.resource)
         {
@@ -177,9 +176,9 @@ void swc_keyboard_handle_key(struct swc_keyboard * keyboard, uint32_t time,
         }
     }
 
-    keyboard->modifiers.mods_depressed = mods_depressed;
-    keyboard->modifiers.mods_latched = mods_latched;
-    keyboard->modifiers.mods_locked = mods_locked;
-    keyboard->modifiers.group = group;
+    keyboard->mods_depressed = mods_depressed;
+    keyboard->mods_latched = mods_latched;
+    keyboard->mods_locked = mods_locked;
+    keyboard->group = group;
 }
 
diff --git a/libswc/keyboard.h b/libswc/keyboard.h
@@ -28,15 +28,12 @@ struct swc_keyboard
     const struct swc_keyboard_handler * handler;
 
     struct swc_xkb xkb;
-    struct wl_array keys;
 
-    struct
-    {
-            uint32_t mods_depressed;
-            uint32_t mods_latched;
-            uint32_t mods_locked;
-            uint32_t group;
-    } modifiers;
+    struct wl_array keys;
+    uint32_t mods_depressed;
+    uint32_t mods_latched;
+    uint32_t mods_locked;
+    uint32_t group;
 };
 
 bool swc_keyboard_initialize(struct swc_keyboard * keyboard);