From 9037767040560fd2f2e4f9a6639b3d3f95dd4c8e Mon Sep 17 00:00:00 2001
From: isXander <xandersmith2008@gmail.com>
Date: Wed, 25 Oct 2023 19:21:58 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20rumble=20not=20working=20o?=
 =?UTF-8?q?n=20joysticks=20+=20some=20driver=20refactoring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/gamepad/GamepadController.java |  2 +
 .../joystick/SingleJoystickController.java    |  2 +-
 .../controlify/driver/SteamDeckDriver.java    | 11 +--
 .../BasicGamepadInputDriver.java              |  3 +-
 .../{ => gamepad}/GLFWGamepadDriver.java      |  4 +-
 .../driver/{ => gamepad}/GamepadDrivers.java  |  3 +-
 .../{ => gamepad}/SDL2GamepadDriver.java      |  4 +-
 .../controlify/hid/ControllerHIDService.java  |  2 +-
 .../isxander/controlify/hid/HIDDevice.java    | 72 ++++++++++++++++++-
 9 files changed, 90 insertions(+), 13 deletions(-)
 rename src/main/java/dev/isxander/controlify/driver/{ => gamepad}/BasicGamepadInputDriver.java (89%)
 rename src/main/java/dev/isxander/controlify/driver/{ => gamepad}/GLFWGamepadDriver.java (95%)
 rename src/main/java/dev/isxander/controlify/driver/{ => gamepad}/GamepadDrivers.java (96%)
 rename src/main/java/dev/isxander/controlify/driver/{ => gamepad}/SDL2GamepadDriver.java (98%)

diff --git a/src/main/java/dev/isxander/controlify/controller/gamepad/GamepadController.java b/src/main/java/dev/isxander/controlify/controller/gamepad/GamepadController.java
index ce355f4..96ac62f 100644
--- a/src/main/java/dev/isxander/controlify/controller/gamepad/GamepadController.java
+++ b/src/main/java/dev/isxander/controlify/controller/gamepad/GamepadController.java
@@ -4,6 +4,8 @@ import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.bindings.ControllerBindings;
 import dev.isxander.controlify.controller.AbstractController;
 import dev.isxander.controlify.controller.BatteryLevel;
+import dev.isxander.controlify.driver.gamepad.BasicGamepadInputDriver;
+import dev.isxander.controlify.driver.gamepad.GamepadDrivers;
 import dev.isxander.controlify.hid.ControllerHIDService;
 import dev.isxander.controlify.debug.DebugProperties;
 import dev.isxander.controlify.driver.*;
diff --git a/src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java b/src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java
index ce618c5..9cd4a3c 100644
--- a/src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java
+++ b/src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java
@@ -112,7 +112,7 @@ public class SingleJoystickController extends AbstractController<JoystickState,
 
         // the duration doesn't matter because we are not updating the joystick state,
         // so there is never any SDL check to stop the rumble after the desired time.
-        if (SDL_JoystickRumbleTriggers(ptrJoystick, (short)(strongMagnitude * 65535.0F), (short)(weakMagnitude * 65535.0F), 1) != 0) {
+        if (SDL_JoystickRumble(ptrJoystick, (short)(strongMagnitude * 65535.0F), (short)(weakMagnitude * 65535.0F), 1) != 0) {
             Log.LOGGER.error("Could not rumble controller " + name() + ": " + SDL_GetError());
             return false;
         }
diff --git a/src/main/java/dev/isxander/controlify/driver/SteamDeckDriver.java b/src/main/java/dev/isxander/controlify/driver/SteamDeckDriver.java
index f870b9e..40c382a 100644
--- a/src/main/java/dev/isxander/controlify/driver/SteamDeckDriver.java
+++ b/src/main/java/dev/isxander/controlify/driver/SteamDeckDriver.java
@@ -1,6 +1,7 @@
 package dev.isxander.controlify.driver;
 
 import dev.isxander.controlify.controller.gamepad.GamepadState;
+import dev.isxander.controlify.driver.gamepad.BasicGamepadInputDriver;
 import dev.isxander.controlify.hid.HIDDevice;
 import dev.isxander.controlify.utils.Log;
 
@@ -157,9 +158,9 @@ public class SteamDeckDriver implements GyroDriver, BasicGamepadInputDriver {
             //      .6 - X
             //      .7 - A
             //      .12 - Select
-            // .13 - STEAM
-            // .14 - Start
-            // .15 - L5
+            //      .13 - STEAM
+            //      .14 - Start
+            //      .15 - L5
             //      .16 - R5
             //      .17 - L trackpad click
             //      .18 - R trackpad click
@@ -170,11 +171,11 @@ public class SteamDeckDriver implements GyroDriver, BasicGamepadInputDriver {
             int buttons1BitMap,
 
             // Buttons 2:
-            //  .9 - L4
+            //  .9  - L4
             //  .10 - R4
             //  .14 - L3 touch
             //  .15 - R3 touch
-            //       .18 - (...)
+            //  .18 - (...)
             int buttons2BitMap,
 
             short leftTrackpadX,
diff --git a/src/main/java/dev/isxander/controlify/driver/BasicGamepadInputDriver.java b/src/main/java/dev/isxander/controlify/driver/gamepad/BasicGamepadInputDriver.java
similarity index 89%
rename from src/main/java/dev/isxander/controlify/driver/BasicGamepadInputDriver.java
rename to src/main/java/dev/isxander/controlify/driver/gamepad/BasicGamepadInputDriver.java
index 4b35a22..faebbdc 100644
--- a/src/main/java/dev/isxander/controlify/driver/BasicGamepadInputDriver.java
+++ b/src/main/java/dev/isxander/controlify/driver/gamepad/BasicGamepadInputDriver.java
@@ -1,6 +1,7 @@
-package dev.isxander.controlify.driver;
+package dev.isxander.controlify.driver.gamepad;
 
 import dev.isxander.controlify.controller.gamepad.GamepadState;
+import dev.isxander.controlify.driver.Driver;
 
 public interface BasicGamepadInputDriver extends Driver {
 
diff --git a/src/main/java/dev/isxander/controlify/driver/GLFWGamepadDriver.java b/src/main/java/dev/isxander/controlify/driver/gamepad/GLFWGamepadDriver.java
similarity index 95%
rename from src/main/java/dev/isxander/controlify/driver/GLFWGamepadDriver.java
rename to src/main/java/dev/isxander/controlify/driver/gamepad/GLFWGamepadDriver.java
index 25b3e1a..68ee19e 100644
--- a/src/main/java/dev/isxander/controlify/driver/GLFWGamepadDriver.java
+++ b/src/main/java/dev/isxander/controlify/driver/gamepad/GLFWGamepadDriver.java
@@ -1,6 +1,8 @@
-package dev.isxander.controlify.driver;
+package dev.isxander.controlify.driver.gamepad;
 
 import dev.isxander.controlify.controller.gamepad.GamepadState;
+import dev.isxander.controlify.driver.GUIDProvider;
+import dev.isxander.controlify.driver.NameProviderDriver;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWGamepadState;
 
diff --git a/src/main/java/dev/isxander/controlify/driver/GamepadDrivers.java b/src/main/java/dev/isxander/controlify/driver/gamepad/GamepadDrivers.java
similarity index 96%
rename from src/main/java/dev/isxander/controlify/driver/GamepadDrivers.java
rename to src/main/java/dev/isxander/controlify/driver/gamepad/GamepadDrivers.java
index 3647820..c0d44f5 100644
--- a/src/main/java/dev/isxander/controlify/driver/GamepadDrivers.java
+++ b/src/main/java/dev/isxander/controlify/driver/gamepad/GamepadDrivers.java
@@ -1,7 +1,8 @@
-package dev.isxander.controlify.driver;
+package dev.isxander.controlify.driver.gamepad;
 
 import com.google.common.collect.Sets;
 import dev.isxander.controlify.debug.DebugProperties;
+import dev.isxander.controlify.driver.*;
 import dev.isxander.controlify.hid.HIDDevice;
 import dev.isxander.controlify.utils.Log;
 
diff --git a/src/main/java/dev/isxander/controlify/driver/SDL2GamepadDriver.java b/src/main/java/dev/isxander/controlify/driver/gamepad/SDL2GamepadDriver.java
similarity index 98%
rename from src/main/java/dev/isxander/controlify/driver/SDL2GamepadDriver.java
rename to src/main/java/dev/isxander/controlify/driver/gamepad/SDL2GamepadDriver.java
index 6d03507..221f8c0 100644
--- a/src/main/java/dev/isxander/controlify/driver/SDL2GamepadDriver.java
+++ b/src/main/java/dev/isxander/controlify/driver/gamepad/SDL2GamepadDriver.java
@@ -1,10 +1,10 @@
-package dev.isxander.controlify.driver;
+package dev.isxander.controlify.driver.gamepad;
 
 import com.sun.jna.Memory;
-import com.sun.jna.Pointer;
 import dev.isxander.controlify.controller.BatteryLevel;
 import dev.isxander.controlify.controller.gamepad.GamepadState;
 import dev.isxander.controlify.debug.DebugProperties;
+import dev.isxander.controlify.driver.*;
 import dev.isxander.controlify.utils.Log;
 import io.github.libsdl4j.api.gamecontroller.SDL_GameController;
 import net.minecraft.util.Mth;
diff --git a/src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java b/src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java
index 3e3273b..0f7066d 100644
--- a/src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java
+++ b/src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java
@@ -164,7 +164,7 @@ public class ControllerHIDService {
                 Log.LOGGER.info("Using SDL to identify controller type.");
                 return Optional.of(new ControllerHIDInfo(
                         ControllerType.getTypeForHID(new HIDIdentifier(vid, pid)),
-                        Optional.of(new HIDDevice.IDOnly(vid, pid, path))
+                        Optional.of(new HIDDevice.SDLHidApi(vid, pid, path))
                 ));
             }
         }
diff --git a/src/main/java/dev/isxander/controlify/hid/HIDDevice.java b/src/main/java/dev/isxander/controlify/hid/HIDDevice.java
index 22fa6c6..dde0cc8 100644
--- a/src/main/java/dev/isxander/controlify/hid/HIDDevice.java
+++ b/src/main/java/dev/isxander/controlify/hid/HIDDevice.java
@@ -1,6 +1,11 @@
 package dev.isxander.controlify.hid;
 
-public sealed interface HIDDevice permits HIDDevice.Hid4Java, HIDDevice.IDOnly {
+import com.sun.jna.Memory;
+import io.github.libsdl4j.api.hidapi.SDL_hid_device;
+import io.github.libsdl4j.api.hidapi.SdlHidApi;
+import io.github.libsdl4j.jna.size_t;
+
+public sealed interface HIDDevice permits HIDDevice.Hid4Java, HIDDevice.IDOnly, HIDDevice.SDLHidApi {
     int vendorID();
 
     int productID();
@@ -88,4 +93,69 @@ public sealed interface HIDDevice permits HIDDevice.Hid4Java, HIDDevice.IDOnly {
             throw new UnsupportedOperationException();
         }
     }
+
+    final class SDLHidApi implements HIDDevice {
+        private final int vendorId;
+        private final int productId;
+        private final String path;
+
+        private SDL_hid_device device;
+
+        public SDLHidApi(int vendorId, int productId, String path) {
+            this.vendorId = vendorId;
+            this.productId = productId;
+            this.path = path;
+            this.device = null;
+        }
+
+        @Override
+        public int vendorID() {
+            return vendorId;
+        }
+
+        @Override
+        public int productID() {
+            return productId;
+        }
+
+        @Override
+        public String path() {
+            return path;
+        }
+
+        @Override
+        public boolean supportsCommunication() {
+            return true;
+        }
+
+        @Override
+        public void open() {
+            device = SdlHidApi.SDL_hid_open_path(path, 0);
+            SdlHidApi.SDL_hid_set_nonblocking(device, 1);
+        }
+
+        @Override
+        public void close() {
+            SdlHidApi.SDL_hid_close(device);
+            device = null;
+        }
+
+        @Override
+        public int read(byte[] buffer) {
+            try (Memory memory = new Memory(buffer.length)) {
+                int ret = SdlHidApi.SDL_hid_read(device, memory, new size_t(buffer.length));
+                memory.read(0, buffer, 0, buffer.length);
+                return ret;
+            }
+        }
+
+        @Override
+        public int write(byte[] buffer, int packetLength, byte reportId) {
+            try (Memory memory = new Memory(buffer.length + 1)) {
+                memory.setByte(buffer.length, reportId);
+                memory.write(1, buffer, 0, buffer.length);
+                return SdlHidApi.SDL_hid_write(device, memory, new size_t(buffer.length));
+            }
+        }
+    }
 }