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

Fix incorrect Android scancodes

Browse source
This commit is contained in:
Marcel Admiraal 2022-07-10 12:32:01 +01:00
parent 3f0201335e
commit 2f7de4c8ed
9 changed files with 211 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

30
platform/android/android_input_handler.cpp
View file

@ -61,14 +61,17 @@ void AndroidInputHandler::process_event(Ref<InputEvent> &p_event) {
input->parse_input_event(p_event);
}
void AndroidInputHandler::process_key_event(int p_keycode, int p_scancode, int p_unicode_char, bool p_pressed) {
void AndroidInputHandler::process_key_event(int p_scancode, int p_physical_scancode, int p_unicode, bool p_pressed) {
Ref<InputEventKey> ev;
ev.instance();
int val = p_unicode_char;
unsigned int scancode = android_get_keysym(p_keycode);
unsigned int phy_scancode = android_get_keysym(p_scancode);
switch (scancode) {
unsigned int physical_scancode = godot_code_from_android_code(p_physical_scancode);
unsigned int scancode = physical_scancode;
if (p_scancode != 0) {
scancode = godot_code_from_unicode(p_scancode);
}
switch (physical_scancode) {
case KEY_SHIFT: {
shift_mem = p_pressed;
} break;
@ -81,25 +84,18 @@ void AndroidInputHandler::process_key_event(int p_keycode, int p_scancode, int p
case KEY_META: {
meta_mem = p_pressed;
} break;
default:
break;
}
ev->set_scancode(scancode);
ev->set_physical_scancode(phy_scancode);
ev->set_unicode(val);
ev->set_physical_scancode(physical_scancode);
ev->set_unicode(p_unicode);
ev->set_pressed(p_pressed);
_set_key_modifier_state(ev);
if (val == '\n') {
ev->set_scancode(KEY_ENTER);
} else if (val == 61448) {
ev->set_scancode(KEY_BACKSPACE);
ev->set_unicode(KEY_BACKSPACE);
} else if (val == 61453) {
ev->set_scancode(KEY_ENTER);
ev->set_unicode(KEY_ENTER);
} else if (p_scancode == 4) {
if (p_physical_scancode == AKEYCODE_BACK) {
if (MainLoop *main_loop = OS::get_singleton()->get_main_loop()) {
main_loop->call_deferred("notification", MainLoop::NOTIFICATION_WM_GO_BACK_REQUEST);
}