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 beca28d3c6954bff28a985d9a48edf345ee35286..7265daa3c8049d147109c5e22114b6c01cd6de25 100644 (file)
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -18,8 +18,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include <config.h>
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"
+#include "gtkalias.h"
 
 typedef struct _GtkKeyHashEntry GtkKeyHashEntry;
 
@@ -145,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
@@ -200,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;
@@ -330,6 +332,7 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
   GHashTable *keycode_hash = key_hash_get_keycode_hash (key_hash);
   GSList *keys = g_hash_table_lookup (keycode_hash, GUINT_TO_POINTER ((guint)hardware_keycode));
   GSList *results = NULL;
+  GSList *l;
   gboolean have_exact = FALSE;
   guint keyval;
   gint effective_group;
@@ -355,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;
 
@@ -373,7 +385,7 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
                    }
 
                  have_exact = TRUE;
-                 results = g_slist_prepend (results, entry->value);
+                 results = g_slist_prepend (results, entry);
                }
 
              if (!have_exact)
@@ -386,7 +398,7 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
                          GTK_NOTE (KEYBINDINGS,
                                    g_message ("  found group = %d, level = %d",
                                               entry->keys[i].group, entry->keys[i].level));
-                         results = g_slist_prepend (results, entry->value);
+                         results = g_slist_prepend (results, entry);
                          break;
                        }
                    }
@@ -397,7 +409,11 @@ _gtk_key_hash_lookup (GtkKeyHash      *key_hash,
        }
     }
 
-  return sort_lookup_results (results);
+  results = sort_lookup_results (results);
+  for (l = results; l; l = l->next)
+    l->data = ((GtkKeyHashEntry *)l->data)->value;
+
+  return results;
 }
 
 /**
@@ -421,6 +437,7 @@ _gtk_key_hash_lookup_keyval (GtkKeyHash     *key_hash,
   GdkKeymapKey *keys;
   gint n_keys;
   GSList *results = NULL;
+  GSList *l;
 
   if (!keyval)                 /* Key without symbol */
     return NULL;
@@ -440,7 +457,7 @@ _gtk_key_hash_lookup_keyval (GtkKeyHash     *key_hash,
          GtkKeyHashEntry *entry = entries->data;
 
          if (entry->keyval == keyval && entry->modifiers == modifiers)
-           results = g_slist_prepend (results, entry->value);
+           results = g_slist_prepend (results, entry);
 
          entries = entries->next;
        }
@@ -448,5 +465,9 @@ _gtk_key_hash_lookup_keyval (GtkKeyHash     *key_hash,
 
   g_free (keys);
          
-  return sort_lookup_results (results);
+  results = sort_lookup_results (results);
+  for (l = results; l; l = l->next)
+    l->data = ((GtkKeyHashEntry *)l->data)->value;
+
+  return results;
 }