summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-06-01 12:13:58 +0100
committerKristian Høgsberg <krh@bitplanet.net>2012-06-01 10:37:17 -0400
commit8db796947f5111a498b5421a820c6628e986fca0 (patch)
tree57fd6ed317b0dea5f192151837e625eb1c6c2828
parent15643f627df36635568a5c93d0b101a6cfc5efb9 (diff)
Fix binding modifier lookup
Whoops, lost half of the shuffling around of masks and indexes. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r--src/compositor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 311bb15..d450ac3 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1768,11 +1768,11 @@ update_modifier_state(struct weston_seat *seat, uint32_t key, uint32_t state)
/* And update the modifier_state for bindings. */
mods_lookup = mods_depressed | mods_latched;
seat->modifier_state = 0;
- if ((mods_lookup & seat->xkb_info.ctrl_mod))
+ if (mods_lookup & (1 << seat->xkb_info.ctrl_mod))
seat->modifier_state |= MODIFIER_CTRL;
- if ((mods_lookup & seat->xkb_info.alt_mod))
+ if (mods_lookup & (1 << seat->xkb_info.alt_mod))
seat->modifier_state |= MODIFIER_ALT;
- if ((mods_lookup & seat->xkb_info.super_mod))
+ if (mods_lookup & (1 << seat->xkb_info.super_mod))
seat->modifier_state |= MODIFIER_SUPER;
/* Finally, notify the compositor that LEDs have changed. */