moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle joysticks that only return events for one trigger axis

Browse Source
This commit is contained in:
Cameron Gutman 2018-04-21 15:09:57 -07:00
parent d8ae40376e
commit 381509b3a6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@ -837,16 +837,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
// to normal behavior, so ignore triggersIdleNegative for each trigger until // to normal behavior, so ignore triggersIdleNegative for each trigger until
// first touch. // first touch.
if (lt != 0) { if (lt != 0) {
context.leftTriggerUsed = true; context.leftTriggerAxisUsed = true;
} }
if (rt != 0) { if (rt != 0) {
context.rightTriggerUsed = true; context.rightTriggerAxisUsed = true;
} }
if (context.triggersIdleNegative) { if (context.triggersIdleNegative) {
if (context.leftTriggerUsed) { if (context.leftTriggerAxisUsed) {
lt = (lt + 1) / 2; lt = (lt + 1) / 2;
} }
if (context.rightTriggerUsed) { if (context.rightTriggerAxisUsed) {
rt = (rt + 1) / 2; rt = (rt + 1) / 2;
} }
} }
@ -1042,15 +1042,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
context.inputMap &= ~ControllerPacket.RS_CLK_FLAG; context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
break; break;
case KeyEvent.KEYCODE_BUTTON_L2: case KeyEvent.KEYCODE_BUTTON_L2:
if (context.leftTriggerAxis >= 0) { if (context.leftTriggerAxisUsed) {
// Suppress this digital event if an analog trigger is present // Suppress this digital event if an analog trigger is active
return true; return true;
} }
context.leftTrigger = 0; context.leftTrigger = 0;
break; break;
case KeyEvent.KEYCODE_BUTTON_R2: case KeyEvent.KEYCODE_BUTTON_R2:
if (context.rightTriggerAxis >= 0) { if (context.rightTriggerAxisUsed) {
// Suppress this digital event if an analog trigger is present // Suppress this digital event if an analog trigger is active
return true; return true;
} }
context.rightTrigger = 0; context.rightTrigger = 0;
@ -1162,15 +1162,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
context.inputMap |= ControllerPacket.RS_CLK_FLAG; context.inputMap |= ControllerPacket.RS_CLK_FLAG;
break; break;
case KeyEvent.KEYCODE_BUTTON_L2: case KeyEvent.KEYCODE_BUTTON_L2:
if (context.leftTriggerAxis >= 0) { if (context.leftTriggerAxisUsed) {
// Suppress this digital event if an analog trigger is present // Suppress this digital event if an analog trigger is active
return true; return true;
} }
context.leftTrigger = (byte)0xFF; context.leftTrigger = (byte)0xFF;
break; break;
case KeyEvent.KEYCODE_BUTTON_R2: case KeyEvent.KEYCODE_BUTTON_R2:
if (context.rightTriggerAxis >= 0) { if (context.rightTriggerAxisUsed) {
// Suppress this digital event if an analog trigger is present // Suppress this digital event if an analog trigger is active
return true; return true;
} }
context.rightTrigger = (byte)0xFF; context.rightTrigger = (byte)0xFF;
@ -1301,7 +1301,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
public int leftTriggerAxis = -1; public int leftTriggerAxis = -1;
public int rightTriggerAxis = -1; public int rightTriggerAxis = -1;
public boolean triggersIdleNegative; public boolean triggersIdleNegative;
public boolean leftTriggerUsed, rightTriggerUsed; public boolean leftTriggerAxisUsed, rightTriggerAxisUsed;
public int hatXAxis = -1; public int hatXAxis = -1;
public int hatYAxis = -1; public int hatYAxis = -1;