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

Fix broken keyboards and gamepads when an input device wasn't provided (such as a virtual gamepad or IME)

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-19 18:37:47 -08:00
parent 03f706fb85
commit ec71060d98
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/limelight/Game.java
View File

@ -386,11 +386,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
InputDevice dev = event.getDevice();
if (dev == null) {
return super.onKeyDown(keyCode, event);
}
// Pass-through virtual navigation keys // Pass-through virtual navigation keys
if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) { if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
@ -429,11 +424,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
InputDevice dev = event.getDevice();
if (dev == null) {
return super.onKeyUp(keyCode, event);
}
// Pass-through virtual navigation keys // Pass-through virtual navigation keys
if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) { if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);

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

@ -45,6 +45,7 @@ public class ControllerHandler {
private NvConnection conn; private NvConnection conn;
private double stickDeadzone; private double stickDeadzone;
private final ControllerMapping defaultMapping = new ControllerMapping();
public ControllerHandler(NvConnection conn, int deadzonePercentage) { public ControllerHandler(NvConnection conn, int deadzonePercentage) {
this.conn = conn; this.conn = conn;
@ -52,6 +53,16 @@ public class ControllerHandler {
// We want limelight-common to scale the axis values to match Xinput values // We want limelight-common to scale the axis values to match Xinput values
ControllerPacket.enableAxisScaling = true; ControllerPacket.enableAxisScaling = true;
// Initialize the default mapping for events with no device
defaultMapping.leftStickXAxis = MotionEvent.AXIS_X;
defaultMapping.leftStickYAxis = MotionEvent.AXIS_Y;
defaultMapping.leftStickDeadzoneRadius = (float) stickDeadzone;
defaultMapping.rightStickXAxis = MotionEvent.AXIS_Z;
defaultMapping.rightStickYAxis = MotionEvent.AXIS_RZ;
defaultMapping.rightStickDeadzoneRadius = (float) stickDeadzone;
defaultMapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
defaultMapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
} }
private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) { private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
@ -161,9 +172,9 @@ public class ControllerHandler {
} }
private ControllerMapping getMappingForDevice(InputDevice dev) { private ControllerMapping getMappingForDevice(InputDevice dev) {
// Unknown devices can't be handled // Unknown devices use the default mapping
if (dev == null) { if (dev == null) {
return null; return defaultMapping;
} }
String descriptor = dev.getDescriptor(); String descriptor = dev.getDescriptor();
@ -294,9 +305,6 @@ public class ControllerHandler {
public boolean handleMotionEvent(MotionEvent event) { public boolean handleMotionEvent(MotionEvent event) {
ControllerMapping mapping = getMappingForDevice(event.getDevice()); ControllerMapping mapping = getMappingForDevice(event.getDevice());
if (mapping == null) {
return false;
}
// Handle left stick events outside of the deadzone // Handle left stick events outside of the deadzone
if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) { if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
@ -358,9 +366,6 @@ public class ControllerHandler {
public boolean handleButtonUp(KeyEvent event) { public boolean handleButtonUp(KeyEvent event) {
ControllerMapping mapping = getMappingForDevice(event.getDevice()); ControllerMapping mapping = getMappingForDevice(event.getDevice());
if (mapping == null) {
return false;
}
int keyCode = handleRemapping(mapping, event); int keyCode = handleRemapping(mapping, event);
if (keyCode == 0) { if (keyCode == 0) {
@ -481,9 +486,6 @@ public class ControllerHandler {
public boolean handleButtonDown(KeyEvent event) { public boolean handleButtonDown(KeyEvent event) {
ControllerMapping mapping = getMappingForDevice(event.getDevice()); ControllerMapping mapping = getMappingForDevice(event.getDevice());
if (mapping == null) {
return false;
}
int keyCode = handleRemapping(mapping, event); int keyCode = handleRemapping(mapping, event);
if (keyCode == 0) { if (keyCode == 0) {