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

Avoid tons of redundant calls to InputEvent.getSource()

Browse Source
This commit is contained in:
Cameron Gutman
2021-07-17 14:01:12 -05:00
parent 5350651d6f
commit 04545ecbb0
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1089,8 +1089,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
// Handle a synthetic back button event that some Android OS versions // Handle a synthetic back button event that some Android OS versions
// create as a result of a right-click. This event WILL repeat if // create as a result of a right-click. This event WILL repeat if
// the right mouse button is held down, so we ignore those. // the right mouse button is held down, so we ignore those.
if ((event.getSource() == InputDevice.SOURCE_MOUSE || int eventSource = event.getSource();
event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) && if ((eventSource == InputDevice.SOURCE_MOUSE ||
eventSource == InputDevice.SOURCE_MOUSE_RELATIVE) &&
event.getKeyCode() == KeyEvent.KEYCODE_BACK) { event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
// Send the right mouse button event if mouse back and forward // Send the right mouse button event if mouse back and forward
@@ -1159,8 +1160,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
// Handle a synthetic back button event that some Android OS versions // Handle a synthetic back button event that some Android OS versions
// create as a result of a right-click. // create as a result of a right-click.
if ((event.getSource() == InputDevice.SOURCE_MOUSE || int eventSource = event.getSource();
event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) && if ((eventSource == InputDevice.SOURCE_MOUSE ||
eventSource == InputDevice.SOURCE_MOUSE_RELATIVE) &&
event.getKeyCode() == KeyEvent.KEYCODE_BACK) { event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
// Send the right mouse button event if mouse back and forward // Send the right mouse button event if mouse back and forward
@@ -1233,19 +1235,20 @@ public class Game extends Activity implements SurfaceHolder.Callback,
return false; return false;
} }
if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { int eventSource = event.getSource();
if ((eventSource & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
if (controllerHandler.handleMotionEvent(event)) { if (controllerHandler.handleMotionEvent(event)) {
return true; return true;
} }
} }
else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0 || else if ((eventSource & InputDevice.SOURCE_CLASS_POINTER) != 0 ||
(event.getSource() & InputDevice.SOURCE_CLASS_POSITION) != 0 || (eventSource & InputDevice.SOURCE_CLASS_POSITION) != 0 ||
event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) eventSource == InputDevice.SOURCE_MOUSE_RELATIVE)
{ {
// This case is for mice and non-finger touch devices // This case is for mice and non-finger touch devices
if (event.getSource() == InputDevice.SOURCE_MOUSE || if (eventSource == InputDevice.SOURCE_MOUSE ||
(event.getSource() & InputDevice.SOURCE_CLASS_POSITION) != 0 || // SOURCE_TOUCHPAD (eventSource & InputDevice.SOURCE_CLASS_POSITION) != 0 || // SOURCE_TOUCHPAD
event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE || eventSource == InputDevice.SOURCE_MOUSE_RELATIVE ||
(event.getPointerCount() >= 1 && (event.getPointerCount() >= 1 &&
(event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE || (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE ||
event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS || event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS ||
@@ -1272,7 +1275,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
conn.sendMouseMove(deltaX, deltaY); conn.sendMouseMove(deltaX, deltaY);
} }
} }
else if ((event.getSource() & InputDevice.SOURCE_CLASS_POSITION) != 0) { else if ((eventSource & InputDevice.SOURCE_CLASS_POSITION) != 0) {
// If this input device is not associated with the view itself (like a trackpad), // If this input device is not associated with the view itself (like a trackpad),
// we'll convert the device-specific coordinates to use to send the cursor position. // we'll convert the device-specific coordinates to use to send the cursor position.
// This really isn't ideal but it's probably better than nothing. // This really isn't ideal but it's probably better than nothing.
@@ -1282,8 +1285,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
// support pointer capture. // support pointer capture.
InputDevice device = event.getDevice(); InputDevice device = event.getDevice();
if (device != null) { if (device != null) {
InputDevice.MotionRange xRange = device.getMotionRange(MotionEvent.AXIS_X, event.getSource()); InputDevice.MotionRange xRange = device.getMotionRange(MotionEvent.AXIS_X, eventSource);
InputDevice.MotionRange yRange = device.getMotionRange(MotionEvent.AXIS_Y, event.getSource()); InputDevice.MotionRange yRange = device.getMotionRange(MotionEvent.AXIS_Y, eventSource);
// All touchpads coordinate planes should start at (0, 0) // All touchpads coordinate planes should start at (0, 0)
if (xRange != null && yRange != null && xRange.getMin() == 0 && yRange.getMin() == 0) { if (xRange != null && yRange != null && xRange.getMin() == 0 && yRange.getMin() == 0) {

5
app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java
View File

@@ -41,8 +41,9 @@ public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptu
// SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture. // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
// SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture. // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
// See https://developer.android.com/reference/android/view/View#requestPointerCapture() // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE || int eventSource = event.getSource();
(event.getSource() == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture()); return eventSource == InputDevice.SOURCE_MOUSE_RELATIVE ||
(eventSource == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
} }
@Override @Override