This is just to document an attempt to fix Genymobile#3568

The ACTION_UP is delivered for middle and right button, but since the combination of TOOL_TYPE_FINGER and SOURCE_MOUSE is not something you can generate with a hardware the correct interpretation of the events in the actual app depends on how relaxed is the app event handling.
paweljasinski · Nov 10, 2022 · 14d7351 · 14d7351
1 parent 72ba913
commit 14d7351
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c
@@ -325,6 +325,7 @@ scrcpy(struct scrcpy_options *options) {
         .tcpip_dst = options->tcpip_dst,
         .cleanup = options->cleanup,
         .power_on = options->power_on,
+        .forward_all_clicks = options->forward_all_clicks,
     };
 
     static const struct sc_server_callbacks cbs = {

diff --git a/app/src/server.c b/app/src/server.c
@@ -252,6 +252,10 @@ execute_server(struct sc_server *server,
         // By default, power_on is true
         ADD_PARAM("power_on=false");
     }
+    if (params->forward_all_clicks) {
+        // By default, forward all clicks is false
+        ADD_PARAM("forward_all_clicks=true");
+    }
 
 #undef ADD_PARAM
 

diff --git a/app/src/server.h b/app/src/server.h
@@ -48,6 +48,7 @@ struct sc_server_params {
     bool select_tcpip;
     bool cleanup;
     bool power_on;
+    bool forward_all_clicks;
 };
 
 struct sc_server {

diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -23,6 +23,7 @@ public class Controller {
     private final DeviceMessageSender sender;
     private final boolean clipboardAutosync;
     private final boolean powerOn;
+    private final boolean forwardAllClicks;
 
     private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
 
@@ -33,11 +34,12 @@ public class Controller {
 
     private boolean keepPowerModeOff;
 
-    public Controller(Device device, DesktopConnection connection, boolean clipboardAutosync, boolean powerOn) {
+    public Controller(Device device, DesktopConnection connection, boolean clipboardAutosync, boolean powerOn, boolean forwardAllClicks) {
         this.device = device;
         this.connection = connection;
         this.clipboardAutosync = clipboardAutosync;
         this.powerOn = powerOn;
+        this.forwardAllClicks = forwardAllClicks;
         initPointers();
         sender = new DeviceMessageSender(connection);
     }
@@ -210,13 +212,11 @@ private boolean injectTouch(int action, long pointerId, Position position, float
         }
 
         // Right-click and middle-click only work if the source is a mouse
-        boolean nonPrimaryButtonPressed = (buttons & ~MotionEvent.BUTTON_PRIMARY) != 0;
-        int source = nonPrimaryButtonPressed ? InputDevice.SOURCE_MOUSE : InputDevice.SOURCE_TOUCHSCREEN;
+        int source = forwardAllClicks ? InputDevice.SOURCE_MOUSE : InputDevice.SOURCE_TOUCHSCREEN;
         if (source != InputDevice.SOURCE_MOUSE) {
             // Buttons must not be set for touch events
             buttons = 0;
         }
-
         MotionEvent event = MotionEvent
                 .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source,
                         0);

diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -23,6 +23,7 @@ public class Options {
     private boolean downsizeOnError = true;
     private boolean cleanup = true;
     private boolean powerOn = true;
+    private boolean forwardAllClicks = false;
 
     // Options not used by the scrcpy client, but useful to use scrcpy-server directly
     private boolean sendDeviceMeta = true; // send device name and size
@@ -196,4 +197,13 @@ public boolean getSendDummyByte() {
     public void setSendDummyByte(boolean sendDummyByte) {
         this.sendDummyByte = sendDummyByte;
     }
+
+    public boolean getForwardAllClicks() {
+        return forwardAllClicks;
+    }
+
+    public void setForwardAllClicks(boolean forwardAllClicks) {
+        this.forwardAllClicks = forwardAllClicks;
+    }
+
 }
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -82,7 +82,7 @@ private static void scrcpy(Options options) throws IOException {
             Thread controllerThread = null;
             Thread deviceMessageSenderThread = null;
             if (control) {
-                final Controller controller = new Controller(device, connection, options.getClipboardAutosync(), options.getPowerOn());
+                final Controller controller = new Controller(device, connection, options.getClipboardAutosync(), options.getPowerOn(), options.getForwardAllClicks());
 
                 // asynchronous
                 controllerThread = startController(controller);
@@ -272,6 +272,11 @@ private static Options createOptions(String... args) {
                         options.setSendDummyByte(false);
                     }
                     break;
+                case "forward_all_clicks":
+                    boolean forwardAllClicks = Boolean.parseBoolean(value);
+                    options.setForwardAllClicks(forwardAllClicks);
+                    break;
+
                 default:
                     Ln.w("Unknown server option: " + key);
                     break;