Disable input events when necessary

Disable input events on secondary displays before Android 10, even if
FLAG_PRESENTATION is not set.

Ref #1288 <https://github.com/Genymobile/scrcpy/issues/1288>

FAQ.md

@@ -142,13 +142,13 @@ screen, then you might get poor quality, especially visible on text (see [#40]).
 To improve downscaling quality, trilinear filtering is enabled automatically
 if the renderer is OpenGL and if it supports mipmapping.
 
-On Windows or macOS, you might need to force OpenGL:
+On Windows, you might want to force OpenGL:
 
 ```
 scrcpy --render-driver=opengl
 ```
 
-On Windows, you may also need to configure the [scaling behavior].
+You may also need to configure the [scaling behavior]:
 
 > `scrcpy.exe` > Properties > Compatibility > Change high DPI settings >
 > Override high DPI scaling behavior > Scaling performed by: _Application_.

README.md

@@ -363,7 +363,7 @@ Note that _scrcpy_ manages 3 different rotations:
    current running app may refuse, if it does support the requested
    orientation).
  - `--lock-video-orientation` changes the mirroring orientation (the orientation
-   of the video sent from the device to the computer. This affects the
+   of the video sent from the device to the computer). This affects the
    recording.
  - `--rotation` (or `Ctrl`+`←`/`Ctrl`+`→`) rotates only the window content. This
    affects only the display, not the recording.

app/src/control_msg.c

@@ -45,8 +45,9 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
             buffer_write32be(&buf[6], msg->inject_keycode.metastate);
             return 10;
         case CONTROL_MSG_TYPE_INJECT_TEXT: {
-            size_t len = write_string(msg->inject_text.text,
+            size_t len =
-                                      CONTROL_MSG_TEXT_MAX_LENGTH, &buf[1]);
+                write_string(msg->inject_text.text,
+                             CONTROL_MSG_INJECT_TEXT_MAX_LENGTH, &buf[1]);
             return 1 + len;
         }
         case CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:

app/src/control_msg.h

@@ -10,7 +10,7 @@
 #include "android/keycodes.h"
 #include "common.h"
 
-#define CONTROL_MSG_TEXT_MAX_LENGTH 300
+#define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300
 #define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4093
 #define CONTROL_MSG_SERIALIZED_MAX_SIZE \
     (3 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)

app/tests/test_control_msg_serialize.c

@@ -49,20 +49,20 @@ static void test_serialize_inject_text(void) {
 static void test_serialize_inject_text_long(void) {
     struct control_msg msg;
     msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
-    char text[CONTROL_MSG_TEXT_MAX_LENGTH + 1];
+    char text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH + 1];
     memset(text, 'a', sizeof(text));
-    text[CONTROL_MSG_TEXT_MAX_LENGTH] = '\0';
+    text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
     msg.inject_text.text = text;
 
     unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 3 + CONTROL_MSG_TEXT_MAX_LENGTH);
+    assert(size == 3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
 
-    unsigned char expected[3 + CONTROL_MSG_TEXT_MAX_LENGTH];
+    unsigned char expected[3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
     expected[0] = CONTROL_MSG_TYPE_INJECT_TEXT;
     expected[1] = 0x01;
     expected[2] = 0x2c; // text length (16 bits)
-    memset(&expected[3], 'a', CONTROL_MSG_TEXT_MAX_LENGTH);
+    memset(&expected[3], 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
 
     assert(!memcmp(buf, expected, sizeof(expected)));
 }

meson.build

@@ -1,6 +1,6 @@
 project('scrcpy', 'c',
         version: '1.12.1',
-        meson_version: '>= 0.37',
+        meson_version: '>= 0.48',
         default_options: [
             'c_std=c11',
             'warning_level=2',

server/meson.build

@@ -3,7 +3,9 @@
 prebuilt_server = get_option('prebuilt_server')
 if prebuilt_server == ''
     custom_target('scrcpy-server',
-                  build_always: true,  # gradle is responsible for tracking source changes
+                  # gradle is responsible for tracking source changes
+                  build_by_default: true,
+                  build_always_stale: true,
                   output: 'scrcpy-server',
                   command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
                   console: true,

server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java

@@ -13,8 +13,8 @@ public class ControlMessageReader {
     static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
     static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
 
-    public static final int TEXT_MAX_LENGTH = 300;
     public static final int CLIPBOARD_TEXT_MAX_LENGTH = 4093;
+    public static final int INJECT_TEXT_MAX_LENGTH = 300;
     private static final int RAW_BUFFER_SIZE = 1024;
 
     private final byte[] rawBuffer = new byte[RAW_BUFFER_SIZE];

server/src/main/java/com/genymobile/scrcpy/Device.java

@@ -36,10 +36,7 @@ public final class Device {
      */
     private final int layerStack;
 
-    /**
+    private final boolean supportsInputEvents;
-     * The FLAG_PRESENTATION from the DisplayInfo
-     */
-    private final boolean isPresentationDisplay;
 
     public Device(Options options) {
         displayId = options.getDisplayId();
@@ -53,7 +50,6 @@ public final class Device {
 
         screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
         layerStack = displayInfo.getLayerStack();
-        isPresentationDisplay = (displayInfoFlags & DisplayInfo.FLAG_PRESENTATION) != 0;
 
         registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
@@ -73,8 +69,10 @@ public final class Device {
             Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
         }
 
-        if (!supportsInputEvents()) {
+        // main display or any display on Android >= Q
-            Ln.w("Input events are not supported for displays with FLAG_PRESENTATION enabled for devices with API lower than 29");
+        supportsInputEvents = displayId == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+        if (!supportsInputEvents) {
+            Ln.w("Input events are not supported for secondary displays before Android 10");
         }
     }
 
@@ -116,10 +114,7 @@ public final class Device {
     }
 
     public boolean supportsInputEvents() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        return supportsInputEvents;
-            return true;
-        }
-        return !isPresentationDisplay;
     }
 
     public boolean injectInputEvent(InputEvent inputEvent, int mode) {

server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java

@@ -8,7 +8,6 @@ public final class DisplayInfo {
     private final int flags;
 
     public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;
-    public static final int FLAG_PRESENTATION = 0x00000008;
 
     public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags) {
         this.displayId = displayId;

server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java

@@ -66,7 +66,7 @@ public class ControlMessageReaderTest {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(bos);
         dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
-        byte[] text = new byte[ControlMessageReader.TEXT_MAX_LENGTH];
+        byte[] text = new byte[ControlMessageReader.INJECT_TEXT_MAX_LENGTH];
         Arrays.fill(text, (byte) 'a');
         dos.writeShort(text.length);
         dos.write(text);