Merge pull request #75461 from Sabrehull/keycode-fix

[X11] Fix layout bug in `keyboard_get_keycode_from_physical`
This commit is contained in:
Yuri Sizov 2023-03-30 18:24:33 +02:00 committed by GitHub
commit 80528c17c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2848,7 +2848,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');
}