GtkWidget::draw() - Document how to get the dirty region

[~andy/gtk] / gtk / gtkkeyhash.c

diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c
index 0bd8f16a2eb760b3c756518156dc4207c3de53cc..64d98aa53f77017c8d54c068bb577d83529583d7 100644 (file)
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -14,14 +14,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "config.h"
+
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"
-#include "gtkalias.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkKeyHashEntry GtkKeyHashEntry;
 
@@ -373,8 +373,9 @@ keyval_in_group (GdkKeymap  *keymap,
  * This means that fuzzy matches won't be considered if their keyval is 
  * present in the current group.
  * 
- * Return value: A #GSList of matching entries.
- **/
+ * Return value: A newly-allocated #GSList of matching entries.
+ *     Free with g_slist_free() when no longer needed.
+ */
 GSList *
 _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
                      guint16          hardware_keycode,
@@ -390,15 +391,32 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
   guint keyval;
   gint effective_group;
   gint level;
+  GdkModifierType modifiers;
   GdkModifierType consumed_modifiers;
+  GdkModifierType shift_group_mask;
+  gboolean group_mod_is_accel_mod = FALSE;
+  const GdkModifierType xmods = GDK_MOD2_MASK|GDK_MOD3_MASK|GDK_MOD4_MASK|GDK_MOD5_MASK;
+  const GdkModifierType vmods = GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK;
 
   /* We don't want Caps_Lock to affect keybinding lookups.
    */
   state &= ~GDK_LOCK_MASK;
-  
-  gdk_keymap_translate_keyboard_state (key_hash->keymap,
-                                      hardware_keycode, state, group,
-                                      &keyval, &effective_group, &level, &consumed_modifiers);
+
+  _gtk_translate_keyboard_accel_state (key_hash->keymap,
+                                       hardware_keycode, state, mask, group,
+                                       &keyval,
+                                       &effective_group, &level, &consumed_modifiers);
+
+  /* if the group-toggling modifier is part of the default accel mod
+   * mask, and it is active, disable it for matching
+   */
+  shift_group_mask = gdk_keymap_get_modifier_mask (key_hash->keymap,
+                                                   GDK_MODIFIER_INTENT_SHIFT_GROUP);
+  if (mask & shift_group_mask)
+    group_mod_is_accel_mod = TRUE;
+
+  gdk_keymap_map_virtual_modifiers (key_hash->keymap, &mask);
+  gdk_keymap_add_virtual_modifiers (key_hash->keymap, &state);
 
   GTK_NOTE (KEYBINDINGS,
            g_message ("Looking up keycode = %u, modifiers = 0x%04x,\n"
@@ -411,21 +429,29 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
       while (tmp_list)
        {
          GtkKeyHashEntry *entry = tmp_list->data;
-         GdkModifierType xmods, vmods;
-         
-         /* If the virtual super, hyper or meta modifiers are present, 
-          * they will also be mapped to some of the mod2 - mod5 modifiers, 
+
+         /* If the virtual Super, Hyper or Meta modifiers are present,
+          * they will also be mapped to some of the Mod2 - Mod5 modifiers,
           * so we compare them twice, ignoring either set.
+          * We accept combinations involving virtual modifiers only if they
+          * are mapped to separate modifiers; i.e. if Super and Hyper are
+          * both mapped to Mod4, then pressing a key that is mapped to Mod4
+          * will not match a Super+Hyper entry.
           */
-         xmods = GDK_MOD2_MASK|GDK_MOD3_MASK|GDK_MOD4_MASK|GDK_MOD5_MASK;
-         vmods = GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK;
-
-         if ((entry->modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask & ~vmods) ||
-             (entry->modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask & ~xmods))
+          modifiers = entry->modifiers;
+          if (gdk_keymap_map_virtual_modifiers (key_hash->keymap, &modifiers) &&
+             ((modifiers & ~consumed_modifiers & mask & ~vmods) == (state & ~consumed_modifiers & mask & ~vmods) ||
+              (modifiers & ~consumed_modifiers & mask & ~xmods) == (state & ~consumed_modifiers & mask & ~xmods)))
            {
              gint i;
 
-             if (keyval == entry->keyval) /* Exact match */
+             if (keyval == entry->keyval && /* Exact match */
+                  /* but also match for group if it is an accel mod, because
+                   * otherwise we can get multiple exact matches, some being
+                   * bogus */
+                  (!group_mod_is_accel_mod ||
+                   (state & shift_group_mask) == (entry->modifiers & shift_group_mask)))
+
                {
                  GTK_NOTE (KEYBINDINGS,
                            g_message ("  found exact match, keyval = %u, modifiers = 0x%04x",
@@ -445,8 +471,11 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
                {
                  for (i = 0; i < entry->n_keys; i++)
                    {
-                     if (entry->keys[i].keycode == hardware_keycode &&
-                         entry->keys[i].level == level) /* Match for all but group */
+                      if (entry->keys[i].keycode == hardware_keycode &&
+                          entry->keys[i].level == level &&
+                           /* Only match for group if it's an accel mod */
+                          (!group_mod_is_accel_mod ||
+                           entry->keys[i].group == effective_group))
                        {
                          GTK_NOTE (KEYBINDINGS,
                                    g_message ("  found group = %d, level = %d",