godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #111795 from bruvzg/x11_kbd_no_lbl

Browse Source 
[X11] Fix `keyboard_get_label_from_physical` errors when used on key without label.
This commit is contained in:
Thaddeus Crews
2025-10-20 18:09:37 -05:00
parent d64a86a35f cf21565c77
commit 4eed0841b5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -3746,8 +3746,11 @@ Key DisplayServerX11::keyboard_get_label_from_physical(Key p_keycode) const {
Key key = KeyMappingX11::get_keycode(xkeysym); Key key = KeyMappingX11::get_keycode(xkeysym);
#ifdef XKB_ENABLED #ifdef XKB_ENABLED
if (xkb_loaded_v08p) { if (xkb_loaded_v08p) {
String keysym = String::chr(xkb_keysym_to_utf32(xkb_keysym_to_upper(xkeysym))); char32_t chr = xkb_keysym_to_utf32(xkb_keysym_to_upper(xkeysym));
key = fix_key_label(keysym[0], KeyMappingX11::get_keycode(xkeysym)); if (chr != 0) {
String keysym = String::chr(chr);
key = fix_key_label(keysym[0], KeyMappingX11::get_keycode(xkeysym));
}
} }
#endif #endif