[gtk/fix-wayland-layout-changes: 1/2] wayland: Add debug spew for active keyboard layouts

[Matthias Clasen <matthiasc src gnome org>]

commit 47d9478a3ce8d4e4280e62db65f192e26eaa8174
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 15 12:55:44 2021 -0400

    wayland: Add debug spew for active keyboard layouts
    
    Print out what we think the active keyboard layout is,
    when it changes, with GDK_DEBUG=input.

 gdk/wayland/gdkdevice-wayland.c | 62 ++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 19 deletions(-)
---
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 0d13910a24..f264e903d3 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -1846,6 +1846,36 @@ pointer_handle_axis_discrete (void              *data,
                        get_axis_name (axis), value, seat));
 }
 
+static int
+get_active_layout (GdkKeymap *keymap)
+{
+  struct xkb_keymap *xkb_keymap;
+  struct xkb_state *xkb_state;
+
+  xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);
+  xkb_state = _gdk_wayland_keymap_get_xkb_state (keymap);
+
+  for (int i = 0; i < xkb_keymap_num_layouts (xkb_keymap); i++)
+    {
+      if (xkb_state_layout_index_is_active (xkb_state, i, XKB_STATE_LAYOUT_EFFECTIVE))
+        return i;
+    }
+
+  return -1;
+}
+
+#ifdef G_ENABLE_DEBUG
+static const char *
+get_active_layout_name (GdkKeymap *keymap)
+{
+  struct xkb_keymap *xkb_keymap;
+
+  xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);
+
+  return xkb_keymap_layout_get_name (xkb_keymap, get_active_layout (keymap));
+}
+#endif
+
 static void
 keyboard_handle_keymap (void               *data,
                         struct wl_keyboard *keyboard,
@@ -1870,6 +1900,8 @@ keyboard_handle_keymap (void               *data,
 
   _gdk_wayland_keymap_update_from_fd (seat->keymap, format, fd, size);
 
+  GDK_DISPLAY_NOTE(seat->keymap->display, INPUT, g_print ("active layout now: %s\n", get_active_layout_name 
(seat->keymap)));
+
   g_signal_emit_by_name (seat->keymap, "keys-changed");
   g_signal_emit_by_name (seat->keymap, "state-changed");
   if (direction != gdk_keymap_get_direction (seat->keymap))
@@ -2040,8 +2072,14 @@ deliver_key_event (GdkWaylandSeat *seat,
   translated.layout = xkb_state_key_get_layout (xkb_state, key);
   translated.level = xkb_state_key_get_level (xkb_state, key, translated.layout);
 
+  g_print ("deliver key event: keycode %u -> keyval %u, layout %d, level %d\n",
+           key, translated.keyval, translated.layout, translated.level);
+
   if (translated.keyval == XKB_KEY_NoSymbol)
+    {
+    g_print ("no key for you\n");
     return;
+    }
 
   seat->pointer_info.time = time_;
   seat->key_modifiers = gdk_keymap_get_modifier_state (keymap);
@@ -2197,24 +2235,6 @@ keyboard_handle_key (void               *data,
 
 }
 
-static int
-get_active_layout (GdkKeymap *keymap)
-{
-  struct xkb_keymap *xkb_keymap;
-  struct xkb_state *xkb_state;
-
-  xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);
-  xkb_state = _gdk_wayland_keymap_get_xkb_state (keymap);
-
-  for (int i = 0; i < xkb_keymap_num_layouts (xkb_keymap); i++)
-    {
-      if (xkb_state_layout_index_is_active (xkb_state, i, XKB_STATE_LAYOUT_EFFECTIVE))
-        return i;
-    }
-
-  return -1;
-}
-
 static void
 keyboard_handle_modifiers (void               *data,
                            struct wl_keyboard *keyboard,
@@ -2267,7 +2287,11 @@ keyboard_handle_modifiers (void               *data,
 
   g_signal_emit_by_name (keymap, "state-changed");
   if (layout != get_active_layout (keymap))
-    g_signal_emit_by_name (keymap, "keys-changed");
+    {
+      GDK_DISPLAY_NOTE(keymap->display, INPUT, g_print ("active layout now: %s\n", get_active_layout_name 
(keymap)));
+
+      g_signal_emit_by_name (keymap, "keys-changed");
+    }
   if (direction != gdk_keymap_get_direction (keymap))
     {
       g_signal_emit_by_name (keymap, "direction-changed");