Display an error when we come to the root.

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

diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c
index 2741545081793564b94cb48f90bdac4b68c5f9da..7265daa3c8049d147109c5e22114b6c01cd6de25 100644 (file)
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -147,7 +147,7 @@ key_hash_free_entry (GtkKeyHash      *key_hash,
     (*key_hash->destroy_notify) (entry->value);
   
   g_free (entry->keys);
-  g_free (entry);
+  g_slice_free (GtkKeyHashEntry, entry);
 }
 
 static void
@@ -202,7 +202,7 @@ _gtk_key_hash_add_entry (GtkKeyHash      *key_hash,
                         GdkModifierType  modifiers,
                         gpointer         value)
 {
-  GtkKeyHashEntry *entry = g_new (GtkKeyHashEntry, 1);
+  GtkKeyHashEntry *entry = g_slice_new (GtkKeyHashEntry);
 
   entry->value = value;
   entry->keyval = keyval;
@@ -358,8 +358,17 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
       while (tmp_list)
        {
          GtkKeyHashEntry *entry = tmp_list->data;
-
-         if ((entry->modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask))
+         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, 
+          * so we compare them twice, ignoring either set.
+          */
+         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 & ~vmods) == (state & ~consumed_modifiers & mask & ~vmods) ||
+             (entry->modifiers & ~consumed_modifiers & mask & ~xmods) == (state & ~consumed_modifiers & mask & ~xmods))
            {
              gint i;