Accept negative window position

It seems to work on some window managers.

Fixes #1242 <https://github.com/Genymobile/scrcpy/issues/1242>

README.md

@@ -353,21 +353,6 @@ scrcpy --no-control
 scrcpy -n
 ```
 
-#### Display
-
-If several displays are available, it is possible to select the display to
-mirror:
-
-```bash
-scrcpy --display 1
-```
-
-The list of display ids can be retrieved by:
-
-```
-adb shell dumpsys display   # search "mDisplayId=" in the output
-```
-
 #### Turn screen off
 
 It is possible to turn the device screen off while mirroring on start with a

app/scrcpy.1

@@ -33,15 +33,6 @@ The values are expressed in the device natural orientation (typically, portrait
 .B \-\-max\-size
 value is computed on the cropped size.
 
-.TP
-.BI "\-\-display " id
-Specify the display id to mirror.
-
-The list of possible display ids can be listed by "adb shell dumpsys display"
-(search "mDisplayId=" in the output).
-
-Default is 0.
-
 .TP
 .B \-f, \-\-fullscreen
 Start in fullscreen.

app/src/cli.c

@@ -36,15 +36,6 @@ scrcpy_print_usage(const char *arg0) {
         "        (typically, portrait for a phone, landscape for a tablet).\n"
         "        Any --max-size value is computed on the cropped size.\n"
         "\n"
-        "    --display id\n"
-        "        Specify the display id to mirror.\n"
-        "\n"
-        "        The list of possible display ids can be listed by:\n"
-        "            adb shell dumpsys display\n"
-        "        (search \"mDisplayId=\" in the output)\n"
-        "\n"
-        "        Default is 0.\n"
-        "\n"
         "    -f, --fullscreen\n"
         "        Start in fullscreen.\n"
         "\n"
@@ -313,7 +304,7 @@ parse_lock_video_orientation(const char *s, int8_t *lock_video_orientation) {
 static bool
 parse_window_position(const char *s, int16_t *position) {
     // special value for "auto"
-    static_assert(WINDOW_POSITION_UNDEFINED == -0x8000, "unexpected value");
+    static_assert(WINDOW_POSITION_UNDEFINED == -0x8000);
 
     if (!strcmp(s, "auto")) {
         *position = WINDOW_POSITION_UNDEFINED;
@@ -372,18 +363,6 @@ parse_port_range(const char *s, struct port_range *port_range) {
     return true;
 }
 
-static bool
-parse_display_id(const char *s, uint16_t *display_id) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "display id");
-    if (!ok) {
-        return false;
-    }
-
-    *display_id = (uint16_t) value;
-    return true;
-}
-
 static bool
 parse_record_format(const char *optarg, enum recorder_format *format) {
     if (!strcmp(optarg, "mp4")) {
@@ -428,7 +407,6 @@ guess_record_format(const char *filename) {
 #define OPT_WINDOW_BORDERLESS      1011
 #define OPT_MAX_FPS                1012
 #define OPT_LOCK_VIDEO_ORIENTATION 1013
-#define OPT_DISPLAY_ID             1014
 
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -436,7 +414,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
         {"always-on-top",          no_argument,       NULL, OPT_ALWAYS_ON_TOP},
         {"bit-rate",               required_argument, NULL, 'b'},
         {"crop",                   required_argument, NULL, OPT_CROP},
-        {"display",                required_argument, NULL, OPT_DISPLAY_ID},
         {"fullscreen",             no_argument,       NULL, 'f'},
         {"help",                   no_argument,       NULL, 'h'},
         {"lock-video-orientation", required_argument, NULL,
@@ -485,11 +462,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
             case OPT_CROP:
                 opts->crop = optarg;
                 break;
-            case OPT_DISPLAY_ID:
-                if (!parse_display_id(optarg, &opts->display_id)) {
-                    return false;
-                }
-                break;
             case 'f':
                 opts->fullscreen = true;
                 break;

app/src/scrcpy.c

@@ -286,7 +286,6 @@ scrcpy(const struct scrcpy_options *options) {
         .max_fps = options->max_fps,
         .lock_video_orientation = options->lock_video_orientation,
         .control = options->control,
-        .display_id = options->display_id,
     };
     if (!server_start(&server, options->serial, &params)) {
         return false;

app/src/scrcpy.h

@@ -25,7 +25,6 @@ struct scrcpy_options {
     int16_t window_y; // WINDOW_POSITION_UNDEFINED for "auto"
     uint16_t window_width;
     uint16_t window_height;
-    uint16_t display_id;
     bool show_touches;
     bool fullscreen;
     bool always_on_top;
@@ -56,7 +55,6 @@ struct scrcpy_options {
     .window_y = WINDOW_POSITION_UNDEFINED, \
     .window_width = 0, \
     .window_height = 0, \
-    .display_id = 0, \
     .show_touches = false, \
     .fullscreen = false, \
     .always_on_top = false, \

app/src/server.c

@@ -5,7 +5,6 @@
 #include <inttypes.h>
 #include <libgen.h>
 #include <stdio.h>
-#include <SDL2/SDL_thread.h>
 #include <SDL2/SDL_timer.h>
 #include <SDL2/SDL_platform.h>
 
@@ -235,12 +234,10 @@ execute_server(struct server *server, const struct server_params *params) {
     char bit_rate_string[11];
     char max_fps_string[6];
     char lock_video_orientation_string[3];
-    char display_id_string[6];
     sprintf(max_size_string, "%"PRIu16, params->max_size);
     sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
     sprintf(max_fps_string, "%"PRIu16, params->max_fps);
     sprintf(lock_video_orientation_string, "%"PRIi8, params->lock_video_orientation);
-    sprintf(display_id_string, "%"PRIu16, params->display_id);
     const char *const cmd[] = {
         "shell",
         "CLASSPATH=" DEVICE_SERVER_PATH,
@@ -267,7 +264,6 @@ execute_server(struct server *server, const struct server_params *params) {
         params->crop ? params->crop : "-",
         "true", // always send frame meta (packet boundaries + timestamp)
         params->control ? "true" : "false",
-        display_id_string,
     };
 #ifdef SERVER_DEBUGGER
     LOGI("Server debugger waiting for a client on device port "
@@ -318,12 +314,14 @@ connect_to_server(uint16_t port, uint32_t attempts, uint32_t delay) {
 }
 
 static void
-close_socket(socket_t socket) {
-    assert(socket != INVALID_SOCKET);
-    net_shutdown(socket, SHUT_RDWR);
-    if (!net_close(socket)) {
+close_socket(socket_t *socket) {
+    assert(*socket != INVALID_SOCKET);
+    net_shutdown(*socket, SHUT_RDWR);
+    if (!net_close(*socket)) {
         LOGW("Could not close socket");
+        return;
     }
+    *socket = INVALID_SOCKET;
 }
 
 void
@@ -331,22 +329,6 @@ server_init(struct server *server) {
     *server = (struct server) SERVER_INITIALIZER;
 }
 
-static int
-run_wait_server(void *data) {
-    struct server *server = data;
-    cmd_simple_wait(server->process, NULL); // ignore exit code
-    // no need for synchronization, server_socket is initialized before this
-    // thread was created
-    if (server->server_socket != INVALID_SOCKET
-            && SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
-        // On Linux, accept() is unblocked by shutdown(), but on Windows, it is
-        // unblocked by closesocket(). Therefore, call both (close_socket()).
-        close_socket(server->server_socket);
-    }
-    LOGD("Server terminated");
-    return 0;
-}
-
 bool
 server_start(struct server *server, const char *serial,
              const struct server_params *params) {
@@ -360,47 +342,30 @@ server_start(struct server *server, const char *serial,
     }
 
     if (!push_server(serial)) {
-        goto error1;
+        SDL_free(server->serial);
+        return false;
     }
 
     if (!enable_tunnel_any_port(server, params->port_range)) {
-        goto error1;
+        SDL_free(server->serial);
+        return false;
     }
 
     // server will connect to our server socket
     server->process = execute_server(server, params);
-    if (server->process == PROCESS_NONE) {
-        goto error2;
-    }
 
-    // If the server process dies before connecting to the server socket, then
-    // the client will be stuck forever on accept(). To avoid the problem, we
-    // must be able to wake up the accept() call when the server dies. To keep
-    // things simple and multiplatform, just spawn a new thread waiting for the
-    // server process and calling shutdown()/close() on the server socket if
-    // necessary to wake up any accept() blocking call.
-    server->wait_server_thread =
-        SDL_CreateThread(run_wait_server, "wait-server", server);
-    if (!server->wait_server_thread) {
-        cmd_terminate(server->process);
-        cmd_simple_wait(server->process, NULL); // ignore exit code
-        goto error2;
+    if (server->process == PROCESS_NONE) {
+        if (!server->tunnel_forward) {
+            close_socket(&server->server_socket);
+        }
+        disable_tunnel(server);
+        SDL_free(server->serial);
+        return false;
     }
 
     server->tunnel_enabled = true;
 
     return true;
-
-error2:
-    if (!server->tunnel_forward) {
-        // the wait server thread is not started, SDL_AtomicSet() is sufficient
-        SDL_AtomicSet(&server->server_socket_closed, 1);
-        close_socket(server->server_socket);
-    }
-    disable_tunnel(server);
-error1:
-    SDL_free(server->serial);
-    return false;
 }
 
 bool
@@ -418,11 +383,7 @@ server_connect_to(struct server *server) {
         }
 
         // we don't need the server socket anymore
-        if (SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
-            // close it from here
-            close_socket(server->server_socket);
-            // otherwise, it is closed by run_wait_server()
-        }
+        close_socket(&server->server_socket);
     } else {
         uint32_t attempts = 100;
         uint32_t delay = 100; // ms
@@ -449,27 +410,29 @@ server_connect_to(struct server *server) {
 
 void
 server_stop(struct server *server) {
-    if (server->server_socket != INVALID_SOCKET
-            && SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
-        close_socket(server->server_socket);
+    if (server->server_socket != INVALID_SOCKET) {
+        close_socket(&server->server_socket);
     }
     if (server->video_socket != INVALID_SOCKET) {
-        close_socket(server->video_socket);
+        close_socket(&server->video_socket);
     }
     if (server->control_socket != INVALID_SOCKET) {
-        close_socket(server->control_socket);
+        close_socket(&server->control_socket);
     }
 
     assert(server->process != PROCESS_NONE);
 
-    cmd_terminate(server->process);
+    if (!cmd_terminate(server->process)) {
+        LOGW("Could not terminate server");
+    }
+
+    cmd_simple_wait(server->process, NULL); // ignore exit code
+    LOGD("Server terminated");
 
     if (server->tunnel_enabled) {
         // ignore failure
         disable_tunnel(server);
     }
-
-    SDL_WaitThread(server->wait_server_thread, NULL);
 }
 
 void

app/src/server.h

@@ -3,8 +3,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL2/SDL_atomic.h>
-#include <SDL2/SDL_thread.h>
 
 #include "config.h"
 #include "command.h"
@@ -14,8 +12,6 @@
 struct server {
     char *serial;
     process_t process;
-    SDL_Thread *wait_server_thread;
-    SDL_atomic_t server_socket_closed;
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
@@ -28,8 +24,6 @@ struct server {
 #define SERVER_INITIALIZER { \
     .serial = NULL, \
     .process = PROCESS_NONE, \
-    .wait_server_thread = NULL, \
-    .server_socket_closed = {0}, \
     .server_socket = INVALID_SOCKET, \
     .video_socket = INVALID_SOCKET, \
     .control_socket = INVALID_SOCKET, \
@@ -50,7 +44,6 @@ struct server_params {
     uint16_t max_fps;
     int8_t lock_video_orientation;
     bool control;
-    uint16_t display_id;
 };
 
 // init default values

config/checkstyle/checkstyle.xml

@@ -129,6 +129,11 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
     <module name="IllegalInstantiation" />
     <module name="InnerAssignment" />
+    <module name="MagicNumber">
+      <property name="severity" value="info" />
+      <property name="ignoreHashCodeMethod" value="true" />
+      <property name="ignoreAnnotation" value="true" />
+    </module>
     <module name="MissingSwitchDefault" />
     <module name="SimplifyBooleanExpression" />
     <module name="SimplifyBooleanReturn" />

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

@@ -8,10 +8,11 @@ import java.nio.charset.StandardCharsets;
 
 public class ControlMessageReader {
 
-    static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 9;
-    static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 27;
-    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
-    static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
+    private static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 9;
+    private static final int INJECT_MOUSE_EVENT_PAYLOAD_LENGTH = 17;
+    private static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 21;
+    private static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
+    private 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;
@@ -121,6 +122,7 @@ public class ControlMessageReader {
         return ControlMessage.createInjectText(text);
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private ControlMessage parseInjectTouchEvent() {
         if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
             return null;
@@ -170,10 +172,12 @@ public class ControlMessageReader {
         return new Position(x, y, screenWidth, screenHeight);
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static int toUnsigned(short value) {
         return value & 0xffff;
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static int toUnsigned(byte value) {
         return value & 0xff;
     }

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

@@ -47,6 +47,7 @@ public class Controller {
         }
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     public void control() throws IOException {
         // on start, power on the device
         if (!device.isScreenOn()) {
@@ -75,29 +76,19 @@ public class Controller {
         ControlMessage msg = connection.receiveControlMessage();
         switch (msg.getType()) {
             case ControlMessage.TYPE_INJECT_KEYCODE:
-                if (device.supportsInputEvents()) {
-                    injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState());
-                }
+                injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState());
                 break;
             case ControlMessage.TYPE_INJECT_TEXT:
-                if (device.supportsInputEvents()) {
-                    injectText(msg.getText());
-                }
+                injectText(msg.getText());
                 break;
             case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
-                if (device.supportsInputEvents()) {
-                    injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
-                }
+                injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
-                if (device.supportsInputEvents()) {
-                    injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
-                }
+                injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
                 break;
             case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                if (device.supportsInputEvents()) {
-                    pressBackOrTurnScreenOn();
-                }
+                pressBackOrTurnScreenOn();
                 break;
             case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
                 device.expandNotificationPanel();
@@ -113,9 +104,7 @@ public class Controller {
                 device.setClipboardText(msg.getText());
                 break;
             case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
-                if (device.supportsInputEvents()) {
-                    device.setScreenPowerMode(msg.getAction());
-                }
+                device.setScreenPowerMode(msg.getAction());
                 break;
             case ControlMessage.TYPE_ROTATE_DEVICE:
                 device.rotateDevice();

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

@@ -84,6 +84,7 @@ public final class DesktopConnection implements Closeable {
         controlSocket.close();
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private void send(String deviceName, int width, int height) throws IOException {
         byte[] buffer = new byte[DEVICE_NAME_FIELD_LENGTH + 4];
 

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

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy;
 
-import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;
@@ -26,35 +25,9 @@ public final class Device {
     private ScreenInfo screenInfo;
     private RotationListener rotationListener;
 
-    /**
-     * Logical display identifier
-     */
-    private final int displayId;
-
-    /**
-     * The surface flinger layer stack associated with this logical display
-     */
-    private final int layerStack;
-
-    /**
-     * The FLAG_PRESENTATION from the DisplayInfo
-     */
-    private final boolean isPresentationDisplay;
-
     public Device(Options options) {
-        displayId = options.getDisplayId();
-        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo(displayId);
-        if (displayInfo == null) {
-            int[] displayIds = serviceManager.getDisplayManager().getDisplayIds();
-            throw new InvalidDisplayIdException(displayId, displayIds);
-        }
-
-        int displayInfoFlags = displayInfo.getFlags();
-
+        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
         screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
-        layerStack = displayInfo.getLayerStack();
-        isPresentationDisplay = (displayInfoFlags & DisplayInfo.FLAG_PRESENTATION) != 0;
-
         registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
             public void onRotationChanged(int rotation) throws RemoteException {
@@ -68,24 +41,12 @@ public final class Device {
                 }
             }
         });
-
-        if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
-            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
-        }
-
-        if (!supportsInputEvents()) {
-            Ln.w("Input events are not supported for displays with FLAG_PRESENTATION enabled for devices with API lower than 29");
-        }
     }
 
     public synchronized ScreenInfo getScreenInfo() {
         return screenInfo;
     }
 
-    public int getLayerStack() {
-        return layerStack;
-    }
-
     public Point getPhysicalPoint(Position position) {
         // it hides the field on purpose, to read it with a lock
         @SuppressWarnings("checkstyle:HiddenField")
@@ -115,22 +76,7 @@ public final class Device {
         return Build.MODEL;
     }
 
-    public boolean supportsInputEvents() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return true;
-        }
-        return !isPresentationDisplay;
-    }
-
     public boolean injectInputEvent(InputEvent inputEvent, int mode) {
-        if (!supportsInputEvents()) {
-            throw new AssertionError("Could not inject input event if !supportsInputEvents()");
-        }
-
-        if (displayId != 0 && !InputManager.setDisplayId(inputEvent, displayId)) {
-            return false;
-        }
-
         return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
     }
 

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

@@ -13,6 +13,7 @@ public class DeviceMessageWriter {
     private final byte[] rawBuffer = new byte[MAX_EVENT_SIZE];
     private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     public void writeTo(DeviceMessage msg, OutputStream output) throws IOException {
         buffer.clear();
         buffer.put((byte) DeviceMessage.TYPE_CLIPBOARD);

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

@@ -1,25 +1,12 @@
 package com.genymobile.scrcpy;
 
 public final class DisplayInfo {
-    private final int displayId;
     private final Size size;
     private final int rotation;
-    private final int layerStack;
-    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;
+    public DisplayInfo(Size size, int rotation) {
         this.size = size;
         this.rotation = rotation;
-        this.layerStack = layerStack;
-        this.flags = flags;
-    }
-
-    public int getDisplayId() {
-        return displayId;
     }
 
     public Size getSize() {
@@ -29,13 +16,5 @@ public final class DisplayInfo {
     public int getRotation() {
         return rotation;
     }
-
-    public int getLayerStack() {
-        return layerStack;
-    }
-
-    public int getFlags() {
-        return flags;
-    }
 }
 

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

@@ -1,21 +0,0 @@
-package com.genymobile.scrcpy;
-
-public class InvalidDisplayIdException extends RuntimeException {
-
-    private final int displayId;
-    private final int[] availableDisplayIds;
-
-    public InvalidDisplayIdException(int displayId, int[] availableDisplayIds) {
-        super("There is no display having id " + displayId);
-        this.displayId = displayId;
-        this.availableDisplayIds = availableDisplayIds;
-    }
-
-    public int getDisplayId() {
-        return displayId;
-    }
-
-    public int[] getAvailableDisplayIds() {
-        return availableDisplayIds;
-    }
-}

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

@@ -11,7 +11,6 @@ public class Options {
     private Rect crop;
     private boolean sendFrameMeta; // send PTS so that the client may record properly
     private boolean control;
-    private int displayId;
 
     public int getMaxSize() {
         return maxSize;
@@ -76,12 +75,4 @@ public class Options {
     public void setControl(boolean control) {
         this.control = control;
     }
-
-    public int getDisplayId() {
-        return displayId;
-    }
-
-    public void setDisplayId(int displayId) {
-        this.displayId = displayId;
-    }
 }

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

@@ -71,12 +71,10 @@ public class ScreenEncoder implements Device.RotationListener {
                 // does not include the locked video orientation
                 Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
                 int videoRotation = screenInfo.getVideoRotation();
-                int layerStack = device.getLayerStack();
-
                 setSize(format, videoRect.width(), videoRect.height());
                 configure(codec, format);
                 Surface surface = codec.createInputSurface();
-                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
+                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect);
                 codec.start();
                 try {
                     alive = encode(codec, fd);
@@ -147,6 +145,7 @@ public class ScreenEncoder implements Device.RotationListener {
         return MediaCodec.createEncoderByType("video/avc");
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static MediaFormat createFormat(int bitRate, int maxFps, int iFrameInterval) {
         MediaFormat format = new MediaFormat();
         format.setString(MediaFormat.KEY_MIME, "video/avc");
@@ -179,12 +178,12 @@ public class ScreenEncoder implements Device.RotationListener {
         format.setInteger(MediaFormat.KEY_HEIGHT, height);
     }
 
-    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
+    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect) {
         SurfaceControl.openTransaction();
         try {
             SurfaceControl.setDisplaySurface(display, surface);
             SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
-            SurfaceControl.setDisplayLayerStack(display, layerStack);
+            SurfaceControl.setDisplayLayerStack(display, 0);
         } finally {
             SurfaceControl.closeTransaction();
         }

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

@@ -104,6 +104,7 @@ public final class ScreenInfo {
         return rect.width() + ":" + rect.height() + ":" + rect.left + ":" + rect.top;
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static Size computeVideoSize(int w, int h, int maxSize) {
         // Compute the video size and the padding of the content inside this video.
         // Principle:

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

@@ -16,7 +16,6 @@ public final class Server {
     }
 
     private static void scrcpy(Options options) throws IOException {
-        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
         final Device device = new Device(options);
         boolean tunnelForward = options.isTunnelForward();
         try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
@@ -69,6 +68,7 @@ public final class Server {
         }).start();
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static Options createOptions(String... args) {
         if (args.length < 1) {
             throw new IllegalArgumentException("Missing client version");
@@ -80,8 +80,8 @@ public final class Server {
                     "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
         }
 
-        if (args.length != 10) {
-            throw new IllegalArgumentException("Expecting 10 parameters");
+        if (args.length != 9) {
+            throw new IllegalArgumentException("Expecting 9 parameters");
         }
 
         Options options = new Options();
@@ -111,12 +111,10 @@ public final class Server {
         boolean control = Boolean.parseBoolean(args[8]);
         options.setControl(control);
 
-        int displayId = Integer.parseInt(args[9]);
-        options.setDisplayId(displayId);
-
         return options;
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static Rect parseCrop(String crop) {
         if ("-".equals(crop)) {
             return null;
@@ -141,6 +139,7 @@ public final class Server {
         }
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     private static void suggestFix(Throwable e) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (e instanceof MediaCodec.CodecException) {
@@ -152,16 +151,6 @@ public final class Server {
                 }
             }
         }
-        if (e instanceof InvalidDisplayIdException) {
-            InvalidDisplayIdException idie = (InvalidDisplayIdException) e;
-            int[] displayIds = idie.getAvailableDisplayIds();
-            if (displayIds != null && displayIds.length > 0) {
-                Ln.e("Try to use one of the available display ids:");
-                for (int id : displayIds) {
-                    Ln.e("    scrcpy --display " + id);
-                }
-            }
-        }
     }
 
     public static void main(String... args) throws Exception {

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

@@ -5,6 +5,7 @@ public final class StringUtils {
         // not instantiable
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
     public static int getUtf8TruncationIndex(byte[] utf8, int maxLength) {
         int len = utf8.length;
         if (len <= maxLength) {

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -12,28 +12,15 @@ public final class DisplayManager {
         this.manager = manager;
     }
 
-    public DisplayInfo getDisplayInfo(int displayId) {
+    public DisplayInfo getDisplayInfo() {
         try {
-            Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
-            if (displayInfo == null) {
-                return null;
-            }
+            Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, 0);
             Class<?> cls = displayInfo.getClass();
             // width and height already take the rotation into account
             int width = cls.getDeclaredField("logicalWidth").getInt(displayInfo);
             int height = cls.getDeclaredField("logicalHeight").getInt(displayInfo);
             int rotation = cls.getDeclaredField("rotation").getInt(displayInfo);
-            int layerStack = cls.getDeclaredField("layerStack").getInt(displayInfo);
-            int flags = cls.getDeclaredField("flags").getInt(displayInfo);
-            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public int[] getDisplayIds() {
-        try {
-            return (int[]) manager.getClass().getMethod("getDisplayIds").invoke(manager);
+            return new DisplayInfo(new Size(width, height), rotation);
         } catch (Exception e) {
             throw new AssertionError(e);
         }

server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java

@@ -17,8 +17,6 @@ public final class InputManager {
     private final IInterface manager;
     private Method injectInputEventMethod;
 
-    private static Method setDisplayIdMethod;
-
     public InputManager(IInterface manager) {
         this.manager = manager;
     }
@@ -39,23 +37,4 @@ public final class InputManager {
             return false;
         }
     }
-
-    private static Method getSetDisplayIdMethod() throws NoSuchMethodException {
-        if (setDisplayIdMethod == null) {
-            setDisplayIdMethod = InputEvent.class.getMethod("setDisplayId", int.class);
-        }
-        return setDisplayIdMethod;
-    }
-
-    public static boolean setDisplayId(InputEvent inputEvent, int displayId) {
-        try {
-            Method method = getSetDisplayIdMethod();
-            method.invoke(inputEvent, displayId);
-            return true;
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            // just a warning, it might happen on old devices
-            Ln.w("Cannot associate a display id to the input event");
-            return false;
-        }
-    }
 }

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

@@ -28,9 +28,6 @@ public class ControlMessageReaderTest {
         dos.writeInt(KeyEvent.META_CTRL_ON);
         byte[] packet = bos.toByteArray();
 
-        // The message type (1 byte) does not count
-        Assert.assertEquals(ControlMessageReader.INJECT_KEYCODE_PAYLOAD_LENGTH, packet.length - 1);
-
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 
@@ -80,6 +77,7 @@ public class ControlMessageReaderTest {
     }
 
     @Test
+    @SuppressWarnings("checkstyle:MagicNumber")
     public void testParseTouchEvent() throws IOException {
         ControlMessageReader reader = new ControlMessageReader();
 
@@ -97,9 +95,6 @@ public class ControlMessageReaderTest {
 
         byte[] packet = bos.toByteArray();
 
-        // The message type (1 byte) does not count
-        Assert.assertEquals(ControlMessageReader.INJECT_TOUCH_EVENT_PAYLOAD_LENGTH, packet.length - 1);
-
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 
@@ -115,6 +110,7 @@ public class ControlMessageReaderTest {
     }
 
     @Test
+    @SuppressWarnings("checkstyle:MagicNumber")
     public void testParseScrollEvent() throws IOException {
         ControlMessageReader reader = new ControlMessageReader();
 
@@ -130,9 +126,6 @@ public class ControlMessageReaderTest {
 
         byte[] packet = bos.toByteArray();
 
-        // The message type (1 byte) does not count
-        Assert.assertEquals(ControlMessageReader.INJECT_SCROLL_EVENT_PAYLOAD_LENGTH, packet.length - 1);
-
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 
@@ -240,9 +233,6 @@ public class ControlMessageReaderTest {
 
         byte[] packet = bos.toByteArray();
 
-        // The message type (1 byte) does not count
-        Assert.assertEquals(ControlMessageReader.SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH, packet.length - 1);
-
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 

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

@@ -8,6 +8,7 @@ import java.nio.charset.StandardCharsets;
 public class StringUtilsTest {
 
     @Test
+    @SuppressWarnings("checkstyle:MagicNumber")
     public void testUtf8Truncate() {
         String s = "aÉbÔc";
         byte[] utf8 = s.getBytes(StandardCharsets.UTF_8);