From 8e21b28380059dc7bae6c0fd82371a1c831e6710 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Dec 2020 14:12:23 +0700 Subject: [PATCH] Revert to 49974f0 --- .../kdt/pojavlaunch/AndroidLWJGLKeycode.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java index 76f4e1d2f..0d6ffc37e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java +++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java @@ -152,9 +152,6 @@ public class AndroidLWJGLKeycode { androidToLwjglMap.put(KeyEvent.KEYCODE_SPACE, LWJGLGLFWKeycode.GLFW_KEY_SPACE); // androidToLwjglMap.put(KeyEvent.KEYCODE_SYSRQ, LWJGLGLFWKeycode.GLFW_KEY_SYSRQ); androidToLwjglMap.put(KeyEvent.KEYCODE_TAB, LWJGLGLFWKeycode.GLFW_KEY_TAB); - - androidToLwjglMap.put(KeyEvent.KEYCODE_UNKNOWN, -1 /* LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN */); - // androidToLwjglMap.put(KeyEvent.KEYCODE_YEN, LWJGLGLFWKeycode.GLFW_KEY_YEN); // androidToLwjglMap.put(KeyEvent.KEYCODE_BUTTON_1, LWJGLGLFWKeycode.G @@ -172,12 +169,14 @@ public class AndroidLWJGLKeycode { } public static void execKey(KeyEvent keyEvent, int i, boolean isDown) { - if (i == 1 && (keyEvent.getSource() == InputDevice.SOURCE_MOUSE)) { - // Right mouse detection - BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); - // BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, false); - } else { - BaseMainActivity.sendKeyPress(androidToLwjglMap.get(i), keyEvent.getModifiers(), isDown); + for (Map.Entry perKey : androidToLwjglMap.entrySet()) { + if (i == 1 && (keyEvent.getSource() == InputDevice.SOURCE_MOUSE)) { + // Right mouse detection + BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); + // BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, false); + } else if (perKey.getKey() == i) { + BaseMainActivity.sendKeyPress(perKey.getValue(), keyEvent.getModifiers(), isDown); + } } int mods = 0; @@ -207,7 +206,7 @@ public class AndroidLWJGLKeycode { th.printStackTrace(); } - if (isBackspaceAfterChar && (keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN || keyEvent.isPrintingKey()) && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { + if (isBackspaceAfterChar && (int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { BaseMainActivity.sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_BACKSPACE, 0, isDown); } } @@ -231,4 +230,3 @@ public class AndroidLWJGLKeycode { return 0; } } -