Bump version to 3.13.91

Update NEWS
keybindings: Ignore extra modifier bits when matching iso_next_group
2014-09-03 14:03:45 +02:00 · 2014-09-02 18:11:31 +02:00
3 changed files with 21 additions and 3 deletions
--- a/13
+++ b/13
@@ -1,3 +1,16 @@
+3.13.91
+=======
+* Misc. bug fixes [Carlos; #735452]
+
+Contributors:
+  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
+  Rico Tzschichholz
+
+Translations:
+  Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR],
+  Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he],
+  Maria  Mavridou [el], Claude Paroz [fr]
+
 3.13.90
 =======
 * Only call XSync() once per frame [Rui; #728464]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [13])
-m4_define([mutter_micro_version], [90])
+m4_define([mutter_micro_version], [91])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1877,6 +1877,8 @@ process_iso_next_group (MetaDisplay *display,
 {
  MetaKeyBindingManager *keys = &display->key_binding_manager;
  gboolean activate;
+  guint32 keycode;
+  guint32 modifiers;
  int i;

  if (event->type == CLUTTER_KEY_RELEASE)
@@ -1884,10 +1886,13 @@ process_iso_next_group (MetaDisplay *display,

  activate = FALSE;

+  keycode = event->hardware_keycode;
+  modifiers = event->modifier_state & 0xff & ~keys->ignored_modifier_mask;
+
  for (i = 0; i < keys->n_iso_next_group_combos; ++i)
    {
-      if (event->hardware_keycode == keys->iso_next_group_combos[i].keycode &&
-          event->modifier_state == (unsigned int)keys->iso_next_group_combos[i].modifiers)
+      if (keycode == keys->iso_next_group_combos[i].keycode &&
+          modifiers == keys->iso_next_group_combos[i].modifiers)
        {
          /* If the signal handler returns TRUE the keyboard will
             remain frozen. It's the signal handler's responsibility
Author	SHA1	Message	Date
Florian Müllner	4b260d5d9f	Bump version to 3.13.91 Update NEWS	2014-09-03 14:03:45 +02:00
Rui Matos	c8f015c6d7	keybindings: Ignore extra modifier bits when matching iso_next_group Clutter events include the layout index codified into modifier_state, unlike XI2 device events, which means that we need to mask it out so that we can match successfully.	2014-09-02 18:11:31 +02:00