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

Linux/BSD: Modify only keypad keys

Browse source 
The `keycode` field of `InputEventKey` is supposed to be "unshifted";
That is, what the key would output if no modifier keys were pressed.
This should match what's written on the key label, but `Key` enumerates
also all keypad keys, which require a modifier. We thus require some
extra checks for them.

Note that this can still allow "stuck keys", but that's an even deeper
problem.
This commit is contained in:
Riteo 2025-01-29 20:24:46 +01:00
parent a013481b09
commit 140a63be25
6 changed files with 96 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3562,8 +3562,7 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
// XLookupString returns keysyms usable as nice keycodes.
char str[256] = {};
XKeyEvent xkeyevent_no_mod = *xkeyevent;
xkeyevent_no_mod.state &= ~ShiftMask;
xkeyevent_no_mod.state &= ~ControlMask;
xkeyevent_no_mod.state &= 0xFF00;
XLookupString(xkeyevent, str, 255, &keysym_unicode, nullptr);
XLookupString(&xkeyevent_no_mod, nullptr, 0, &keysym_keycode, nullptr);
@ -3601,7 +3600,17 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
if (status == XLookupChars) {
bool keypress = xkeyevent->type == KeyPress;
Key keycode = KeyMappingX11::get_keycode(keysym_keycode);
Key keycode = Key::NONE;
if (KeyMappingX11::is_sym_numpad(keysym_unicode)) {
// Special case for numpad keys.
keycode = KeyMappingX11::get_keycode(keysym_unicode);
}
if (keycode == Key::NONE) {
keycode = KeyMappingX11::get_keycode(keysym_keycode);
}
Key physical_keycode = KeyMappingX11::get_scancode(xkeyevent->keycode);
if (keycode >= Key::A + 32 && keycode <= Key::Z + 32) {
@ -3669,10 +3678,19 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
if (res == XKB_COMPOSE_FEED_ACCEPTED) {
if (xkb_compose_state_get_status(wd.xkb_state) == XKB_COMPOSE_COMPOSED) {
bool keypress = xkeyevent->type == KeyPress;
Key keycode = KeyMappingX11::get_keycode(keysym_keycode);
Key physical_keycode = KeyMappingX11::get_scancode(xkeyevent->keycode);
KeyLocation key_location = KeyMappingX11::get_location(xkeyevent->keycode);
Key keycode = Key::NONE;
if (KeyMappingX11::is_sym_numpad(keysym_unicode)) {
// Special case for numpad keys.
keycode = KeyMappingX11::get_keycode(keysym_unicode);
}
if (keycode == Key::NONE) {
keycode = KeyMappingX11::get_keycode(keysym_keycode);
}
if (keycode >= Key::A + 32 && keycode <= Key::Z + 32) {
keycode -= 'a' - 'A';
}
@ -3733,7 +3751,16 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
// KeyMappingX11 just translated the X11 keysym to a PIGUI
// keysym, so it works in all platforms the same.
Key keycode = KeyMappingX11::get_keycode(keysym_keycode);
Key keycode = Key::NONE;
if (KeyMappingX11::is_sym_numpad(keysym_unicode)) {
// Special case for numpad keys.
keycode = KeyMappingX11::get_keycode(keysym_unicode);
}
if (keycode == Key::NONE) {
keycode = KeyMappingX11::get_keycode(keysym_keycode);
}
Key physical_keycode = KeyMappingX11::get_scancode(xkeyevent->keycode);
KeyLocation key_location = KeyMappingX11::get_location(xkeyevent->keycode);