commit 1f848d1

Michael Forney  ·  2013-11-24 10:22:28 +0000 UTC
parent 7332f3a 
keyboard: Remove modifier sub-struct
2 files changed,  +13, -17
M libswc/keyboard.c
M libswc/keyboard.h
M libswc/keyboard.c
+8, -9 
 1@@ -160,13 +160,12 @@ void swc_keyboard_handle_key(struct swc_keyboard * keyboard, uint32_t time,
 2     mods_latched = xkb_state_serialize_mods(xkb->state, XKB_STATE_LATCHED);
 3     mods_locked = xkb_state_serialize_mods(xkb->state, XKB_STATE_LOCKED);
 4     mods_active = mods_depressed | mods_latched;
 5-
 6     group = xkb_state_serialize_layout(xkb->state, XKB_STATE_LAYOUT_EFFECTIVE);
 7 
 8-    if (mods_depressed != keyboard->modifiers.mods_depressed
 9-        || mods_latched != keyboard->modifiers.mods_latched
10-        || mods_locked != keyboard->modifiers.mods_locked
11-        || group != keyboard->modifiers.group)
12+    if (mods_depressed != keyboard->mods_depressed
13+        || mods_latched != keyboard->mods_latched
14+        || mods_locked != keyboard->mods_locked
15+        || group != keyboard->group)
16     {
17         if (keyboard->focus.resource)
18         {
19@@ -177,9 +176,9 @@ void swc_keyboard_handle_key(struct swc_keyboard * keyboard, uint32_t time,
20         }
21     }
22 
23-    keyboard->modifiers.mods_depressed = mods_depressed;
24-    keyboard->modifiers.mods_latched = mods_latched;
25-    keyboard->modifiers.mods_locked = mods_locked;
26-    keyboard->modifiers.group = group;
27+    keyboard->mods_depressed = mods_depressed;
28+    keyboard->mods_latched = mods_latched;
29+    keyboard->mods_locked = mods_locked;
30+    keyboard->group = group;
31 }
32
M libswc/keyboard.h
+5, -8 
 1@@ -28,15 +28,12 @@ struct swc_keyboard
 2     const struct swc_keyboard_handler * handler;
 3 
 4     struct swc_xkb xkb;
 5-    struct wl_array keys;
 6 
 7-    struct
 8-    {
 9-            uint32_t mods_depressed;
10-            uint32_t mods_latched;
11-            uint32_t mods_locked;
12-            uint32_t group;
13-    } modifiers;
14+    struct wl_array keys;
15+    uint32_t mods_depressed;
16+    uint32_t mods_latched;
17+    uint32_t mods_locked;
18+    uint32_t group;
19 };
20 
21 bool swc_keyboard_initialize(struct swc_keyboard * keyboard);