From c8e2d13173d6ddbaf18316a376f40cdca42e4679 Mon Sep 17 00:00:00 2001 From: Frank Praznik Date: Fri, 25 Jul 2025 10:09:55 -0400 Subject: [PATCH] wayland: Fix the key level request layout parameter Use the layout loop index instead of the current layout, which could be invalid if no layout event was received before the keymap event. Fixes #13418 --- src/video/wayland/SDL_waylandevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c index bb92b1ca47..227246cc92 100644 --- a/src/video/wayland/SDL_waylandevents.c +++ b/src/video/wayland/SDL_waylandevents.c @@ -1435,7 +1435,7 @@ static void Wayland_KeymapIterator(struct xkb_keymap *keymap, xkb_keycode_t key, } for (xkb_layout_index_t layout = 0; layout < seat->keyboard.xkb.num_layouts; ++layout) { - const xkb_level_index_t num_levels = WAYLAND_xkb_keymap_num_levels_for_key(seat->keyboard.xkb.keymap, key, seat->keyboard.xkb.current_layout); + const xkb_level_index_t num_levels = WAYLAND_xkb_keymap_num_levels_for_key(seat->keyboard.xkb.keymap, key, layout); for (xkb_level_index_t level = 0; level < num_levels; ++level) { if (WAYLAND_xkb_keymap_key_get_syms_by_level(seat->keyboard.xkb.keymap, key, layout, level, &syms) > 0) { /* If the keyboard is virtual or the key didn't have a corresponding hardware scancode, try to