feat: inject right click #195

Xtr126 · Xtr126 · commit b7bf3188caf3 · 2026-03-28T17:13:18.000+05:30
diff --git a/app/src/main/java/xtr/keymapper/keymap/KeymapProfile.java b/app/src/main/java/xtr/keymapper/keymap/KeymapProfile.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/app/src/main/java/xtr/keymapper/server/IInputInterface.java b/app/src/main/java/xtr/keymapper/server/IInputInterface.java
@@ -9,6 +9,9 @@
 public interface IInputInterface {
     void injectEvent(float x, float y, int action, int pointerId);
     void injectHoverEvent(float x, float y, int pointerId);
+
+    void injectRightClickEvent(float x, float y, int pointerId, boolean press);
+
     void injectScroll(float x, float y, float value);
     void pauseResumeKeymap();
     KeymapConfig getKeymapConfig();
diff --git a/app/src/main/java/xtr/keymapper/server/Input.java b/app/src/main/java/xtr/keymapper/server/Input.java
@@ -17,11 +17,14 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import xtr.keymapper.server.event.MouseEventHandler;
+
 public class Input {
 
     static Method injectInputEventMethod;
     static Object inputManager;
     static Method setDisplayIdMethod;
+    static Method setActionButtonMethod;
 
     private final PointersState pointersState = new PointersState();
     private final MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
@@ -102,6 +105,114 @@ public void injectTouch(int action, int pointerId, float pressure, float x, floa
         injectInputEvent(motionEvent);
     }
 
+    void injectRightClick(long pointerId, float x, float y, boolean pressed) {
+        long now = SystemClock.uptimeMillis();
+
+        final float pressure = 1.0f;
+        final int actionButton = MotionEvent.BUTTON_SECONDARY;
+        int action = pressed ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_UP;
+        int buttons = pressed ? MotionEvent.BUTTON_SECONDARY : 0;
+
+        Point point = new Point(x, y);
+
+        int pointerIndex = pointersState.getPointerIndex(pointerId);
+        if (pointerIndex == -1) {
+            Log.e(RemoteService.TAG, "Too many pointers for touch event");
+        }
+
+        Pointer pointer = pointersState.get(pointerIndex);
+        pointer.setPoint(point);
+        pointer.setPressure(pressure);
+
+        int source;
+        if (pointerId == MouseEventHandler.pointerId) {
+            // real mouse event, or event incompatible with a finger
+            pointerProperties[pointerIndex].toolType = MotionEvent.TOOL_TYPE_MOUSE;
+            source = InputDevice.SOURCE_MOUSE;
+            pointer.setUp(buttons == 0);
+        } else {
+            // POINTER_ID_GENERIC_FINGER, POINTER_ID_VIRTUAL_FINGER or real touch from device
+            pointerProperties[pointerIndex].toolType = MotionEvent.TOOL_TYPE_FINGER;
+            source = InputDevice.SOURCE_TOUCHSCREEN;
+            // Buttons must not be set for touch events
+            buttons = 0;
+            pointer.setUp(action == MotionEvent.ACTION_UP);
+        }
+
+        int pointerCount = pointersState.update(pointerProperties, pointerCoords);
+        if (pointerCount == 1) {
+            if (action == MotionEvent.ACTION_DOWN) {
+                lastTouchDown = now;
+            }
+        } else {
+            // secondary pointers must use ACTION_POINTER_* ORed with the pointerIndex
+            if (action == MotionEvent.ACTION_UP) {
+                action = MotionEvent.ACTION_POINTER_UP | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            } else {
+                action = MotionEvent.ACTION_POINTER_DOWN | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            }
+        }
+
+        /* If the input device is a mouse (on API >= 23):
+         *   - the first button pressed must first generate ACTION_DOWN;
+         *   - all button pressed (including the first one) must generate ACTION_BUTTON_PRESS;
+         *   - all button released (including the last one) must generate ACTION_BUTTON_RELEASE;
+         *   - the last button released must in addition generate ACTION_UP.
+         *
+         * Otherwise, Chrome does not work properly: <https://github.com/Genymobile/scrcpy/issues/3635>
+         */
+        if (source == InputDevice.SOURCE_MOUSE) {
+            if (action == MotionEvent.ACTION_DOWN) {
+                // First button pressed: ACTION_DOWN
+                MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
+                        pointerCoords, 0, buttons, 1f, 1f, 0, 0, source, 0);
+                injectInputEvent(downEvent);
+
+                // Any button pressed: ACTION_BUTTON_PRESS
+                MotionEvent pressEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_BUTTON_PRESS, pointerCount, pointerProperties,
+                        pointerCoords, 0, buttons, 1f, 1f, 0, 0, source, 0);
+                try {
+                    if (setActionButtonMethod != null) {
+                        setActionButtonMethod.invoke(pressEvent, actionButton);
+                    }
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    Log.e(RemoteService.TAG, e.getMessage(), e);
+                }
+
+                injectInputEvent(pressEvent);
+
+                return;
+            }
+
+            if (action == MotionEvent.ACTION_UP) {
+                // Any button released: ACTION_BUTTON_RELEASE
+                MotionEvent releaseEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_BUTTON_RELEASE, pointerCount, pointerProperties,
+                        pointerCoords, 0, buttons, 1f, 1f, 0, 0, source, 0);
+                try {
+                    if (setActionButtonMethod != null) {
+                        setActionButtonMethod.invoke(releaseEvent, actionButton);
+                    }
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    Log.e(RemoteService.TAG, e.getMessage(), e);
+                }
+
+                injectInputEvent(releaseEvent);
+
+                // Last button released: ACTION_UP
+                MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
+                        pointerCoords, 0, buttons, 1f, 1f, 0, 0, source, 0);
+                injectInputEvent(upEvent);
+
+                return;
+            }
+        }
+
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+                0, 0, source, 0);
+        injectInputEvent(event);
+    }
+
+
     public void onScrollEvent(float x, float y, float value){
         mScrollThread.onScrollEvent(x, y, value);
     }
@@ -239,7 +350,8 @@ private void next() {
                  setDisplayIdMethod = MotionEvent.class.getDeclaredMethod(methodName, Integer.TYPE);
                  setDisplayIdMethod.setAccessible(true);
              }
-
+             setActionButtonMethod = MotionEvent.class.getDeclaredMethod("setActionButton", int.class);
+             setActionButtonMethod.setAccessible(true);
          } catch (Exception e) {
              Log.e(RemoteService.TAG, e.getMessage(), e);
          }
diff --git a/app/src/main/java/xtr/keymapper/server/InputService.java b/app/src/main/java/xtr/keymapper/server/InputService.java
@@ -94,6 +94,11 @@ public void injectHoverEvent(float x, float y, int pointerId) {
             input.injectTouch(MotionEvent.ACTION_HOVER_MOVE, pointerId, 1.0f, x, y);
     }
 
+    @Override
+    public void injectRightClickEvent(float x, float y, int pointerId, boolean pressed) {
+        input.injectRightClick(pointerId, x, y, pressed);
+    }
+
     public void injectScroll(float x, float y, float value) {
         input.onScrollEvent(x, y, value);
     }
diff --git a/app/src/main/java/xtr/keymapper/server/event/MouseEventHandler.java b/app/src/main/java/xtr/keymapper/server/event/MouseEventHandler.java
@@ -31,8 +31,7 @@ public class MouseEventHandler {
     float scroll_speed_multiplier;
     private MousePinchZoom pinchZoom;
     private MouseWheelZoom scrollZoomHandler;
-    private final int pointerId = PointerId.pid1.id;
-    private final int pointerIdRightClick = PointerId.pid3.id;
+    public static final int pointerId = PointerId.pid1.id;
     private MouseAimHandler mouseAimHandler;
     private MouseAimHandler mouseCameraHandler;
     private Key rightClick;
@@ -45,16 +44,16 @@ public class MouseEventHandler {
     private MouseAimHandler mouseAimOrCameraHandler;
     private MouseWalkHandler mouseWalkHandler;
 
-    public void triggerMouseAim() {
-        triggerMouseAimOrCamera(mouseAimHandler);
+    public boolean triggerMouseAim() {
+        return triggerMouseAimOrCamera(mouseAimHandler);
     }
 
 
     public void triggerCamera() {
         triggerMouseAimOrCamera(mouseCameraHandler);
     }
 
-    private void triggerMouseAimOrCamera(MouseAimHandler instance) {
+    private boolean triggerMouseAimOrCamera(MouseAimHandler instance) {
         mouseAimOrCameraHandler = instance;
         if (instance != null) {
             mouseAimActive = !mouseAimActive;
@@ -71,7 +70,9 @@ private void triggerMouseAimOrCamera(MouseAimHandler instance) {
                 instance.stop();
                 mInput.showCursor();
             }
+            return true;
         }
+        return false;
     }
 
     public MouseEventHandler(IInputInterface mInput) {
@@ -128,7 +129,7 @@ private void movePointerY() {
         mInput.moveCursorY(y1);
     }
 
-    private void handleRightClick(int value) {
+    private boolean handleRightClick(int value) {
         if (value == 1) {
             if (mouseWalkHandler != null) {
                 if (mouseWalkActive) {
@@ -138,12 +139,16 @@ private void handleRightClick(int value) {
                     mouseWalkHandler.resetPointer();
                     mouseWalkActive = true;
                 }
+                return true;
             }
             else if (mInput.getKeymapConfig().rightClickMouseAim)
-                triggerMouseAim();
+                return triggerMouseAim();
         }
-        else if (rightClick != null)
-            mInput.injectEvent(rightClick.x, rightClick.y, value, pointerIdRightClick);
+        else if (rightClick != null) {
+            mInput.injectEvent(rightClick.x, rightClick.y, value, pointerId);
+            return true;
+        }
+        return false;
     }
 
     public void handleEvent(int code, int value) {
@@ -187,7 +192,9 @@ private void handleMouseEvent(int code, int value) {
                 break;
 
             case BTN_RIGHT:
-                handleRightClick(value);
+                if (!handleRightClick(value)) {
+                    mInput.injectRightClickEvent(x1, y1, pointerId, value == 1);
+                }
                 break;
 
             case BTN_EXTRA:

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,11 @@ public void injectHoverEvent(float x, float y, int pointerId) {`
`94`	`94`	`input.injectTouch(MotionEvent.ACTION_HOVER_MOVE, pointerId, 1.0f, x, y);`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ @Override`
	`98`	`+ public void injectRightClickEvent(float x, float y, int pointerId, boolean pressed) {`
	`99`	`+ input.injectRightClick(pointerId, x, y, pressed);`
	`100`	`+ }`
	`101`	`+`
`97`	`102`	`public void injectScroll(float x, float y, float value) {`
`98`	`103`	`input.onScrollEvent(x, y, value);`
`99`	`104`	`}`