[gtk+] x11: Correct GroupSwitch mask
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] x11: Correct GroupSwitch mask
- Date: Sun, 4 Mar 2012 06:12:10 +0000 (UTC)
commit deea79f4e4b6033003353878283fb32a620aad5c
Author: Bastien Nocera <hadess hadess net>
Date: Wed Feb 29 16:15:10 2012 +0000
x11: Correct GroupSwitch mask
base | latched | locked is incorrect for the group mask,
and the clamping has already been applied.
https://bugzilla.gnome.org/show_bug.cgi?id=671070
gdk/x11/gdkdevice-xi2.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 4426a0e..80aa0b0 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -783,16 +783,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
}
if (group_state)
- {
- gint group;
-
- group = group_state->base | group_state->latched | group_state->locked;
-
- /* FIXME: do we need the XKB complications for this ? */
- group = CLAMP(group, 0, 3);
-
- state |= group << 13;
- }
+ state |= (group_state->effective) << 13;
return state;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]