From 97a8a11f80e0c0ff70a83a3ecd2361e4a451bfa8 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Tue, 20 Jul 2021 14:32:24 +0200
Subject: [PATCH] Improved precision of the Dpad detection

---
 .../customcontrols/gamepad/GamepadDpad.java   | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java
index d16fe8824..e07692b1e 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java
@@ -38,68 +38,68 @@ public class GamepadDpad {
         this.parentPad = parentPad;
     }
 
-    public int update(InputEvent event) {
-        if (!isDpadEvent(event)) {
-            return -1;
+    public void update(KeyEvent event){
+
+        //TODO check if the event is valid
+        if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_LEFT) {
+            pressedDirection = LEFT;
+        } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_RIGHT) {
+            pressedDirection = RIGHT;
+        } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP) {
+            pressedDirection = UP;
+        } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_DOWN) {
+            pressedDirection = DOWN;
+        } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER) {
+            pressedDirection = CENTER;
         }
 
-        // If the input event is a MotionEvent, check its hat axis values.
-        if (event instanceof MotionEvent) {
+        setDummyEventKeyCode(pressedDirection);
+        parentPad.sendButton(dummyEvent);
+    }
 
-            // Use the hat axis value to find the D-pad direction
-            MotionEvent motionEvent = (MotionEvent) event;
-            float xaxis = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_X);
-            float yaxis = motionEvent.getAxisValue(MotionEvent.AXIS_HAT_Y);
+    public void update(MotionEvent event){
+        //TODO check if the event is valid
 
-            // Check if the AXIS_HAT_X value is -1 or 1, and set the D-pad
-            // LEFT and RIGHT direction accordingly.
-            if (Float.compare(xaxis, -1.0f) == 0) {
-                pressedDirection = LEFT;
-            } else if (Float.compare(xaxis, 1.0f) == 0) {
-                pressedDirection = RIGHT;
-            }
-            // Check if the AXIS_HAT_Y value is -1 or 1, and set the D-pad
-            // UP and DOWN direction accordingly.
-            else if (Float.compare(yaxis, -1.0f) == 0) {
-                pressedDirection =  UP;
-            } else if (Float.compare(yaxis, 1.0f) == 0) {
-                pressedDirection =  DOWN;
-            }else {
-                pressedDirection = CENTER;
-            }
+        // Use the hat axis value to find the D-pad direction
+        float xaxis = event.getAxisValue(MotionEvent.AXIS_HAT_X);
+        float yaxis = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
+
+        // Check if the AXIS_HAT_X value is -1 or 1, and set the D-pad
+        // LEFT and RIGHT direction accordingly.
+        if (Float.compare(xaxis, -1.0f) == 0) {
+            pressedDirection = LEFT;
+        } else if (Float.compare(xaxis, 1.0f) == 0) {
+            pressedDirection = RIGHT;
+        }
+        // Check if the AXIS_HAT_Y value is -1 or 1, and set the D-pad
+        // UP and DOWN direction accordingly.
+        else if (Float.compare(yaxis, -1.0f) == 0) {
+            pressedDirection =  UP;
+        } else if (Float.compare(yaxis, 1.0f) == 0) {
+            pressedDirection =  DOWN;
+        }else {
+            pressedDirection = CENTER;
         }
 
-        // If the input event is a KeyEvent, check its key code.
-        else if (event instanceof KeyEvent) {
-
-            // Use the key code to find the D-pad direction.
-            KeyEvent keyEvent = (KeyEvent) event;
-            if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_LEFT) {
-                pressedDirection = LEFT;
-            } else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_RIGHT) {
-                pressedDirection = RIGHT;
-            } else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP) {
-                pressedDirection = UP;
-            } else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_DOWN) {
-                pressedDirection = DOWN;
-            } else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER) {
-                pressedDirection = CENTER;
-            }
-        }
+        setDummyEventKeyCode(pressedDirection);
+        parentPad.sendButton(dummyEvent);
+    }
 
+    private void setDummyEventKeyCode(int fakeKeycode){
         try {
-            eventCodeField.setInt(dummyEvent, pressedDirection);
+            eventCodeField.setInt(dummyEvent, fakeKeycode);
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-        parentPad.sendButton(dummyEvent);
-        return pressedDirection;
     }
 
-    public static boolean isDpadEvent(InputEvent event) {
+    public static boolean isDpadEvent(MotionEvent event) {
         // Check that input comes from a device with directional pads.
         // And... also the joystick since it declares sometimes as a joystick.
-        return (event.getSource() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
-               ((event.getSource() & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) && (event.getDevice().getKeyboardType() == KEYBOARD_TYPE_NON_ALPHABETIC);
+        return (event.getSource() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK;
+    }
+
+    public static boolean isDpadEvent(KeyEvent event){
+        return ((event.getSource() & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) && (event.getDevice().getKeyboardType() == KEYBOARD_TYPE_NON_ALPHABETIC);
     }
 }
\ No newline at end of file