djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Use SDL when a controller isn't detected with hid4java

Browse Source
This commit is contained in:
isXander
2023-07-12 18:03:50 +01:00
parent 4b75eab7bb
commit 9cb95b0a94
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java
View File

@ -61,26 +61,18 @@ public class ControllerHIDService {
} }
if (disabled) { if (disabled) {
if (SDL2NativesManager.isLoaded()) { return fetchTypeFromSDL(jid)
int vid = SDL.SDL_JoystickGetDeviceVendor(jid); .orElse(new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty()));
int pid = SDL.SDL_JoystickGetDeviceProduct(jid);
String path = GLFW.glfwGetJoystickGUID(jid);
if (vid != 0 && pid != 0) {
Log.LOGGER.info("Using SDL to identify controller type.");
return new ControllerHIDInfo(ControllerType.getTypeForHID(new HIDIdentifier(vid, pid)), Optional.of(new HIDDevice.IDOnly(vid, pid, path)));
}
}
return new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty());
} }
doScanOnThisThread(); doScanOnThisThread();
Pair<HidDevice, HIDIdentifier> hid = unconsumedControllerHIDs.poll(); Pair<HidDevice, HIDIdentifier> hid = unconsumedControllerHIDs.poll();
if (hid == null) { if (hid == null) {
Log.LOGGER.warn("No controller found via USB hardware scan! This prevents identifying controller type."); Log.LOGGER.warn("No controller found via USB hardware scan! Using SDL if available.");
return new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty());
return fetchTypeFromSDL(jid)
.orElse(new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty()));
} }
ControllerType type = ControllerType.getTypeForHID(hid.getSecond()); ControllerType type = ControllerType.getTypeForHID(hid.getSecond());
@ -136,6 +128,23 @@ public class ControllerHIDService {
} }
} }
private Optional<ControllerHIDInfo> fetchTypeFromSDL(int jid) {
if (SDL2NativesManager.isLoaded()) {
int vid = SDL.SDL_JoystickGetDeviceVendor(jid);
int pid = SDL.SDL_JoystickGetDeviceProduct(jid);
String path = GLFW.glfwGetJoystickGUID(jid);
if (vid != 0 && pid != 0) {
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))
));
}
}
return Optional.empty();
}
public void unconsumeController(ControllerHIDInfo hid) { public void unconsumeController(ControllerHIDInfo hid) {
hid.hidDevice.ifPresent(device -> attachedDevices.remove(device.path())); hid.hidDevice.ifPresent(device -> attachedDevices.remove(device.path()));
} }