state: fix bad EFFECTIVE check in *_is_active()

This is a regression introduced in ed78fbcb30888cbfc6cd00.
XKB_STATE_EFFECTIVE is just a OR of the other states, so using & here is
completely wrong. So test/state shows for example:
    dumping state for LCtrl down:
            group English (US) (0): effective depressed latched locked
            mod Control (2): depressed latched locked
    dumping state for LCtrl + RAlt down:
            group English (US) (0): effective depressed latched locked
            mod Control (2): depressed latched locked
            mod Mod1 (3): depressed latched locked
    dumping state for RAlt down:
            group English (US) (0): effective depressed latched locked
            mod Mod1 (3): depressed latched locked
    dumping state for Caps Lock:
            group English (US) (0): effective depressed latched locked
            mod Lock (1): depressed latched locked
            led Caps Lock (0): active
    dumping state for Alt-Shift-+
            group English (US) (0): effective depressed latched locked
            mod Shift (0): depressed latched locked
            mod Mod1 (3): depressed latched locked
which is bogus.

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

diff --git a/src/state.c b/src/state.c
index e186ece71dc4d5fa6f7fa664d83cc3cf2169ba5a..1fad36fdf6c897814baa7cdbdc1e44d7b2cd14d2 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -841,7 +841,7 @@ xkb_state_mod_index_is_active(struct xkb_state *state,
     if (idx >= xkb_keymap_num_mods(state->keymap))
         return -1;
 
-    if (type & XKB_STATE_EFFECTIVE)
+    if (type == XKB_STATE_EFFECTIVE)
         return !!(state->mods & (1 << idx));
 
     if (type & XKB_STATE_DEPRESSED)
@@ -978,7 +978,7 @@ xkb_state_layout_index_is_active(struct xkb_state *state,
         return -1;
 
     /* Can only have one effective group. */
-    if (type & XKB_STATE_EFFECTIVE)
+    if (type == XKB_STATE_EFFECTIVE)
         return state->group == idx;
 
     if (type & XKB_STATE_DEPRESSED)

diff --git a/test/state.c b/test/state.c
index 3da4c99778899e75048a5a198e2eba3b5ad6bf09..8cd11e0a33619b676617cb10bd5f83587c533ec6 100644 (file)
--- a/test/state.c
+++ b/test/state.c
@@ -149,6 +149,11 @@ test_update_key(struct xkb_keymap *keymap)
                                           XKB_MOD_NAME_CTRL,
                                           XKB_MOD_NAME_ALT,
                                           NULL) > 0);
+    assert(xkb_state_mod_names_are_active(state, XKB_STATE_LATCHED,
+                                          XKB_STATE_MATCH_ANY,
+                                          XKB_MOD_NAME_CTRL,
+                                          XKB_MOD_NAME_ALT,
+                                          NULL) == 0);
 
     /* none down */
     xkb_state_update_key(state, KEY_RIGHTALT + EVDEV_OFFSET, XKB_KEY_UP);
@@ -157,9 +162,13 @@ test_update_key(struct xkb_keymap *keymap)
 
     /* Caps locked */
     xkb_state_update_key(state, KEY_CAPSLOCK + EVDEV_OFFSET, XKB_KEY_DOWN);
+    assert(xkb_state_mod_name_is_active(state, XKB_MOD_NAME_CAPS,
+                                        XKB_STATE_DEPRESSED) > 0);
     xkb_state_update_key(state, KEY_CAPSLOCK + EVDEV_OFFSET, XKB_KEY_UP);
     fprintf(stderr, "dumping state for Caps Lock:\n");
     print_state(state);
+    assert(xkb_state_mod_name_is_active(state, XKB_MOD_NAME_CAPS,
+                                        XKB_STATE_DEPRESSED) == 0);
     assert(xkb_state_mod_name_is_active(state, XKB_MOD_NAME_CAPS,
                                         XKB_STATE_LOCKED) > 0);
     assert(xkb_state_led_name_is_active(state, XKB_LED_NAME_CAPS) > 0);