From e85d651ca9469b328c352373f668101f701f13ea Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Tue, 5 May 2015 22:40:13 +0200

Subject: [PATCH 01/16] Revert "accel-parse: Use libxkbcommon for keysym

 parsing"

This reverts commit e70f336a0970ca9e971218746560af0a2a7fee97.

---

 src/core/meta-accel-parse.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/meta-accel-parse.c b/src/core/meta-accel-parse.c

index f4c5ee0..25d00d9 100644

--- a/src/core/meta-accel-parse.c

+++ b/src/core/meta-accel-parse.c

@@ -26,7 +26,7 @@

 #include "meta-accel-parse.h"

-#include <xkbcommon/xkbcommon.h>

+#include <gtk/gtk.h>

 #include <string.h>

 #include <stdlib.h>

@@ -306,8 +306,8 @@ accelerator_parse (const gchar         *accelerator,

             }

           else

 	    {

-              keyval = xkb_keysym_from_name (accelerator, XKB_KEYSYM_CASE_INSENSITIVE);

-	      if (keyval == XKB_KEY_NoSymbol)

+	      keyval = gdk_keyval_from_name (accelerator);

+	      if (keyval == GDK_KEY_VoidSymbol)

 	        {

                   char *with_xf86 = g_strconcat ("XF86", accelerator, NULL);

                   keyval = xkb_keysym_from_name (with_xf86, XKB_KEYSYM_CASE_INSENSITIVE);

@@ -331,7 +331,7 @@ out:

     return FALSE;

   if (accelerator_key)

-    *accelerator_key = keyval;

+    *accelerator_key = gdk_keyval_to_lower (keyval);

   if (accelerator_keycode)

     *accelerator_keycode = keycode;

   if (accelerator_mods)

-- 

2.3.6

From 978393bae8ff406608c6e5220ad188cbc2495215 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Tue, 5 May 2015 23:02:14 +0200

Subject: [PATCH 02/16] meta-accel-parse: Use GDK instead of xkb

---

 src/core/meta-accel-parse.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/meta-accel-parse.c b/src/core/meta-accel-parse.c

index 25d00d9..22178b9 100644

--- a/src/core/meta-accel-parse.c

+++ b/src/core/meta-accel-parse.c

@@ -310,10 +310,10 @@ accelerator_parse (const gchar         *accelerator,

 	      if (keyval == GDK_KEY_VoidSymbol)

 	        {

                   char *with_xf86 = g_strconcat ("XF86", accelerator, NULL);

-                  keyval = xkb_keysym_from_name (with_xf86, XKB_KEYSYM_CASE_INSENSITIVE);

+                  keyval = gdk_keyval_from_name (with_xf86);

                   g_free (with_xf86);

-                  if (keyval == XKB_KEY_NoSymbol)

+                  if (keyval == GDK_KEY_VoidSymbol)

                     {

                       error = TRUE;

                       goto out;

-- 

2.3.6

From 8d8d7f19870ab188a71056f190902a2d4c763c85 Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:01:49 +0100

Subject: [PATCH 03/16] Revert "keybindings: Do a breadth first search in our

 keysym to keycode code"

This reverts commit 60c22b62366d737f7f6eabe7d46fa682c6f400d7.

---

 src/core/keybindings-private.h |  2 --

 src/core/keybindings.c         | 71 +++++++++++++-----------------------------

 2 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h

index 359aeff..aadb294 100644

--- a/src/core/keybindings-private.h

+++ b/src/core/keybindings-private.h

@@ -101,8 +101,6 @@ typedef struct

   MetaKeyCombo *iso_next_group_combos;

   int n_iso_next_group_combos;

-  xkb_level_index_t keymap_num_levels;

-

   /* Alt+click button grabs */

   ClutterModifierType window_grab_modifiers;

 } MetaKeyBindingManager;

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index cdc6556..9c03bef 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -240,19 +240,29 @@ reload_modmap (MetaKeyBindingManager *keys)

 static gboolean

 is_keycode_for_keysym (struct xkb_keymap *keymap,

-                       xkb_layout_index_t layout,

-                       xkb_level_index_t  level,

                        xkb_keycode_t      keycode,

                        xkb_keysym_t       keysym)

 {

-  const xkb_keysym_t *syms;

-  int num_syms, k;

+  xkb_layout_index_t num_layouts, i;

-  num_syms = xkb_keymap_key_get_syms_by_level (keymap, keycode, layout, level, &syms);

-  for (k = 0; k < num_syms; k++)

+  num_layouts = xkb_keymap_num_layouts_for_key (keymap, keycode);

+  for (i = 0; i < num_layouts; i++)

     {

-      if (syms[k] == keysym)

-        return TRUE;

+      xkb_level_index_t num_levels, j;

+

+      num_levels = xkb_keymap_num_levels_for_key (keymap, keycode, i);

+      for (j = 0; j < num_levels; j++)

+        {

+          const xkb_keysym_t *syms;

+          int num_syms, k;

+

+          num_syms = xkb_keymap_key_get_syms_by_level (keymap, keycode, i, j, &syms);

+          for (k = 0; k < num_syms; k++)

+            {

+              if (syms[k] == keysym)

+                return TRUE;

+            }

+        }

     }

   return FALSE;

@@ -262,8 +272,6 @@ typedef struct

 {

   GArray *keycodes;

   xkb_keysym_t keysym;

-  xkb_layout_index_t layout;

-  xkb_level_index_t level;

 } FindKeysymData;

 static void

@@ -274,10 +282,8 @@ get_keycodes_for_keysym_iter (struct xkb_keymap *keymap,

   FindKeysymData *search_data = data;

   GArray *keycodes = search_data->keycodes;

   xkb_keysym_t keysym = search_data->keysym;

-  xkb_layout_index_t layout = search_data->layout;

-  xkb_level_index_t level = search_data->level;

-  if (is_keycode_for_keysym (keymap, layout, level, keycode, keysym))

+  if (is_keycode_for_keysym (keymap, keycode, keysym))

     g_array_append_val (keycodes, keycode);

 }

@@ -305,15 +311,8 @@ get_keycodes_for_keysym (MetaKeyBindingManager  *keys,

   {

     MetaBackend *backend = meta_get_backend ();

     struct xkb_keymap *keymap = meta_backend_get_keymap (backend);

-    xkb_layout_index_t i;

-    xkb_level_index_t j;

-

-    for (i = 0; i < xkb_keymap_num_layouts (keymap); i++)

-      for (j = 0; j < keys->keymap_num_levels; j++)

-        {

-          FindKeysymData search_data = { retval, keysym, i, j };

-          xkb_keymap_key_for_each (keymap, get_keycodes_for_keysym_iter, &search_data);

-        }

+    FindKeysymData search_data = { retval, keysym };

+    xkb_keymap_key_for_each (keymap, get_keycodes_for_keysym_iter, &search_data);

   }

  out:

@@ -342,32 +341,6 @@ get_first_keycode_for_keysym (MetaKeyBindingManager *keys,

 }

 static void

-determine_keymap_num_levels_iter (struct xkb_keymap *keymap,

-                                  xkb_keycode_t      keycode,

-                                  void              *data)

-{

-  xkb_level_index_t *num_levels = data;

-  xkb_layout_index_t i;

-

-  for (i = 0; i < xkb_keymap_num_layouts_for_key (keymap, keycode); i++)

-    {

-      xkb_level_index_t level = xkb_keymap_num_levels_for_key (keymap, keycode, i);

-      if (level > *num_levels)

-        *num_levels = level;

-    }

-}

-

-static void

-determine_keymap_num_levels (MetaKeyBindingManager *keys)

-{

-  MetaBackend *backend = meta_get_backend ();

-  struct xkb_keymap *keymap = meta_backend_get_keymap (backend);

-

-  keys->keymap_num_levels = 0;

-  xkb_keymap_key_for_each (keymap, determine_keymap_num_levels_iter, &keys->keymap_num_levels);

-}

-

-static void

 reload_iso_next_group_combos (MetaKeyBindingManager *keys)

 {

   const char *iso_next_group_option;

@@ -515,8 +488,6 @@ reload_keycodes (MetaKeyBindingManager *keys)

   meta_topic (META_DEBUG_KEYBINDINGS,

               "Reloading keycodes for binding tables\n");

-  determine_keymap_num_levels (keys);

-

   if (keys->overlay_key_combo.keysym != 0)

     {

       keys->overlay_key_combo.keycode =

-- 

2.3.6

From 498e4eb5c0363bce78d1e7ad706fbf92fa414284 Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:01:55 +0100

Subject: [PATCH 04/16] Revert "keybindings: Fix indentation"

This reverts commit 4a71621fbcaaa0d7992d6e86e54f872e0f737bae.

---

 src/core/keybindings.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index 9c03bef..e8a97b1 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -323,7 +323,7 @@ get_keycodes_for_keysym (MetaKeyBindingManager  *keys,

 static guint

 get_first_keycode_for_keysym (MetaKeyBindingManager *keys,

-                              guint                  keysym)

+                              guint                   keysym)

 {

   int *keycodes;

   int n_keycodes;

-- 

2.3.6

From 9b8c5d718fbf807d89143ecd27771c5462fa829a Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:01:57 +0100

Subject: [PATCH 05/16] Revert "keybindings: Do not depend on linux headers for

 above-tab key"

This reverts commit 565b9d73d532c7759fce432eb5c397ff535ac0ff.

---

 src/core/keybindings.c | 4 ----

 1 file changed, 4 deletions(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index e8a97b1..5296fd7 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -40,11 +40,7 @@

 #include <meta/prefs.h>

 #include "meta-accel-parse.h"

-#ifdef __linux__

 #include <linux/input.h>

-#elif !defined KEY_GRAVE

-#define KEY_GRAVE 0x29 /* assume the use of xf86-input-keyboard */

-#endif

 #include "backends/x11/meta-backend-x11.h"

 #include "x11/window-x11.h"

-- 

2.3.6

From 0c2b7ee2381127907c1d114cd336a7d0bc0a9208 Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:02:01 +0100

Subject: [PATCH 06/16] Revert "keybindings: Make sure to filter out the

 virtualized mod itself"

This reverts commit 8a0da1cb0775607e0738b93792225d499e6545f2.

---

 src/core/keybindings.c | 5 ++---

 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index 5296fd7..e269424 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -213,9 +213,8 @@ reload_modmap (MetaKeyBindingManager *keys)

       if (idx != XKB_MOD_INVALID)

         {

-          xkb_mod_mask_t vmodmask = (1 << idx);

-          xkb_state_update_mask (scratch_state, vmodmask, 0, 0, 0, 0, 0);

-          *mask_p = xkb_state_serialize_mods (scratch_state, XKB_STATE_MODS_DEPRESSED) & ~vmodmask;

+          xkb_state_update_mask (scratch_state, 1 << idx, 0, 0, 0, 0, 0);

+          *mask_p = xkb_state_serialize_mods (scratch_state, XKB_STATE_MODS_DEPRESSED);

         }

       else

         *mask_p = 0;

-- 

2.3.6

From c1d2de6932ae492dfb7f214b0f951d7a7a5af361 Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:02:02 +0100

Subject: [PATCH 07/16] Revert "keybindings: Use a less hacky method of getting

 the proper modifier mask"

This reverts commit 5f7b81eb952ad928ef97a0b511a53d59739cf338.

---

 src/Makefile.am            |   2 +

 src/core/keybindings.c     |  11 +----

 src/core/xkbcommon-hacks.c | 112 +++++++++++++++++++++++++++++++++++++++++++++

 src/core/xkbcommon-hacks.h |  34 ++++++++++++++

 4 files changed, 150 insertions(+), 9 deletions(-)

 create mode 100644 src/core/xkbcommon-hacks.c

 create mode 100644 src/core/xkbcommon-hacks.h

diff --git a/src/Makefile.am b/src/Makefile.am

index e73a053..fabb0f1 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -166,6 +166,8 @@ libmutter_la_SOURCES =				\

 	meta/gradient.h				\

 	core/meta-gesture-tracker.c		\

 	core/meta-gesture-tracker-private.h	\

+	core/xkbcommon-hacks.c			\

+	core/xkbcommon-hacks.h			\

 	core/keybindings.c			\

 	core/keybindings-private.h		\

 	core/main.c				\

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index e269424..a4b1dbe 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -39,6 +39,7 @@

 #include "screen-private.h"

 #include <meta/prefs.h>

 #include "meta-accel-parse.h"

+#include "xkbcommon-hacks.h"

 #include <linux/input.h>

@@ -189,7 +190,6 @@ reload_modmap (MetaKeyBindingManager *keys)

 {

   MetaBackend *backend = meta_get_backend ();

   struct xkb_keymap *keymap = meta_backend_get_keymap (backend);

-  struct xkb_state *scratch_state;

   xkb_mod_mask_t scroll_lock_mask;

   /* Modifiers to find. */

@@ -203,8 +203,6 @@ reload_modmap (MetaKeyBindingManager *keys)

     { "Super",      &keys->super_mask },

   };

-  scratch_state = xkb_state_new (keymap);

-

   gsize i;

   for (i = 0; i < G_N_ELEMENTS (mods); i++)

     {

@@ -212,16 +210,11 @@ reload_modmap (MetaKeyBindingManager *keys)

       xkb_mod_index_t idx = xkb_keymap_mod_get_index (keymap, mods[i].name);

       if (idx != XKB_MOD_INVALID)

-        {

-          xkb_state_update_mask (scratch_state, 1 << idx, 0, 0, 0, 0, 0);

-          *mask_p = xkb_state_serialize_mods (scratch_state, XKB_STATE_MODS_DEPRESSED);

-        }

+        *mask_p = my_xkb_keymap_mod_get_mask (keymap, idx);

       else

         *mask_p = 0;

     }

-  xkb_state_unref (scratch_state);

-

   keys->ignored_modifier_mask = (scroll_lock_mask | Mod2Mask | LockMask);

   meta_topic (META_DEBUG_KEYBINDINGS,

diff --git a/src/core/xkbcommon-hacks.c b/src/core/xkbcommon-hacks.c

new file mode 100644

index 0000000..330f0f7

--- /dev/null

+++ b/src/core/xkbcommon-hacks.c

@@ -0,0 +1,112 @@

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+

+/*

+ * Copyright (C) 2014 Red Hat

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA

+ * 02111-1307, USA.

+ *

+ * Written by:

+ *     Jasper St. Pierre <jstpierre@mecheye.net>

+ */

+

+#include "config.h"

+

+#include "xkbcommon-hacks.h"

+

+/* Terrible, gross hackery to provide an implementation for xkb_keymap_mod_get_mask.

+ * Delete when https://github.com/xkbcommon/libxkbcommon/pull/10 is pushed. */

+

+/* The structures here have been pulled from libxkbcommon. */

+

+enum xkb_action_controls {

+    CONTROL_REPEAT = (1 << 0),

+    CONTROL_SLOW = (1 << 1),

+    CONTROL_DEBOUNCE = (1 << 2),

+    CONTROL_STICKY = (1 << 3),

+    CONTROL_MOUSEKEYS = (1 << 4),

+    CONTROL_MOUSEKEYS_ACCEL = (1 << 5),

+    CONTROL_AX = (1 << 6),

+    CONTROL_AX_TIMEOUT = (1 << 7),

+    CONTROL_AX_FEEDBACK = (1 << 8),

+    CONTROL_BELL = (1 << 9),

+    CONTROL_IGNORE_GROUP_LOCK = (1 << 10),

+    CONTROL_ALL = \

+        (CONTROL_REPEAT | CONTROL_SLOW | CONTROL_DEBOUNCE | CONTROL_STICKY | \

+         CONTROL_MOUSEKEYS | CONTROL_MOUSEKEYS_ACCEL | CONTROL_AX | \

+         CONTROL_AX_TIMEOUT | CONTROL_AX_FEEDBACK | CONTROL_BELL | \

+         CONTROL_IGNORE_GROUP_LOCK)

+};

+

+typedef uint32_t xkb_atom_t;

+

+/* Don't allow more modifiers than we can hold in xkb_mod_mask_t. */

+#define XKB_MAX_MODS ((xkb_mod_index_t) (sizeof(xkb_mod_mask_t) * 8))

+

+/* These should all go away. */

+enum mod_type {

+    MOD_REAL = (1 << 0),

+    MOD_VIRT = (1 << 1),

+    MOD_BOTH = (MOD_REAL | MOD_VIRT),

+};

+

+struct xkb_mod {

+    xkb_atom_t name;

+    enum mod_type type;

+    xkb_mod_mask_t mapping; /* vmod -> real mod mapping */

+};

+

+struct xkb_mod_set {

+    struct xkb_mod mods[XKB_MAX_MODS];

+    unsigned int num_mods;

+};

+

+/* Common keyboard description structure */

+struct xkb_keymap_real {

+    struct xkb_context *ctx;

+

+    int refcnt;

+    enum xkb_keymap_compile_flags flags;

+    enum xkb_keymap_format format;

+

+    enum xkb_action_controls enabled_ctrls;

+

+    xkb_keycode_t min_key_code;

+    xkb_keycode_t max_key_code;

+    void *keys;

+

+    /* aliases in no particular order */

+    unsigned int num_key_aliases;

+    void *key_aliases;

+

+    void *types;

+    unsigned int num_types;

+

+    unsigned int num_sym_interprets;

+    void *sym_interprets;

+

+    struct xkb_mod_set mods;

+};

+

+xkb_mod_mask_t

+my_xkb_keymap_mod_get_mask(struct xkb_keymap *_keymap, xkb_mod_index_t idx)

+{

+    struct xkb_keymap_real *keymap = (struct xkb_keymap_real *) _keymap;

+

+    if (idx >= keymap->mods.num_mods)

+        return 0;

+

+    return keymap->mods.mods[idx].mapping;

+}

diff --git a/src/core/xkbcommon-hacks.h b/src/core/xkbcommon-hacks.h

new file mode 100644

index 0000000..9b64118

--- /dev/null

+++ b/src/core/xkbcommon-hacks.h

@@ -0,0 +1,34 @@

+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+

+/*

+ * Copyright (C) 2014 Red Hat

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA

+ * 02111-1307, USA.

+ *

+ * Written by:

+ *     Jasper St. Pierre <jstpierre@mecheye.net>

+ */

+

+

+#ifndef XKBCOMMON_HACKS_H

+#define XKBCOMMON_HACKS_H

+

+#include <xkbcommon/xkbcommon.h>

+

+xkb_mod_mask_t

+my_xkb_keymap_mod_get_mask(struct xkb_keymap *keymap, xkb_mod_index_t idx);

+

+#endif /* XKBCOMMON_HACKS_H */

-- 

2.3.6

From e8c8ca3d95afdfea125409253c46e38e1e4dde2f Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Wed, 5 Nov 2014 18:02:04 +0100

Subject: [PATCH 08/16] Revert "keybindings: Rewrite the keymap code so that it

 uses libxkbcommon"

This reverts commit 1af00333682cda21db2d08b9fc590888d8e23e57.

---

 src/core/keybindings-private.h |   6 +++

 src/core/keybindings.c         | 106 +++++++++++++++++++----------------------

 2 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h

index aadb294..9dfa4e8 100644

--- a/src/core/keybindings-private.h

+++ b/src/core/keybindings-private.h

@@ -90,8 +90,14 @@ typedef struct

 typedef struct

 {

+  Display *xdisplay;

+

   GHashTable     *key_bindings;

   GHashTable     *key_bindings_index;

+  int             min_keycode;

+  int             max_keycode;

+  KeySym *keymap;

+  int keysyms_per_keycode;

   xkb_mod_mask_t ignored_modifier_mask;

   xkb_mod_mask_t hyper_mask;

   xkb_mod_mask_t super_mask;

diff --git a/src/core/keybindings.c b/src/core/keybindings.c

index a4b1dbe..23e82b9 100644

--- a/src/core/keybindings.c

+++ b/src/core/keybindings.c

@@ -177,6 +177,18 @@ key_binding_key (guint32 keycode,

   return (key << 16) | (mask & 0xffff);

 }

+

+static void

+reload_keymap (MetaKeyBindingManager *keys)

+{

+  meta_XFree (keys->keymap);

+  keys->keymap = XGetKeyboardMapping (keys->xdisplay,

+                                      keys->min_keycode,

+                                      keys->max_keycode -

+                                      keys->min_keycode + 1,

+                                      &keys->keysyms_per_keycode);

+}

+

 static const char *

 keysym_name (xkb_keysym_t keysym)

 {

@@ -226,61 +238,12 @@ reload_modmap (MetaKeyBindingManager *keys)

               keys->meta_mask);

 }

-static gboolean

-is_keycode_for_keysym (struct xkb_keymap *keymap,

-                       xkb_keycode_t      keycode,

-                       xkb_keysym_t       keysym)

-{

-  xkb_layout_index_t num_layouts, i;

-

-  num_layouts = xkb_keymap_num_layouts_for_key (keymap, keycode);

-  for (i = 0; i < num_layouts; i++)

-    {

-      xkb_level_index_t num_levels, j;

-

-      num_levels = xkb_keymap_num_levels_for_key (keymap, keycode, i);

-      for (j = 0; j < num_levels; j++)

-        {

-          const xkb_keysym_t *syms;

-          int num_syms, k;

-

-          num_syms = xkb_keymap_key_get_syms_by_level (keymap, keycode, i, j, &syms);

-          for (k = 0; k < num_syms; k++)

-            {

-              if (syms[k] == keysym)

-                return TRUE;

-            }

-        }

-    }

-

-  return FALSE;

-}

-

-typedef struct

-{

-  GArray *keycodes;

-  xkb_keysym_t keysym;

-} FindKeysymData;

-

-static void

-get_keycodes_for_keysym_iter (struct xkb_keymap *keymap,

-                              xkb_keycode_t      keycode,

-                              void              *data)

-{

-  FindKeysymData *search_data = data;

-  GArray *keycodes = search_data->keycodes;

-  xkb_keysym_t keysym = search_data->keysym;

-

-  if (is_keycode_for_keysym (keymap, keycode, keysym))

-    g_array_append_val (keycodes, keycode);

-}

-

 /* Original code from gdk_x11_keymap_get_entries_for_keyval() in

  * gdkkeys-x11.c */

 static int

 get_keycodes_for_keysym (MetaKeyBindingManager  *keys,

-                         int                     keysym,

-                         int                   **keycodes)

+                         int                      keysym,

+                         int                    **keycodes)

 {

   GArray *retval;

   int n_keycodes;

@@ -296,12 +259,22 @@ get_keycodes_for_keysym (MetaKeyBindingManager  *keys,

       goto out;

     }

-  {

-    MetaBackend *backend = meta_get_backend ();

-    struct xkb_keymap *keymap = meta_backend_get_keymap (backend);

-    FindKeysymData search_data = { retval, keysym };

-    xkb_keymap_key_for_each (keymap, get_keycodes_for_keysym_iter, &search_data);

-  }

+  keycode = keys->min_keycode;

+  while (keycode <= keys->max_keycode)

+    {

+      const KeySym *syms = keys->keymap + (keycode - keys->min_keycode) * keys->keysyms_per_keycode;

+      int i = 0;

+

+      while (i < keys->keysyms_per_keycode)

+        {

+          if (syms[i] == (unsigned int)keysym)

+            g_array_append_val (retval, keycode);

+

+          ++i;

+        }

+

+      ++keycode;

+    }

  out:

   n_keycodes = retval->len;

@@ -888,6 +861,8 @@ on_keymap_changed (MetaBackend *backend,

   ungrab_key_bindings (display);

+  reload_keymap (keys);

+

   /* Deciphering the modmap depends on the loaded keysyms to find out

    * what modifiers is Super and so forth, so we need to reload it

    * even when only the keymap changes */

@@ -1157,6 +1132,8 @@ meta_display_shutdown_keys (MetaDisplay *display)

   meta_prefs_remove_listener (prefs_changed_callback, display);

+  meta_XFree (keys->keymap);

+