AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Add debug spew for active keyboard layouts

Browse Source 
Print out what we think the active keyboard layout is,
when it changes, with GDK_DEBUG=input.
This commit is contained in:
Matthias Clasen 2021-03-15 12:55:44 -04:00
parent 1eebf0ebd1
commit 568fe2e97b
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gdk/wayland/gdkdevice-wayland.c
View File

@ -1846,6 +1846,36 @@ pointer_handle_axis_discrete (void *data,
get_axis_name (axis), value, seat)); 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 static void
keyboard_handle_keymap (void *data, keyboard_handle_keymap (void *data,
struct wl_keyboard *keyboard, 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_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, "keys-changed");
g_signal_emit_by_name (seat->keymap, "state-changed"); g_signal_emit_by_name (seat->keymap, "state-changed");
if (direction != gdk_keymap_get_direction (seat->keymap)) if (direction != gdk_keymap_get_direction (seat->keymap))
@ -2197,24 +2229,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 static void
keyboard_handle_modifiers (void *data, keyboard_handle_modifiers (void *data,
struct wl_keyboard *keyboard, struct wl_keyboard *keyboard,
@ -2267,7 +2281,11 @@ keyboard_handle_modifiers (void *data,
g_signal_emit_by_name (keymap, "state-changed"); g_signal_emit_by_name (keymap, "state-changed");
if (layout != get_active_layout (keymap)) 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)) if (direction != gdk_keymap_get_direction (keymap))
{ {
g_signal_emit_by_name (keymap, "direction-changed"); g_signal_emit_by_name (keymap, "direction-changed");