Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

X11 input: prevent non-printable keys from producing empty Strings

Browse source 
(cherry picked from commit 1b697aff38)
This commit is contained in:
Mounir Tohami 2025-09-18 01:14:55 +03:00 • committed by Thaddeus Crews
parent 6bf74272f9
commit cb878d90a2
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/linuxbsd/x11/display_server_x11.cpp
View file

@ -3837,12 +3837,21 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
XLookupString(xkeyevent, str, 255, &keysym_unicode, nullptr); XLookupString(xkeyevent, str, 255, &keysym_unicode, nullptr);
XLookupString(&xkeyevent_no_mod, nullptr, 0, &keysym_keycode, nullptr); XLookupString(&xkeyevent_no_mod, nullptr, 0, &keysym_keycode, nullptr);
// Get a normalized keysym (ignoring modifiers like Shift/Ctrl).
String keysym; String keysym;
#ifdef XKB_ENABLED #ifdef XKB_ENABLED
if (xkb_loaded_v08p) { if (xkb_loaded_v08p) {
KeySym keysym_unicode_nm = 0; // keysym used to find unicode KeySym keysym_unicode_nm = 0; // keysym used to find unicode
XLookupString(&xkeyevent_no_mod, nullptr, 0, &keysym_unicode_nm, nullptr); XLookupString(&xkeyevent_no_mod, nullptr, 0, &keysym_unicode_nm, nullptr);
keysym = String::chr(xkb_keysym_to_utf32(xkb_keysym_to_upper(keysym_unicode_nm)));
// Unicode codepoint corresponding to the pressed key.
// Printable keys (letters, numbers, symbols) return a valid codepoint.
u_int32_t unicode_cp = xkb_keysym_to_utf32(xkb_keysym_to_upper(keysym_unicode_nm));
// Non-printable keys (Ctrl, Home, CapsLock, F1, etc.) return 0, so we skip them.
if (unicode_cp != 0) {
keysym = String::chr(unicode_cp);
}
} }
#endif #endif