From 105699620067a280cccd13a9c0e3ab84a5cbc3c6 Mon Sep 17 00:00:00 2001
From: Sabrehull <124904810+Sabrehull@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:18:31 +0200
Subject: [X11] Fix layout bug in `keyboard_get_keycode_from_physical`

(cherry picked from commit d4b746626659d6e29c54da57b822735d15ab14c0)
---
 platform/linuxbsd/x11/display_server_x11.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'platform/linuxbsd')

diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp
index 5be1bd236b..3f57a95dea 100644
--- a/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -2824,7 +2824,7 @@ Key DisplayServerX11::keyboard_get_keycode_from_physical(Key p_keycode) const {
 	Key modifiers = p_keycode & KeyModifierMask::MODIFIER_MASK;
 	Key keycode_no_mod = p_keycode & KeyModifierMask::CODE_MASK;
 	unsigned int xkeycode = KeyMappingX11::get_xlibcode(keycode_no_mod);
-	KeySym xkeysym = XkbKeycodeToKeysym(x11_display, xkeycode, 0, 0);
+	KeySym xkeysym = XkbKeycodeToKeysym(x11_display, xkeycode, keyboard_get_current_layout(), 0);
 	if (is_ascii_lower_case(xkeysym)) {
 		xkeysym -= ('a' - 'A');
 	}
-- 
cgit v1.2.3