From: Ran Benita <ran234@gmail.com>
Date: Fri, 23 Mar 2012 15:50:37 +0000 (+0200)
Subject: Handle group lock actions
X-Git-Tag: xkbcommon-0.2.0~681
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fa7fdd0895a38528a91ae00d24360c8a185b783;p=platform%2Fupstream%2Flibxkbcommon.git

Handle group lock actions

The spec is simple here, as this action has no effect on key releases.

Signed-off-by: Ran Benita <ran234@gmail.com>
---

diff --git a/src/state.c b/src/state.c
index 52b2301..ff5cd09 100644
--- a/src/state.c
+++ b/src/state.c
@@ -186,6 +186,45 @@ xkb_filter_group_set_new(struct xkb_state *state, xkb_keycode_t keycode,
 }
 
 static int
+xkb_filter_group_lock_func(struct xkb_filter *filter, xkb_keycode_t keycode,
+                           int down)
+{
+    if (keycode != filter->keycode)
+        return 1;
+
+    if (down) {
+        filter->refcnt++;
+        return 0;
+    }
+    if (--filter->refcnt > 0)
+        return 0;
+
+    filter->func = NULL;
+    return 1;
+}
+
+static int
+xkb_filter_group_lock_new(struct xkb_state *state, xkb_keycode_t keycode,
+                          union xkb_action *action)
+{
+    struct xkb_filter *filter = xkb_filter_new(state);
+
+    if (!filter)
+        return 0;
+
+    filter->keycode = keycode;
+    filter->func = xkb_filter_group_lock_func;
+    filter->action = *action;
+
+    if (action->group.flags & XkbSA_GroupAbsolute)
+        filter->state->locked_group = action->group.group;
+    else
+        filter->state->locked_group += action->group.group;
+
+    return 1;
+}
+
+static int
 xkb_filter_mod_set_func(struct xkb_filter *filter, xkb_keycode_t keycode,
                         enum xkb_key_direction direction)
 {
@@ -411,10 +450,10 @@ xkb_filter_apply_all(struct xkb_state *state, xkb_keycode_t key,
     case XkbSA_LatchGroup:
         send = xkb_filter_mod_latch_new(state, key, act);
         break;
+#endif
     case XkbSA_LockGroup:
         send = xkb_filter_group_lock_new(state, key, act);
         break;
-#endif
     }
 
     return;