[PATCH weston 1/9] Fix binding modifier lookup

Daniel Stone daniel at fooishbar.org
Fri Jun 1 04:13:58 PDT 2012


Whoops, lost half of the shuffling around of masks and indexes.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 src/compositor.c |    6 +++---
 1 file 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. */
-- 
1.7.10



More information about the wayland-devel mailing list