moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-06-16 13:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't lie to our own clickpad heuristics when overriding the controller type

Browse Source
This commit is contained in:
Cameron Gutman
2023-10-16 23:38:12 -05:00
parent 3a89dbf4ab
commit dc1045b69e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+9 -4
View File
@@ -2984,7 +2984,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
return; return;
} }
byte type = MoonBridge.LI_CTYPE_UNKNOWN; byte type;
switch (inputDevice.getVendorId()) { switch (inputDevice.getVendorId()) {
case 0x045e: // Microsoft case 0x045e: // Microsoft
type = MoonBridge.LI_CTYPE_XBOX; type = MoonBridge.LI_CTYPE_XBOX;
@@ -3067,10 +3067,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
capabilities |= MoonBridge.LI_CCAP_GYRO; capabilities |= MoonBridge.LI_CCAP_GYRO;
} }
// Override the detected controller type if we're emulating motion sensors on an Xbox controller byte reportedType;
if (type != MoonBridge.LI_CTYPE_PS && sensorManager != null) { if (type != MoonBridge.LI_CTYPE_PS && sensorManager != null) {
// Override the detected controller type if we're emulating motion sensors on an Xbox controller
Toast.makeText(activityContext, activityContext.getResources().getText(R.string.toast_controller_type_changed), Toast.LENGTH_LONG).show(); Toast.makeText(activityContext, activityContext.getResources().getText(R.string.toast_controller_type_changed), Toast.LENGTH_LONG).show();
type = MoonBridge.LI_CTYPE_UNKNOWN; reportedType = MoonBridge.LI_CTYPE_UNKNOWN;
}
else {
// Report the true type to the host PC if we're not emulating motion sensors
reportedType = type;
} }
// We can perform basic rumble with any vibrator // We can perform basic rumble with any vibrator
@@ -3093,7 +3098,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
} }
conn.sendControllerArrivalEvent((byte)controllerNumber, getActiveControllerMask(), conn.sendControllerArrivalEvent((byte)controllerNumber, getActiveControllerMask(),
type, supportedButtonFlags, capabilities); reportedType, supportedButtonFlags, capabilities);
// After reporting arrival to the host, send initial battery state and begin monitoring // After reporting arrival to the host, send initial battery state and begin monitoring
backgroundThreadHandler.post(batteryStateUpdateRunnable); backgroundThreadHandler.post(batteryStateUpdateRunnable);