[gtk/keymap-rework-2: 6/19] gtk: Use display apis for keymap mapping

[Matthias Clasen <matthiasc src gnome org>]

commit 981d3f17f719c93d70ad546f029cbfead8915cf5
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 5 11:03:28 2020 -0400

    gtk: Use display apis for keymap mapping
    
    This removes the last uses of GdkKeymap from GTK.

 gtk/gtkaccelgroup.c      |  3 +--
 gtk/gtkimcontextsimple.c | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 68a664648f..2b544737af 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -442,11 +442,10 @@ gtk_accelerator_parse_with_keycode (const gchar     *accelerator,
 
           if (keyval && accelerator_codes != NULL)
             {
-              GdkKeymap *keymap = gdk_display_get_keymap (display ? display : gdk_display_get_default ());
               GdkKeymapKey *keys;
               gint n_keys, i, j;
 
-              if (!gdk_keymap_get_entries_for_keyval (keymap, keyval, &keys, &n_keys))
+              if (!gdk_display_map_keyval (display, keyval, &keys, &n_keys))
                 {
                   /* Not in keymap */
                   error = TRUE;
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 4f6e2ce441..b5b868c7c0 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -982,14 +982,12 @@ is_hex_keyval (guint keyval)
 static guint
 canonical_hex_keyval (GdkEvent *event)
 {
-  GdkSurface *surface = gdk_event_get_surface ((GdkEvent *) event);
-  GdkKeymap *keymap = gdk_display_get_keymap (gdk_surface_get_display (surface));
   guint keyval, event_keyval;
   guint *keyvals = NULL;
   gint n_vals = 0;
   gint i;
 
-  event_keyval = gdk_key_event_get_keyval ((GdkEvent *)event);
+  event_keyval = gdk_key_event_get_keyval (event);
 
   /* See if the keyval is already a hex digit */
   if (is_hex_keyval (event_keyval))
@@ -998,10 +996,10 @@ canonical_hex_keyval (GdkEvent *event)
   /* See if this key would have generated a hex keyval in
    * any other state, and return that hex keyval if so
    */
-  gdk_keymap_get_entries_for_keycode (keymap,
-                                      gdk_key_event_get_scancode ((GdkEvent *) event),
-                                     NULL,
-                                     &keyvals, &n_vals);
+  gdk_display_map_keycode (gdk_event_get_display (event),
+                           gdk_key_event_get_scancode (event),
+                           NULL,
+                           &keyvals, &n_vals);
 
   keyval = 0;
   i = 0;