Commit 3fa7fdd0895a38528a91ae00d24360c8a185b783
2012-03-23T17:50:37
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>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
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;