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.

1 files changed, 9 insertions, 8 deletions

diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
index 900a452024..022d9700d5 100644
--- a/platform/android/java_godot_lib_jni.cpp
+++ b/platform/android/java_godot_lib_jni.cpp
@@ -1167,28 +1167,29 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jobject obj, jint p_keycode, jint p_scancode, jint p_unicode_char, jboolean p_pressed) {
 	if (step == 0)
 		return;
 
 	Ref<InputEventKey> ievent;
 	ievent.instance();
 	int val = p_unicode_char;
-	int scancode = android_get_keysym(p_scancode);
-	ievent->set_scancode(scancode);
+	int keycode = android_get_keysym(p_keycode);
+	int phy_keycode = android_get_keysym(p_scancode);
+	ievent->set_keycode(keycode);
+	ievent->set_physical_keycode(phy_keycode);
 	ievent->set_unicode(val);
 	ievent->set_pressed(p_pressed);
 
 	if (val == '\n') {
-		ievent->set_scancode(KEY_ENTER);
+		ievent->set_keycode(KEY_ENTER);
 	} else if (val == 61448) {
-		ievent->set_scancode(KEY_BACKSPACE);
+		ievent->set_keycode(KEY_BACKSPACE);
 		ievent->set_unicode(KEY_BACKSPACE);
 	} else if (val == 61453) {
-		ievent->set_scancode(KEY_ENTER);
+		ievent->set_keycode(KEY_ENTER);
 		ievent->set_unicode(KEY_ENTER);
-	} else if (p_scancode == 4) {
-
+	} else if (p_keycode == 4) {
 		os_android->main_loop_request_go_back();
 	}