[gtk+] wayland: Fix the map_virtual_modifiers implementation
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Fix the map_virtual_modifiers implementation
- Date: Sun, 17 Apr 2016 03:20:32 +0000 (UTC)
commit 5ba8a25d2966dc2cdc67a350d4ea6c4ecb293919
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 16 23:16:12 2016 -0400
wayland: Fix the map_virtual_modifiers implementation
We were not stripping real modifiers out, and thus always
thought there's a conflict when the passed in modifiers
included any real modifiers.
gdk/wayland/gdkkeys-wayland.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index d73199f..eee2907 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -420,7 +420,7 @@ gdk_wayland_keymap_map_virtual_modifiers (GdkKeymap *keymap,
mods = get_xkb_modifiers (xkb_keymap, *state);
xkb_state = xkb_state_new (xkb_keymap);
- xkb_state_update_mask (xkb_state, mods, 0, 0, 0, 0, 0);
+ xkb_state_update_mask (xkb_state, mods & ~0xff, 0, 0, 0, 0, 0);
mapped = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_EFFECTIVE);
if ((mapped & mods & 0xff) != 0)
ret = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]