diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-03-01 23:00:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-01 23:00:42 +0100 |
commit | e2b66cacf78ae39b94df748e9740b98a1f011e77 (patch) | |
tree | 56d468d762c43879c20b342702e8fc999221e6c6 /main/input_default.cpp | |
parent | 55396d6e06f8e4e355e9ab0595bdb7f27c1c36dd (diff) | |
parent | 1af06d3d4608b17c74caed951cd9579ccbba229d (diff) |
Merge pull request #18020 from bruvzg/input_fix_non_latin_and_add_hw_scancodes
Fix non-latin layout scancodes on Linux, adds access to physical scancodes.
Diffstat (limited to 'main/input_default.cpp')
-rw-r--r-- | main/input_default.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index a13ddeb2b6..aa9e772a38 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -73,10 +73,10 @@ InputDefault::SpeedTrack::SpeedTrack() { reset(); } -bool InputDefault::is_key_pressed(int p_scancode) const { +bool InputDefault::is_key_pressed(int p_keycode) const { _THREAD_SAFE_METHOD_ - return keys_pressed.has(p_scancode); + return keys_pressed.has(p_keycode); } bool InputDefault::is_mouse_button_pressed(int p_button) const { @@ -271,11 +271,11 @@ void InputDefault::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool _THREAD_SAFE_METHOD_ Ref<InputEventKey> k = p_event; - if (k.is_valid() && !k->is_echo() && k->get_scancode() != 0) { + if (k.is_valid() && !k->is_echo() && k->get_keycode() != 0) { if (k->is_pressed()) - keys_pressed.insert(k->get_scancode()); + keys_pressed.insert(k->get_keycode()); else - keys_pressed.erase(k->get_scancode()); + keys_pressed.erase(k->get_keycode()); } Ref<InputEventMouseButton> mb = p_event; |