diff options
| author | Ran Benita <ran234@gmail.com> | 2012-10-03 19:41:22 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-10-06 21:41:58 +0200 |
| commit | 1a6b1e07881976b8972742fc9e404dc0830a79b7 (patch) | |
| tree | 5219a971af4d3cde1fed16e97cbd38fdf8554697 /test | |
| parent | fe1faa143e6a5d1dd423a33f7bc0aaf792b8fc40 (diff) | |
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/state.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/state.c b/test/state.c index 3da4c99..8cd11e0 100644 --- 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,10 +162,14 @@ 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); num_syms = xkb_state_key_get_syms(state, KEY_Q + EVDEV_OFFSET, &syms); |