diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java index 263fc2fc..e52a86dc 100644 --- a/server/src/main/java/com/genymobile/scrcpy/Controller.java +++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java @@ -20,35 +20,35 @@ public class Controller { private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD); private long lastMouseDown; - private final MotionEvent.PointerProperties[] pointerProperties = {new MotionEvent.PointerProperties()}; - private final MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()}; + private final MotionEvent.PointerProperties[] mousePointerProperties = {new MotionEvent.PointerProperties()}; + private final MotionEvent.PointerCoords[] mousePointerCoords = {new MotionEvent.PointerCoords()}; public Controller(Device device, DesktopConnection connection) { this.device = device; this.connection = connection; - initPointer(); + initMousePointer(); sender = new DeviceMessageSender(connection); } - private void initPointer() { - MotionEvent.PointerProperties props = pointerProperties[0]; + private void initMousePointer() { + MotionEvent.PointerProperties props = mousePointerProperties[0]; props.id = 0; props.toolType = MotionEvent.TOOL_TYPE_FINGER; - MotionEvent.PointerCoords coords = pointerCoords[0]; + MotionEvent.PointerCoords coords = mousePointerCoords[0]; coords.orientation = 0; coords.pressure = 1; coords.size = 1; } - private void setPointerCoords(Point point) { - MotionEvent.PointerCoords coords = pointerCoords[0]; + private void setMousePointerCoords(Point point) { + MotionEvent.PointerCoords coords = mousePointerCoords[0]; coords.x = point.getX(); coords.y = point.getY(); } private void setScroll(int hScroll, int vScroll) { - MotionEvent.PointerCoords coords = pointerCoords[0]; + MotionEvent.PointerCoords coords = mousePointerCoords[0]; coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll); coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll); } @@ -158,8 +158,8 @@ public class Controller { // ignore event return false; } - setPointerCoords(point); - MotionEvent event = MotionEvent.obtain(lastMouseDown, now, action, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, 0, 0, + setMousePointerCoords(point); + MotionEvent event = MotionEvent.obtain(lastMouseDown, now, action, 1, mousePointerProperties, mousePointerCoords, 0, buttons, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0); return injectEvent(event); } @@ -171,9 +171,9 @@ public class Controller { // ignore event return false; } - setPointerCoords(point); + setMousePointerCoords(point); setScroll(hScroll, vScroll); - MotionEvent event = MotionEvent.obtain(lastMouseDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, 0, + MotionEvent event = MotionEvent.obtain(lastMouseDown, now, MotionEvent.ACTION_SCROLL, 1, mousePointerProperties, mousePointerCoords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_MOUSE, 0); return injectEvent(event); }