mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 18:43:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99633 from buresu/fix-wayland-keymapping

Browse source 
Fix underscore input not working with jp106 keyboard on wayland platform
This commit is contained in:
Thaddeus Crews 2024-12-10 14:15:51 -06:00
commit f222cc43f3
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/linuxbsd/wayland/wayland_thread.cpp
View file

@ -197,10 +197,7 @@ bool WaylandThread::_seat_state_configure_key_event(SeatState &p_ss, Ref<InputEv
Key keycode = KeyMappingXKB::get_keycode(xkb_state_key_get_one_sym(p_ss.xkb_state, p_keycode));
Key physical_keycode = KeyMappingXKB::get_scancode(p_keycode);
KeyLocation key_location = KeyMappingXKB::get_location(p_keycode);
if (physical_keycode == Key::NONE) {
return false;
}
uint32_t unicode = xkb_state_key_get_utf32(p_ss.xkb_state, p_keycode);
if (keycode == Key::NONE) {
keycode = physical_keycode;
@ -210,6 +207,10 @@ bool WaylandThread::_seat_state_configure_key_event(SeatState &p_ss, Ref<InputEv
keycode -= 'a' - 'A';
}
if (physical_keycode == Key::NONE && keycode == Key::NONE && unicode == 0) {
return false;
}
p_event->set_window_id(DisplayServer::MAIN_WINDOW_ID);
// Set all pressed modifiers.
@ -223,8 +224,6 @@ bool WaylandThread::_seat_state_configure_key_event(SeatState &p_ss, Ref<InputEv
p_event->set_physical_keycode(physical_keycode);
p_event->set_location(key_location);
uint32_t unicode = xkb_state_key_get_utf32(p_ss.xkb_state, p_keycode);
if (unicode != 0) {
p_event->set_key_label(fix_key_label(unicode, keycode));
} else {