Add option to disable window decoration

Add --window-borderless parameter. Signed-off-by: Romain Vimont <rom@rom1v.com>
Add option to specify the initial window size
2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:39 +01:00 · 2019-11-03 16:51:47 +01:00 · 2019-11-03 15:56:10 +01:00
38 changed files with 943 additions and 440 deletions
--- a/BUILD.md
+++ b/BUILD.md
@@ -195,8 +195,7 @@ Then, build:

 ```bash
 meson x --buildtype release --strip -Db_lto=true
-cd x
-ninja
+ninja -Cx
 ```

 _Note: `ninja` [must][ninja-user] be run as a non-root user (only `ninja
@@ -219,13 +218,13 @@ To run without installing:
 After a successful build, you can install _scrcpy_ on the system:

 ```bash
-sudo ninja install    # without sudo on Windows
+sudo ninja -Cx install    # without sudo on Windows
 ```

 This installs two files:

 - `/usr/local/bin/scrcpy`
- - `/usr/local/share/scrcpy/scrcpy-server.jar`
+ - `/usr/local/share/scrcpy/scrcpy-server`

 Just remove them to "uninstall" the application.

@@ -244,8 +243,7 @@ configuration:

 ```bash
 meson x --buildtype release --strip -Db_lto=true \
-    -Dprebuilt_server=/path/to/scrcpy-server.jar
-cd x
-ninja
-sudo ninja install
+    -Dprebuilt_server=/path/to/scrcpy-server
+ninja -Cx
+sudo ninja -Cx install
 ```
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -3,7 +3,7 @@
 ## Overview

 This application is composed of two parts:
- - the server (`scrcpy-server.jar`), to be executed on the device,
+ - the server (`scrcpy-server`), to be executed on the device,
 - the client (the `scrcpy` binary), executed on the host computer.

 The client is responsible to push the server to the device and start its
@@ -49,7 +49,7 @@ application may not replace the server just before the client executes it._
 Instead of a raw _dex_ file, `app_process` accepts a _jar_ containing
 `classes.dex` (e.g. an [APK]). For simplicity, and to benefit from the gradle
 build system, the server is built to an (unsigned) APK (renamed to
-`scrcpy-server.jar`).
+`scrcpy-server`).

 [dex]: https://en.wikipedia.org/wiki/Dalvik_(software)
 [apk]: https://en.wikipedia.org/wiki/Android_application_package
--- a/Makefile.CrossWindows
+++ b/Makefile.CrossWindows
@@ -3,7 +3,7 @@
 #
 # Here, "portable" means that the client and server binaries are expected to be
 # anywhere, but in the same directory, instead of well-defined separate
-# locations (e.g. /usr/bin/scrcpy and /usr/share/scrcpy/scrcpy-server.jar).
+# locations (e.g. /usr/bin/scrcpy and /usr/share/scrcpy/scrcpy-server).
 #
 # In particular, this implies to change the location from where the client push
 # the server to the device.
@@ -97,7 +97,7 @@ build-win64-noconsole: prepare-deps-win64

 dist-win32: build-server build-win32 build-win32-noconsole
 	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server.jar "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/scrcpy-noconsole.exe"
 	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
@@ -112,7 +112,7 @@ dist-win32: build-server build-win32 build-win32-noconsole

 dist-win64: build-server build-win64 build-win64-noconsole
 	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server.jar "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/scrcpy-noconsole.exe"
 	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
--- a/README.md
+++ b/README.md
@@ -358,7 +358,7 @@ To use a specific _adb_ binary, configure its path in the environment variable

    ADB=/path/to/adb scrcpy

-To override the path of the `scrcpy-server.jar` file, configure its path in
+To override the path of the `scrcpy-server` file, configure its path in
 `SCRCPY_SERVER_PATH`.

 [useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345
--- a/app/meson.build
+++ b/app/meson.build
@@ -93,7 +93,7 @@ conf.set_quoted('SCRCPY_VERSION', meson.project_version())
 # the prefix used during configuration (meson --prefix=PREFIX)
 conf.set_quoted('PREFIX', get_option('prefix'))

-# build a "portable" version (with scrcpy-server.jar accessible from the same
+# build a "portable" version (with scrcpy-server accessible from the same
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))

@@ -134,6 +134,8 @@ executable('scrcpy', src,
           c_args: c_args,
           link_args: link_args)

+install_man('scrcpy.1')
+

 ### TESTS

--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -0,0 +1,254 @@
+.TH "scrcpy" "1"
+.SH NAME
+scrcpy \- Display and control your Android device
+
+
+.SH SYNOPSIS
+.B scrcpy
+.RI [ options ]
+
+
+.SH DESCRIPTION
+.B scrcpy
+provides display and control of Android devices connected on USB (or over TCP/IP). It does not require any root access.
+
+
+.SH OPTIONS
+
+.TP
+.BI "\-b, \-\-bit\-rate " value
+Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
+
+Default is 8000000.
+
+.TP
+.BI "\-c, \-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
+Crop the device screen on the server.
+
+The values are expressed in the device natural orientation (typically, portrait for a phone, landscape for a tablet). Any
+.B \-\-max\-size
+value is computed on the cropped size.
+
+.TP
+.B \-f, \-\-fullscreen
+Start in fullscreen.
+
+.TP
+.BI "\-F, \-\-record\-format " format
+Force recording format (either mp4 or mkv).
+
+.TP
+.B \-h, \-\-help
+Print this help.
+
+.TP
+.BI "\-m, \-\-max\-size " value
+Limit both the width and height of the video to \fIvalue\fR. The other dimension is computed so that the device aspect\-ratio is preserved.
+
+Default is 0 (unlimited).
+
+.TP
+.B \-n, \-\-no\-control
+Disable device control (mirror the device in read\-only).
+
+.TP
+.B \-N, \-\-no\-display
+Do not display device (only when screen recording is enabled).
+
+.TP
+.BI "\-p, \-\-port " port
+Set the TCP port the client listens on.
+
+Default is 27183.
+
+.TP
+.BI "\-\-push\-target " path
+Set the target directory for pushing files to the device by drag & drop. It is passed as\-is to "adb push".
+
+Default is "/sdcard/".
+
+.TP
+.BI "\-r, \-\-record " file
+Record screen to
+.IR file .
+
+The format is determined by the
+.B \-F/\-\-record\-format
+option if set, or by the file extension (.mp4 or .mkv).
+
+.TP
+.B \-\-render\-expired\-frames
+By default, to minimize latency, scrcpy always renders the last available decoded frame, and drops any previous ones. This flag forces to render all frames, at a cost of a possible increased latency.
+
+.TP
+.BI "\-s, \-\-serial " number
+The device serial number. Mandatory only if several devices are connected to adb.
+
+.TP
+.B \-S, \-\-turn\-screen\-off
+Turn the device screen off immediately.
+
+.TP
+.B \-t, \-\-show\-touches
+Enable "show touches" on start, disable on quit.
+
+It only shows physical touches (not clicks from scrcpy).
+
+.TP
+.B \-T, \-\-always\-on\-top
+Make scrcpy window always on top (above other windows).
+
+.TP
+.B \-v, \-\-version
+Print the version of scrcpy.
+
+.TP
+.BI \-\-window\-title " text
+Set a custom window title.
+
+.TP
+.BI \-\-window\-x " value
+Set the initial window horizontal position.
+
+Default is -1 (automatic).\n
+
+.TP
+.BI \-\-window\-y " value
+Set the initial window vertical position.
+
+Default is -1 (automatic).\n
+
+.TP
+.BI \-\-window\-width " value
+Set the initial window width.
+
+Default is 0 (automatic).\n
+
+.TP
+.BI \-\-window\-height " value
+Set the initial window height.
+
+Default is 0 (automatic).\n
+
+.SH SHORTCUTS
+
+.TP
+.B Ctrl+f
+switch fullscreen mode
+
+.TP
+.B Ctrl+g
+resize window to 1:1 (pixel\-perfect)
+
+.TP
+.B Ctrl+x, Double\-click on black borders
+resize window to remove black borders
+
+.TP
+.B Ctrl+h, Home, Middle\-click
+Click on HOME
+
+.TP
+.B Ctrl+b, Ctrl+Backspace, Right\-click (when screen is on)
+Click on BACK
+
+.TP
+.B Ctrl+s
+Click on APP_SWITCH
+
+.TP
+.B Ctrl+m
+Click on MENU
+
+.TP
+.B Ctrl+Up
+Click on VOLUME_UP
+
+.TP
+.B Ctrl+Down
+Click on VOLUME_DOWN
+
+.TP
+.B Ctrl+p
+Click on POWER (turn screen on/off)
+
+.TP
+.B Right\-click (when screen is off)
+turn screen on
+
+.TP
+.B Ctrl+o
+turn device screen off (keep mirroring)
+
+.TP
+.B Ctrl+n
+expand notification panel
+
+.TP
+.B Ctrl+Shift+n
+collapse notification panel
+
+.TP
+.B Ctrl+c
+copy device clipboard to computer
+
+.TP
+.B Ctrl+v
+paste computer clipboard to device
+
+.TP
+.B Ctrl+Shift+v
+copy computer clipboard to device
+
+.TP
+.B Ctrl+i
+enable/disable FPS counter (print frames/second in logs)
+
+.TP
+.B Drag & drop APK file
+install APK from computer
+
+
+.SH Environment variables
+
+.TP
+.B ADB
+Specify the path to adb.
+
+.TP
+.B SCRCPY_SERVER_PATH
+Specify the path to server binary.
+
+
+.SH AUTHORS
+.B scrcpy
+is written by Romain Vimont.
+
+This manual page was written by
+.MT mmyangfl@gmail.com
+Yangfl
+.ME
+for the Debian Project (and may be used by others).
+
+
+.SH "REPORTING BUGS"
+Report bugs to
+.UR https://github.com/Genymobile/scrcpy/issues
+.UE .
+
+.SH COPYRIGHT
+Copyright \(co 2018 Genymobile
+.UR https://www.genymobile.com
+Genymobile
+.UE
+
+Copyright \(co 2018\-2019
+.MT rom@rom1v.com
+Romain Vimont
+.ME
+
+Licensed under the Apache License, Version 2.0.
+
+.SH WWW
+.UR https://github.com/Genymobile/scrcpy
+.UE
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -49,19 +49,15 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
                                      CONTROL_MSG_TEXT_MAX_LENGTH, &buf[1]);
            return 1 + len;
        }
-        case CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT:
-            buf[1] = msg->inject_mouse_event.action;
-            buffer_write32be(&buf[2], msg->inject_mouse_event.buttons);
-            write_position(&buf[6], &msg->inject_mouse_event.position);
-            return 18;
        case CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:
            buf[1] = msg->inject_touch_event.action;
-            buffer_write64be(&buf[2], msg->inject_touch_event.finger_id);
+            buffer_write64be(&buf[2], msg->inject_touch_event.pointer_id);
            write_position(&buf[10], &msg->inject_touch_event.position);
            uint16_t pressure =
                to_fixed_point_16(msg->inject_touch_event.pressure);
            buffer_write16be(&buf[22], pressure);
-            return 24;
+            buffer_write32be(&buf[24], msg->inject_touch_event.buttons);
+            return 28;
        case CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
            write_position(&buf[1], &msg->inject_scroll_event.position);
            buffer_write32be(&buf[13],
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -15,10 +15,11 @@
 #define CONTROL_MSG_SERIALIZED_MAX_SIZE \
    (3 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)

+#define POINTER_ID_MOUSE UINT64_C(-1);
+
 enum control_msg_type {
    CONTROL_MSG_TYPE_INJECT_KEYCODE,
    CONTROL_MSG_TYPE_INJECT_TEXT,
-    CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
    CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
    CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
    CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
@@ -49,11 +50,7 @@ struct control_msg {
        struct {
            enum android_motionevent_action action;
            enum android_motionevent_buttons buttons;
-            struct position position;
-        } inject_mouse_event;
-        struct {
-            enum android_motionevent_action action;
-            uint64_t finger_id;
+            uint64_t pointer_id;
            struct position position;
            float pressure;
        } inject_touch_event;
--- a/app/src/event_converter.c
+++ b/app/src/event_converter.c
@@ -128,15 +128,6 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
    }
 }

-static bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
-    switch (from) {
-        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
-        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
-        FAIL;
-    }
-}
-
 static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
    enum android_motionevent_buttons buttons = 0;
@@ -149,10 +140,10 @@ convert_mouse_buttons(uint32_t state) {
    if (state & SDL_BUTTON_MMASK) {
        buttons |= AMOTION_EVENT_BUTTON_TERTIARY;
    }
-    if (state & SDL_BUTTON_X1) {
+    if (state & SDL_BUTTON_X1MASK) {
        buttons |= AMOTION_EVENT_BUTTON_BACK;
    }
-    if (state & SDL_BUTTON_X2) {
+    if (state & SDL_BUTTON_X2MASK) {
        buttons |= AMOTION_EVENT_BUTTON_FORWARD;
    }
    return buttons;
@@ -176,20 +167,31 @@ convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
    return true;
 }

+static bool
+convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
+    switch (from) {
+        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
+        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
+        FAIL;
+    }
+}
+
 bool
 convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;

-    if (!convert_mouse_action(from->type, &to->inject_mouse_event.action)) {
+    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
        return false;
    }

-    to->inject_mouse_event.buttons =
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons =
        convert_mouse_buttons(SDL_BUTTON(from->button));
-    to->inject_mouse_event.position.screen_size = screen_size;
-    to->inject_mouse_event.position.point.x = from->x;
-    to->inject_mouse_event.position.point.y = from->y;

    return true;
 }
@@ -197,12 +199,14 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
 bool
 convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
-    to->inject_mouse_event.action = AMOTION_EVENT_ACTION_MOVE;
-    to->inject_mouse_event.buttons = convert_mouse_buttons(from->state);
-    to->inject_mouse_event.position.screen_size = screen_size;
-    to->inject_mouse_event.position.point.x = from->x;
-    to->inject_mouse_event.position.point.y = from->y;
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);

    return true;
 }
@@ -226,12 +230,13 @@ convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
        return false;
    }

-    to->inject_touch_event.finger_id = from->fingerId;
+    to->inject_touch_event.pointer_id = from->fingerId;
    to->inject_touch_event.position.screen_size = screen_size;
    // SDL touch event coordinates are normalized in the range [0; 1]
    to->inject_touch_event.position.point.x = from->x * screen_size.width;
    to->inject_touch_event.position.point.y = from->y * screen_size.height;
    to->inject_touch_event.pressure = from->pressure;
+    to->inject_touch_event.buttons = 0;
    return true;
 }

--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -423,6 +423,10 @@ void
 input_manager_process_mouse_button(struct input_manager *input_manager,
                                   const SDL_MouseButtonEvent *event,
                                   bool control) {
+    if (event->which == SDL_TOUCH_MOUSEID) {
+        // simulated from touch events, so it's a duplicate
+        return;
+    }
    if (event->type == SDL_MOUSEBUTTONDOWN) {
        if (control && event->button == SDL_BUTTON_RIGHT) {
            press_back_or_turn_screen_on(input_manager->controller);
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -29,9 +29,14 @@ struct args {
    uint16_t port;
    uint16_t max_size;
    uint32_t bit_rate;
+    int16_t window_x;
+    int16_t window_y;
+    uint16_t window_width;
+    uint16_t window_height;
    bool always_on_top;
    bool turn_screen_off;
    bool render_expired_frames;
+    bool window_borderless;
 };

 static void usage(const char *arg0) {
@@ -59,7 +64,7 @@ static void usage(const char *arg0) {
        "    -f, --fullscreen\n"
        "        Start in fullscreen.\n"
        "\n"
-        "    -F, --record-format\n"
+        "    -F, --record-format format\n"
        "        Force recording format (either mp4 or mkv).\n"
        "\n"
        "    -h, --help\n"
@@ -115,9 +120,28 @@ static void usage(const char *arg0) {
        "    -v, --version\n"
        "        Print the version of scrcpy.\n"
        "\n"
+        "    --window_borderless\n"
+        "        Disable window decorations (display borderless window).\n"
+        "\n"
        "    --window-title text\n"
        "        Set a custom window title.\n"
        "\n"
+        "    --window-x value\n"
+        "        Set the initial window horizontal position.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-y value\n"
+        "        Set the initial window vertical position.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-width value\n"
+        "        Set the initial window width.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-height value\n"
+        "        Set the initial window width.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
        "Shortcuts:\n"
        "\n"
        "    " CTRL_OR_CMD "+f\n"
@@ -258,6 +282,48 @@ parse_max_size(char *optarg, uint16_t *max_size) {
    return true;
 }

+static bool
+parse_window_position(char *optarg, int16_t *position) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Window position parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid window position: %s", optarg);
+        return false;
+    }
+    if (value < -1 || value > 0x7fff) {
+        LOGE("Window position must be between -1 and 32767: %ld", value);
+        return false;
+    }
+
+    *position = (int16_t) value;
+    return true;
+}
+
+static bool
+parse_window_dimension(char *optarg, uint16_t *dimension) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Window dimension parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid window dimension: %s", optarg);
+        return false;
+    }
+    if (value & ~0xffff) {
+        LOGE("Window position must be between 0 and 65535: %ld", value);
+        return false;
+    }
+
+    *dimension = (uint16_t) value;
+    return true;
+}
+
 static bool
 parse_port(char *optarg, uint16_t *port) {
    char *endptr;
@@ -310,8 +376,13 @@ guess_record_format(const char *filename) {
 }

 #define OPT_RENDER_EXPIRED_FRAMES 1000
-#define OPT_WINDOW_TITLE          1001
-#define OPT_PUSH_TARGET           1002
+#define OPT_PUSH_TARGET           1001
+#define OPT_WINDOW_TITLE          1002
+#define OPT_WINDOW_X              1003
+#define OPT_WINDOW_Y              1004
+#define OPT_WINDOW_WIDTH          1005
+#define OPT_WINDOW_HEIGHT         1006
+#define OPT_WINDOW_BORDERLESS     1007

 static bool
 parse_args(struct args *args, int argc, char *argv[]) {
@@ -324,6 +395,8 @@ parse_args(struct args *args, int argc, char *argv[]) {
        {"max-size",              required_argument, NULL, 'm'},
        {"no-control",            no_argument,       NULL, 'n'},
        {"no-display",            no_argument,       NULL, 'N'},
+        {"window-borderless",     no_argument,       NULL,
+                                                 OPT_WINDOW_BORDERLESS},
        {"port",                  required_argument, NULL, 'p'},
        {"push-target",           required_argument, NULL,
                                                 OPT_PUSH_TARGET},
@@ -335,8 +408,11 @@ parse_args(struct args *args, int argc, char *argv[]) {
        {"show-touches",          no_argument,       NULL, 't'},
        {"turn-screen-off",       no_argument,       NULL, 'S'},
        {"version",               no_argument,       NULL, 'v'},
-        {"window-title",          required_argument, NULL,
-                                                 OPT_WINDOW_TITLE},
+        {"window-title",          required_argument, NULL, OPT_WINDOW_TITLE},
+        {"window-x",              required_argument, NULL, OPT_WINDOW_X},
+        {"window-y",              required_argument, NULL, OPT_WINDOW_Y},
+        {"window-width",          required_argument, NULL, OPT_WINDOW_WIDTH},
+        {"window-height",         required_argument, NULL, OPT_WINDOW_HEIGHT},
        {NULL,                    0,                 NULL, 0  },
    };
    int c;
@@ -402,6 +478,29 @@ parse_args(struct args *args, int argc, char *argv[]) {
            case OPT_WINDOW_TITLE:
                args->window_title = optarg;
                break;
+            case OPT_WINDOW_X:
+                if (!parse_window_position(optarg, &args->window_x)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_Y:
+                if (!parse_window_position(optarg, &args->window_y)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_WIDTH:
+                if (!parse_window_dimension(optarg, &args->window_width)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_HEIGHT:
+                if (!parse_window_dimension(optarg, &args->window_height)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_BORDERLESS:
+                args->window_borderless = true;
+                break;
            case OPT_PUSH_TARGET:
                args->push_target = optarg;
                break;
@@ -470,11 +569,16 @@ main(int argc, char *argv[]) {
        .port = DEFAULT_LOCAL_PORT,
        .max_size = DEFAULT_MAX_SIZE,
        .bit_rate = DEFAULT_BIT_RATE,
+        .window_x = -1,
+        .window_y = -1,
+        .window_width = 0,
+        .window_height = 0,
        .always_on_top = false,
        .no_control = false,
        .no_display = false,
        .turn_screen_off = false,
        .render_expired_frames = false,
+        .window_borderless = false,
    };
    if (!parse_args(&args, argc, argv)) {
        return 1;
@@ -514,6 +618,10 @@ main(int argc, char *argv[]) {
        .record_format = args.record_format,
        .max_size = args.max_size,
        .bit_rate = args.bit_rate,
+        .window_x = args.window_x,
+        .window_y = args.window_y,
+        .window_width = args.window_width,
+        .window_height = args.window_height,
        .show_touches = args.show_touches,
        .fullscreen = args.fullscreen,
        .always_on_top = args.always_on_top,
@@ -521,6 +629,7 @@ main(int argc, char *argv[]) {
        .display = !args.no_display,
        .turn_screen_off = args.turn_screen_off,
        .render_expired_frames = args.render_expired_frames,
+        .window_borderless = args.window_borderless,
    };
    int res = scrcpy(&options) ? 0 : 1;

--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -135,6 +135,9 @@ recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
    // <https://github.com/FFmpeg/FFmpeg/commit/0694d8702421e7aff1340038559c438b61bb30dd>
    recorder->ctx->oformat = (AVOutputFormat *) format;

+    av_dict_set(&recorder->ctx->metadata, "comment",
+                "Recorded by scrcpy " SCRCPY_VERSION, 0);
+
    AVStream *ostream = avformat_new_stream(recorder->ctx, input_codec);
    if (!ostream) {
        avformat_free_context(recorder->ctx);
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -390,7 +390,10 @@ scrcpy(const struct scrcpy_options *options) {
            options->window_title ? options->window_title : device_name;

        if (!screen_init_rendering(&screen, window_title, frame_size,
-                                   options->always_on_top)) {
+                                   options->always_on_top, options->window_x,
+                                   options->window_y, options->window_width,
+                                   options->window_height,
+                                   options->window_borderless)) {
            goto end;
        }

--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -17,6 +17,10 @@ struct scrcpy_options {
    uint16_t port;
    uint16_t max_size;
    uint32_t bit_rate;
+    int16_t window_x;
+    int16_t window_y;
+    uint16_t window_width;
+    uint16_t window_height;
    bool show_touches;
    bool fullscreen;
    bool always_on_top;
@@ -24,6 +28,7 @@ struct scrcpy_options {
    bool display;
    bool turn_screen_off;
    bool render_expired_frames;
+    bool window_borderless;
 };

 bool
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -16,7 +16,7 @@

 // get the window size in a struct size
 static struct size
-get_native_window_size(SDL_Window *window) {
+get_window_size(SDL_Window *window) {
    int width;
    int height;
    SDL_GetWindowSize(window, &width, &height);
@@ -29,11 +29,11 @@ get_native_window_size(SDL_Window *window) {

 // get the windowed window size
 static struct size
-get_window_size(const struct screen *screen) {
+get_windowed_window_size(const struct screen *screen) {
    if (screen->fullscreen) {
        return screen->windowed_window_size;
    }
-    return get_native_window_size(screen->window);
+    return get_window_size(screen->window);
 }

 // set the window size to be applied when fullscreen is disabled
@@ -112,14 +112,35 @@ get_optimal_size(struct size current_size, struct size frame_size) {
 // same as get_optimal_size(), but read the current size from the window
 static inline struct size
 get_optimal_window_size(const struct screen *screen, struct size frame_size) {
-    struct size current_size = get_window_size(screen);
-    return get_optimal_size(current_size, frame_size);
+    struct size windowed_size = get_windowed_window_size(screen);
+    return get_optimal_size(windowed_size, frame_size);
 }

 // initially, there is no current size, so use the frame size as current size
+// req_width and req_height, if not 0, are the sizes requested by the user
 static inline struct size
-get_initial_optimal_size(struct size frame_size) {
-    return get_optimal_size(frame_size, frame_size);
+get_initial_optimal_size(struct size frame_size, uint16_t req_width,
+                         uint16_t req_height) {
+    struct size window_size;
+    if (!req_width && !req_height) {
+        window_size = get_optimal_size(frame_size, frame_size);
+    } else {
+        if (req_width) {
+            window_size.width = req_width;
+        } else {
+            // compute from the requested height
+            window_size.width = (uint32_t) req_height * frame_size.width
+                              / frame_size.height;
+        }
+        if (req_height) {
+            window_size.height = req_height;
+        } else {
+            // compute from the requested width
+            window_size.height = (uint32_t) req_width * frame_size.height
+                               / frame_size.width;
+        }
+    }
+    return window_size;
 }

 void
@@ -136,10 +157,13 @@ create_texture(SDL_Renderer *renderer, struct size frame_size) {

 bool
 screen_init_rendering(struct screen *screen, const char *window_title,
-                      struct size frame_size, bool always_on_top) {
+                      struct size frame_size, bool always_on_top,
+                      int16_t window_x, int16_t window_y, uint16_t window_width,
+                      uint16_t window_height, bool window_borderless) {
    screen->frame_size = frame_size;

-    struct size window_size = get_initial_optimal_size(frame_size);
+    struct size window_size =
+        get_initial_optimal_size(frame_size, window_width, window_height);
    uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE;
 #ifdef HIDPI_SUPPORT
    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
@@ -152,9 +176,13 @@ screen_init_rendering(struct screen *screen, const char *window_title,
             "(compile with SDL >= 2.0.5 to enable it)");
 #endif
    }
+    if (window_borderless) {
+        window_flags |= SDL_WINDOW_BORDERLESS;
+    }

-    screen->window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_UNDEFINED,
-                                      SDL_WINDOWPOS_UNDEFINED,
+    int x = window_x != -1 ? window_x : SDL_WINDOWPOS_UNDEFINED;
+    int y = window_y != -1 ? window_y : SDL_WINDOWPOS_UNDEFINED;
+    screen->window = SDL_CreateWindow(window_title, x, y,
                                      window_size.width, window_size.height,
                                      window_flags);
    if (!screen->window) {
@@ -229,11 +257,11 @@ prepare_for_frame(struct screen *screen, struct size new_frame_size) {
        // frame dimension changed, destroy texture
        SDL_DestroyTexture(screen->texture);

-        struct size current_size = get_window_size(screen);
+        struct size windowed_size = get_windowed_window_size(screen);
        struct size target_size = {
-            (uint32_t) current_size.width * new_frame_size.width
+            (uint32_t) windowed_size.width * new_frame_size.width
                    / screen->frame_size.width,
-            (uint32_t) current_size.height * new_frame_size.height
+            (uint32_t) windowed_size.height * new_frame_size.height
                    / screen->frame_size.height,
        };
        target_size = get_optimal_size(target_size, new_frame_size);
@@ -289,7 +317,7 @@ void
 screen_switch_fullscreen(struct screen *screen) {
    if (!screen->fullscreen) {
        // going to fullscreen, store the current windowed window size
-        screen->windowed_window_size = get_native_window_size(screen->window);
+        screen->windowed_window_size = get_window_size(screen->window);
    }
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -46,7 +46,9 @@ screen_init(struct screen *screen);
 // initialize screen, create window, renderer and texture (window is hidden)
 bool
 screen_init_rendering(struct screen *screen, const char *window_title,
-                      struct size frame_size, bool always_on_top);
+                      struct size frame_size, bool always_on_top,
+                      int16_t window_x, int16_t window_y, uint16_t window_width,
+                      uint16_t window_height, bool window_borderless);

 // show the window
 void
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -13,7 +13,7 @@
 #include "net.h"

 #define SOCKET_NAME "scrcpy"
-#define SERVER_FILENAME "scrcpy-server.jar"
+#define SERVER_FILENAME "scrcpy-server"

 #define DEFAULT_SERVER_PATH PREFIX "/share/scrcpy/" SERVER_FILENAME
 #define DEVICE_SERVER_PATH "/data/local/tmp/" SERVER_FILENAME
@@ -32,7 +32,7 @@ get_server_path(void) {
    // the absolute path is hardcoded
    return DEFAULT_SERVER_PATH;
 #else
-    // use scrcpy-server.jar in the same directory as the executable
+    // use scrcpy-server in the same directory as the executable
    char *executable_path = get_executable_path();
    if (!executable_path) {
        LOGE("Could not get executable path, "
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -67,45 +67,12 @@ static void test_serialize_inject_text_long(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_inject_mouse_event(void) {
-    struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
-        .inject_mouse_event = {
-            .action = AMOTION_EVENT_ACTION_DOWN,
-            .buttons = AMOTION_EVENT_BUTTON_PRIMARY,
-            .position = {
-                .point = {
-                    .x = 260,
-                    .y = 1026,
-                },
-                .screen_size = {
-                    .width = 1080,
-                    .height = 1920,
-                },
-            },
-        },
-    };
-
-    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
-    int size = control_msg_serialize(&msg, buf);
-    assert(size == 18);
-
-    const unsigned char expected[] = {
-        CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
-        0x00, // AKEY_EVENT_ACTION_DOWN
-        0x00, 0x00, 0x00, 0x01, // AMOTION_EVENT_BUTTON_PRIMARY
-        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
-        0x04, 0x38, 0x07, 0x80, // 1080 1920
-    };
-    assert(!memcmp(buf, expected, sizeof(expected)));
-}
-#include <stdio.h>
 static void test_serialize_inject_touch_event(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
        .inject_touch_event = {
            .action = AMOTION_EVENT_ACTION_DOWN,
-            .finger_id = 0x1234567887654321L,
+            .pointer_id = 0x1234567887654321L,
            .position = {
                .point = {
                    .x = 100,
@@ -117,20 +84,22 @@ static void test_serialize_inject_touch_event(void) {
                },
            },
            .pressure = 1.0f,
+            .buttons = AMOTION_EVENT_BUTTON_PRIMARY,
        },
    };

    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
    int size = control_msg_serialize(&msg, buf);
-    assert(size == 24);
+    assert(size == 28);

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
        0x00, // AKEY_EVENT_ACTION_DOWN
-        0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // finger id
+        0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // pointer id
        0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xc8, // 100 200
        0x04, 0x38, 0x07, 0x80, // 1080 1920
        0xff, 0xff, // pressure
+        0x00, 0x00, 0x00, 0x01 // AMOTION_EVENT_BUTTON_PRIMARY
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -271,7 +240,6 @@ int main(void) {
    test_serialize_inject_keycode();
    test_serialize_inject_text();
    test_serialize_inject_text_long();
-    test_serialize_inject_mouse_event();
    test_serialize_inject_touch_event();
    test_serialize_inject_scroll_event();
    test_serialize_back_or_screen_on();
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,5 +3,5 @@ option('compile_server', type: 'boolean', value: true, description: 'Build the s
 option('crossbuild_windows', type: 'boolean', value: false, description: 'Build for Windows from Linux')
 option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)')
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
-option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server.jar from the same directory as the scrcpy executable')
+option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support')
--- a/release.sh
+++ b/release.sh
@@ -23,21 +23,21 @@ cd -
 make -f Makefile.CrossWindows

 # the generated server must be the same everywhere
-cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win32/scrcpy-server.jar
-cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win64/scrcpy-server.jar
+cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win32/scrcpy-server
+cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win64/scrcpy-server

 # get version name
 TAG=$(git describe --tags --always)

 # create release directory
 mkdir -p "release-$TAG"
-cp "$BUILDDIR/server/scrcpy-server.jar" "release-$TAG/scrcpy-server-$TAG.jar"
+cp "$BUILDDIR/server/scrcpy-server" "release-$TAG/scrcpy-server-$TAG"
 cp "dist/scrcpy-win32-$TAG.zip" "release-$TAG/"
 cp "dist/scrcpy-win64-$TAG.zip" "release-$TAG/"

 # generate checksums
 cd "release-$TAG"
-sha256sum "scrcpy-server-$TAG.jar" \
+sha256sum "scrcpy-server-$TAG" \
          "scrcpy-win32-$TAG.zip" \
          "scrcpy-win64-$TAG.zip" > SHA256SUMS.txt

--- a/2
+++ b/2
@@ -20,4 +20,4 @@ then
    exit 1
 fi

-SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server.jar" "$BUILDDIR/app/scrcpy" "$@"
+SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" "$BUILDDIR/app/scrcpy" "$@"
--- a/scripts/run-scrcpy.sh
+++ b/scripts/run-scrcpy.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server.jar" "$MESON_BUILD_ROOT/app/scrcpy"
+SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server" "$MESON_BUILD_ROOT/app/scrcpy"
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# This script generates the scrcpy binary "manually" (without gradle).
+#
+# Adapt Android platform and build tools versions (via ANDROID_PLATFORM and
+# ANDROID_BUILD_TOOLS environment variables).
+#
+# Then execute:
+#
+#     BUILD_DIR=my_build_dir ./build_without_gradle.sh
+
+set -e
+
+PLATFORM=${ANDROID_PLATFORM:-29}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}
+
+BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
+CLASSES_DIR="$BUILD_DIR/classes"
+SERVER_DIR=$(dirname "$0")
+SERVER_BINARY=scrcpy-server
+
+echo "Platform: android-$PLATFORM"
+echo "Build-tools: $BUILD_TOOLS"
+echo "Build dir: $BUILD_DIR"
+
+rm -rf "$CLASSES_DIR" "$BUILD_DIR/$SERVER_BINARY" classes.dex
+mkdir -p "$CLASSES_DIR/com/genymobile/scrcpy"
+
+<< EOF cat > "$CLASSES_DIR/com/genymobile/scrcpy/BuildConfig.java"
+package com.genymobile.scrcpy;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = false;
+}
+EOF
+
+echo "Generating java from aidl..."
+cd "$SERVER_DIR/src/main/aidl"
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o "$CLASSES_DIR" \
+    android/view/IRotationWatcher.aidl
+
+echo "Compiling java sources..."
+cd ../java
+javac -bootclasspath "$ANDROID_HOME/platforms/android-$PLATFORM/android.jar" \
+    -cp "$CLASSES_DIR" -d "$CLASSES_DIR" -source 1.8 -target 1.8 \
+    com/genymobile/scrcpy/*.java \
+    com/genymobile/scrcpy/wrappers/*.java
+
+echo "Dexing..."
+cd "$CLASSES_DIR"
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
+    --output "$BUILD_DIR/classes.dex" \
+    android/view/*.class \
+    com/genymobile/scrcpy/*.class \
+    com/genymobile/scrcpy/wrappers/*.class
+
+echo "Archiving..."
+cd "$BUILD_DIR"
+jar cvf "$SERVER_BINARY" classes.dex
+rm -rf classes.dex classes
+
+echo "Server generated in $BUILD_DIR/$SERVER_BINARY"
--- a/server/meson.build
+++ b/server/meson.build
@@ -4,7 +4,7 @@ prebuilt_server = get_option('prebuilt_server')
 if prebuilt_server == ''
    custom_target('scrcpy-server',
                  build_always: true,  # gradle is responsible for tracking source changes
-                  output: 'scrcpy-server.jar',
+                  output: 'scrcpy-server',
                  command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
                  console: true,
                  install: true,
@@ -16,7 +16,7 @@ else
    endif
    custom_target('scrcpy-server-prebuilt',
                  input: prebuilt_server,
-                  output: 'scrcpy-server.jar',
+                  output: 'scrcpy-server',
                  command: ['cp', '@INPUT@', '@OUTPUT@'],
                  install: true,
                  install_dir: 'share/scrcpy')
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -7,15 +7,14 @@ public final class ControlMessage {

    public static final int TYPE_INJECT_KEYCODE = 0;
    public static final int TYPE_INJECT_TEXT = 1;
-    public static final int TYPE_INJECT_MOUSE_EVENT = 2;
-    public static final int TYPE_INJECT_TOUCH_EVENT = 3;
-    public static final int TYPE_INJECT_SCROLL_EVENT = 4;
-    public static final int TYPE_BACK_OR_SCREEN_ON = 5;
-    public static final int TYPE_EXPAND_NOTIFICATION_PANEL = 6;
-    public static final int TYPE_COLLAPSE_NOTIFICATION_PANEL = 7;
-    public static final int TYPE_GET_CLIPBOARD = 8;
-    public static final int TYPE_SET_CLIPBOARD = 9;
-    public static final int TYPE_SET_SCREEN_POWER_MODE = 10;
+    public static final int TYPE_INJECT_TOUCH_EVENT = 2;
+    public static final int TYPE_INJECT_SCROLL_EVENT = 3;
+    public static final int TYPE_BACK_OR_SCREEN_ON = 4;
+    public static final int TYPE_EXPAND_NOTIFICATION_PANEL = 5;
+    public static final int TYPE_COLLAPSE_NOTIFICATION_PANEL = 6;
+    public static final int TYPE_GET_CLIPBOARD = 7;
+    public static final int TYPE_SET_CLIPBOARD = 8;
+    public static final int TYPE_SET_SCREEN_POWER_MODE = 9;

    private int type;
    private String text;
@@ -23,7 +22,7 @@ public final class ControlMessage {
    private int action; // KeyEvent.ACTION_* or MotionEvent.ACTION_* or POWER_MODE_*
    private int keycode; // KeyEvent.KEYCODE_*
    private int buttons; // MotionEvent.BUTTON_*
-    private long fingerId;
+    private long pointerId;
    private float pressure;
    private Position position;
    private int hScroll;
@@ -48,22 +47,15 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createInjectMouseEvent(int action, int buttons, Position position) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_INJECT_MOUSE_EVENT;
-        msg.action = action;
-        msg.buttons = buttons;
-        msg.position = position;
-        return msg;
-    }
-
-    public static ControlMessage createInjectTouchEvent(int action, long fingerId, Position position, float pressure) {
+    public static ControlMessage createInjectTouchEvent(int action, long pointerId, Position position, float pressure,
+            int buttons) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_INJECT_TOUCH_EVENT;
        msg.action = action;
-        msg.fingerId = fingerId;
+        msg.pointerId = pointerId;
        msg.pressure = pressure;
        msg.position = position;
+        msg.buttons = buttons;
        return msg;
    }

@@ -123,8 +115,8 @@ public final class ControlMessage {
        return buttons;
    }

-    public long getFingerId() {
-        return fingerId;
+    public long getPointerId() {
+        return pointerId;
    }

    public float getPressure() {
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -60,9 +60,6 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_INJECT_TEXT:
                msg = parseInjectText();
                break;
-            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                msg = parseInjectMouseEvent();
-                break;
            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
                msg = parseInjectTouchEvent();
                break;
@@ -124,28 +121,20 @@ public class ControlMessageReader {
        return ControlMessage.createInjectText(text);
    }

-    private ControlMessage parseInjectMouseEvent() {
-        if (buffer.remaining() < INJECT_MOUSE_EVENT_PAYLOAD_LENGTH) {
-            return null;
-        }
-        int action = toUnsigned(buffer.get());
-        int buttons = buffer.getInt();
-        Position position = readPosition(buffer);
-        return ControlMessage.createInjectMouseEvent(action, buttons, position);
-    }
-
+    @SuppressWarnings("checkstyle:MagicNumber")
    private ControlMessage parseInjectTouchEvent() {
        if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
            return null;
        }
        int action = toUnsigned(buffer.get());
-        long fingerId = buffer.getLong();
+        long pointerId = buffer.getLong();
        Position position = readPosition(buffer);
        // 16 bits fixed-point
        int pressureInt = toUnsigned(buffer.getShort());
        // convert it to a float between 0 and 1 (0x1p16f is 2^16 as float)
        float pressure = pressureInt == 0xffff ? 1f : (pressureInt / 0x1p16f);
-        return ControlMessage.createInjectTouchEvent(action, fingerId, position, pressure);
+        int buttons = buffer.getInt();
+        return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, buttons);
    }

    private ControlMessage parseInjectScrollEvent() {
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -13,44 +13,28 @@ import java.io.IOException;

 public class Controller {

-    private static final int MAX_FINGERS = 10;
-
    private final Device device;
    private final DesktopConnection connection;
    private final DeviceMessageSender sender;

    private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);

-    private long lastMouseDown;
-    private final MotionEvent.PointerProperties[] mousePointerProperties = {new MotionEvent.PointerProperties()};
-    private final MotionEvent.PointerCoords[] mousePointerCoords = {new MotionEvent.PointerCoords()};
-
    private long lastTouchDown;
-    private final FingersState fingersState = new FingersState(MAX_FINGERS);
-    private final MotionEvent.PointerProperties[] touchPointerProperties = new MotionEvent.PointerProperties[MAX_FINGERS];
-    private final MotionEvent.PointerCoords[] touchPointerCoords = new MotionEvent.PointerCoords[MAX_FINGERS];
+    private final PointersState pointersState = new PointersState();
+    private final MotionEvent.PointerProperties[] pointerProperties =
+            new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
+    private final MotionEvent.PointerCoords[] pointerCoords =
+            new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];

    public Controller(Device device, DesktopConnection connection) {
        this.device = device;
        this.connection = connection;
-        initMousePointer();
-        initTouchPointers();
+        initPointers();
        sender = new DeviceMessageSender(connection);
    }

-    private void initMousePointer() {
-        MotionEvent.PointerProperties props = mousePointerProperties[0];
-        props.id = 0;
-        props.toolType = MotionEvent.TOOL_TYPE_FINGER;
-
-        MotionEvent.PointerCoords coords = mousePointerCoords[0];
-        coords.orientation = 0;
-        coords.pressure = 1;
-        coords.size = 1;
-    }
-
-    private void initTouchPointers() {
-        for (int i = 0; i < MAX_FINGERS; ++i) {
+    private void initPointers() {
+        for (int i = 0; i < PointersState.MAX_POINTERS; ++i) {
            MotionEvent.PointerProperties props = new MotionEvent.PointerProperties();
            props.toolType = MotionEvent.TOOL_TYPE_FINGER;

@@ -58,23 +42,11 @@ public class Controller {
            coords.orientation = 0;
            coords.size = 1;

-            touchPointerProperties[i] = props;
-            touchPointerCoords[i] = coords;
+            pointerProperties[i] = props;
+            pointerCoords[i] = coords;
        }
    }

-    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 = mousePointerCoords[0];
-        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
-        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
-    }
-
    @SuppressWarnings("checkstyle:MagicNumber")
    public void control() throws IOException {
        // on start, power on the device
@@ -109,11 +81,8 @@ public class Controller {
            case ControlMessage.TYPE_INJECT_TEXT:
                injectText(msg.getText());
                break;
-            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                injectMouse(msg.getAction(), msg.getButtons(), msg.getPosition());
-                break;
            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
-                injectTouch(msg.getAction(), msg.getFingerId(), msg.getPosition(), msg.getPressure());
+                injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
                break;
            case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
@@ -173,23 +142,7 @@ public class Controller {
        return successCount;
    }

-    private boolean injectMouse(int action, int buttons, Position position) {
-        long now = SystemClock.uptimeMillis();
-        if (action == MotionEvent.ACTION_DOWN) {
-            lastMouseDown = now;
-        }
-        Point point = device.getPhysicalPoint(position);
-        if (point == null) {
-            // ignore event
-            return false;
-        }
-        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);
-    }
-
-    private boolean injectTouch(int action, long fingerId, Position position, float pressure) {
+    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int buttons) {
        long now = SystemClock.uptimeMillis();

        Point point = device.getPhysicalPoint(position);
@@ -198,38 +151,33 @@ public class Controller {
            return false;
        }

-        int fingerIndex = fingersState.getFingerIndex(fingerId);
-        if (fingerIndex == -1) {
-            Ln.w("Too many fingers for touch event");
+        int pointerIndex = pointersState.getPointerIndex(pointerId);
+        if (pointerIndex == -1) {
+            Ln.w("Too many pointers for touch event");
            return false;
        }
-        Finger finger = fingersState.get(fingerIndex);
-        finger.setPoint(point);
-        finger.setPressure(pressure);
-        finger.setUp(action == MotionEvent.ACTION_UP);
+        Pointer pointer = pointersState.get(pointerIndex);
+        pointer.setPoint(point);
+        pointer.setPressure(pressure);
+        pointer.setUp(action == MotionEvent.ACTION_UP);

-        // FAIL: action_up will always remove the finger, and the event will not be written!
-        int pointerCount = fingersState.update(touchPointerProperties, touchPointerCoords);
-        fingersState.cleanUp();
+        int pointerCount = pointersState.update(pointerProperties, pointerCoords);

-        Ln.d("pointerCount = " + pointerCount);
-        for (int i = 0; i < pointerCount; ++i) {
-            Ln.d("props = " + touchPointerProperties[i].id);
-            Ln.d("coords = " + touchPointerCoords[i].x + "," + touchPointerCoords[i].y);
-        }
-
-        if (pointerCount > 1) {
-            if (action == MotionEvent.ACTION_UP) {
-                action = MotionEvent.ACTION_POINTER_UP | (fingerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
-            } else if (action == MotionEvent.ACTION_DOWN) {
-                action = MotionEvent.ACTION_POINTER_DOWN | (fingerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+        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 if (action == MotionEvent.ACTION_DOWN) {
+                action = MotionEvent.ACTION_POINTER_DOWN | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
            }
-        } else if (action == MotionEvent.ACTION_DOWN) {
-            lastTouchDown = now;
        }

-        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, touchPointerProperties, touchPointerCoords, 0, 0, 1f, 1f, 0, 0,
-                InputDevice.SOURCE_TOUCHSCREEN, 0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties,
+                pointerCoords, 0, buttons, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
        return injectEvent(event);
    }

@@ -240,23 +188,30 @@ public class Controller {
            // ignore event
            return false;
        }
-        setMousePointerCoords(point);
-        setScroll(hScroll, vScroll);
-        MotionEvent event = MotionEvent.obtain(lastMouseDown, now, MotionEvent.ACTION_SCROLL, 1, mousePointerProperties, mousePointerCoords, 0, 0, 1f, 1f, 0,
-                0, InputDevice.SOURCE_MOUSE, 0);
+
+        MotionEvent.PointerProperties props = pointerProperties[0];
+        props.id = 0;
+
+        MotionEvent.PointerCoords coords = pointerCoords[0];
+        coords.x = point.getX();
+        coords.y = point.getY();
+        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
+        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
+
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties,
+                pointerCoords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_MOUSE, 0);
        return injectEvent(event);
    }

    private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
        long now = SystemClock.uptimeMillis();
-        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                InputDevice.SOURCE_KEYBOARD);
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD,
+                0, 0, InputDevice.SOURCE_KEYBOARD);
        return injectEvent(event);
    }

    private boolean injectKeycode(int keyCode) {
-        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0)
-                && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
+        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
    }

    private boolean injectEvent(InputEvent event) {
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -161,7 +161,11 @@ public final class Device {
     * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
     */
    public void setScreenPowerMode(int mode) {
-        IBinder d = SurfaceControl.getBuiltInDisplay(0);
+        IBinder d = SurfaceControl.getBuiltInDisplay();
+        if (d == null) {
+            Ln.e("Could not get built-in display");
+            return;
+        }
        SurfaceControl.setDisplayPowerMode(d, mode);
        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
    }
--- a/server/src/main/java/com/genymobile/scrcpy/FingersState.java
+++ b/server/src/main/java/com/genymobile/scrcpy/FingersState.java
@@ -1,101 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.view.MotionEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FingersState {
-
-    private final List<Finger> fingers = new ArrayList<>();
-    private int maxFingers;
-
-    public FingersState(int maxFingers) {
-        this.maxFingers = maxFingers;
-    }
-
-    private int indexOf(long id) {
-        for (int i = 0; i < fingers.size(); ++i) {
-            Finger finger = fingers.get(i);
-            if (finger.getId() == id) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private boolean isLocalIdAvailable(int localId) {
-        for (int i = 0; i < fingers.size(); ++i) {
-            Finger finger = fingers.get(i);
-            if (finger.getLocalId() == localId) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private int nextUnusedLocalId() {
-        for (int localId = 0; localId < maxFingers; ++localId) {
-            if (isLocalIdAvailable(localId)) {
-                return localId;
-            }
-        }
-        return -1;
-    }
-
-    public Finger get(int index) {
-        return fingers.get(index);
-    }
-
-    public int getFingerIndex(long id) {
-        int index = indexOf(id);
-        if (index != -1) {
-            // already exists, return it
-            return index;
-        }
-        if (fingers.size() >= maxFingers) {
-            // it's full
-            return -1;
-        }
-        // id 0 is reserved for mouse events
-        int localId = nextUnusedLocalId();
-        if (localId == -1) {
-            throw new AssertionError("fingers.size() < maxFingers implies that a local id is available");
-        }
-        Finger finger = new Finger(id, localId);
-        fingers.add(finger);
-        // return the index of the finger
-        return fingers.size() - 1;
-    }
-
-    /**
-     * Initialize the motion event parameters.
-     *
-     * @param props  the pointer properties
-     * @param coords the pointer coordinates
-     * @return The number of items initialized (the number of fingers).
-     */
-    public int update(MotionEvent.PointerProperties[] props, MotionEvent.PointerCoords[] coords) {
-        for (int i = 0; i < fingers.size(); ++i) {
-            Finger finger = fingers.get(i);
-
-            // id 0 is reserved for mouse events
-            props[i].id = finger.getLocalId();
-
-            Point point = finger.getPoint();
-            coords[i].x = point.getX();
-            coords[i].y = point.getY();
-            coords[i].pressure = finger.getPressure();
-        }
-        return fingers.size();
-    }
-
-    public void cleanUp() {
-        for (int i = fingers.size() - 1; i >= 0; --i) {
-            Finger finger = fingers.get(i);
-            if (finger.isUp()) {
-                fingers.remove(i);
-            }
-        }
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/Pointer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Pointer.java
@@ -1,14 +1,22 @@
 package com.genymobile.scrcpy;

-public class Finger {
+public class Pointer {

+    /**
+     * Pointer id as received from the client.
+     */
    private final long id;
+
+    /**
+     * Local pointer id, using the lowest possible values to fill the {@link android.view.MotionEvent.PointerProperties PointerProperties}.
+     */
    private final int localId;
+
    private Point point;
    private float pressure;
    private boolean up;

-    public Finger(long id, int localId) {
+    public Pointer(long id, int localId) {
        this.id = id;
        this.localId = localId;
    }
--- a/server/src/main/java/com/genymobile/scrcpy/PointersState.java
+++ b/server/src/main/java/com/genymobile/scrcpy/PointersState.java
@@ -0,0 +1,103 @@
+package com.genymobile.scrcpy;
+
+import android.view.MotionEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PointersState {
+
+    public static final int MAX_POINTERS = 10;
+
+    private final List<Pointer> pointers = new ArrayList<>();
+
+    private int indexOf(long id) {
+        for (int i = 0; i < pointers.size(); ++i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.getId() == id) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private boolean isLocalIdAvailable(int localId) {
+        for (int i = 0; i < pointers.size(); ++i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.getLocalId() == localId) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int nextUnusedLocalId() {
+        for (int localId = 0; localId < MAX_POINTERS; ++localId) {
+            if (isLocalIdAvailable(localId)) {
+                return localId;
+            }
+        }
+        return -1;
+    }
+
+    public Pointer get(int index) {
+        return pointers.get(index);
+    }
+
+    public int getPointerIndex(long id) {
+        int index = indexOf(id);
+        if (index != -1) {
+            // already exists, return it
+            return index;
+        }
+        if (pointers.size() >= MAX_POINTERS) {
+            // it's full
+            return -1;
+        }
+        // id 0 is reserved for mouse events
+        int localId = nextUnusedLocalId();
+        if (localId == -1) {
+            throw new AssertionError("pointers.size() < maxFingers implies that a local id is available");
+        }
+        Pointer pointer = new Pointer(id, localId);
+        pointers.add(pointer);
+        // return the index of the pointer
+        return pointers.size() - 1;
+    }
+
+    /**
+     * Initialize the motion event parameters.
+     *
+     * @param props  the pointer properties
+     * @param coords the pointer coordinates
+     * @return The number of items initialized (the number of pointers).
+     */
+    public int update(MotionEvent.PointerProperties[] props, MotionEvent.PointerCoords[] coords) {
+        int count = pointers.size();
+        for (int i = 0; i < count; ++i) {
+            Pointer pointer = pointers.get(i);
+
+            // id 0 is reserved for mouse events
+            props[i].id = pointer.getLocalId();
+
+            Point point = pointer.getPoint();
+            coords[i].x = point.getX();
+            coords[i].y = point.getY();
+            coords[i].pressure = pointer.getPressure();
+        }
+        cleanUp();
+        return count;
+    }
+
+    /**
+     * Remove all pointers which are UP.
+     */
+    private void cleanUp() {
+        for (int i = pointers.size() - 1; i >= 0; --i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.isUp()) {
+                pointers.remove(i);
+            }
+        }
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -7,7 +7,7 @@ import java.io.IOException;

 public final class Server {

-    private static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+    private static final String SERVER_PATH = "/data/local/tmp/scrcpy-server";

    private Server() {
        // not instantiable
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -1,44 +1,102 @@
 package com.genymobile.scrcpy.wrappers;

+import com.genymobile.scrcpy.Ln;
+
 import android.content.ClipData;
+import android.os.Build;
 import android.os.IInterface;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

 public class ClipboardManager {
+
+    private static final String PACKAGE_NAME = "com.android.shell";
+    private static final int USER_ID = 0;
+
    private final IInterface manager;
-    private final Method getPrimaryClipMethod;
-    private final Method setPrimaryClipMethod;
+    private Method getPrimaryClipMethod;
+    private Method setPrimaryClipMethod;

    public ClipboardManager(IInterface manager) {
        this.manager = manager;
-        try {
-            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
-            setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
-        } catch (NoSuchMethodException e) {
-            throw new AssertionError(e);
+    }
+
+    private Method getGetPrimaryClipMethod() {
+        if (getPrimaryClipMethod == null) {
+            try {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
+                } else {
+                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
+        }
+        return getPrimaryClipMethod;
+    }
+
+    private Method getSetPrimaryClipMethod() {
+        if (setPrimaryClipMethod == null) {
+            try {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
+                } else {
+                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class,
+                            String.class, int.class);
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
+        }
+        return setPrimaryClipMethod;
+    }
+
+    private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException,
+            IllegalAccessException {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            return (ClipData) method.invoke(manager, PACKAGE_NAME);
+        }
+        return (ClipData) method.invoke(manager, PACKAGE_NAME, USER_ID);
+    }
+
+    private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData) throws InvocationTargetException,
+            IllegalAccessException {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            method.invoke(manager, clipData, PACKAGE_NAME);
+        } else {
+            method.invoke(manager, clipData, PACKAGE_NAME, USER_ID);
        }
    }

    public CharSequence getText() {
+        Method method = getGetPrimaryClipMethod();
+        if (method == null) {
+            return null;
+        }
        try {
-            ClipData clipData = (ClipData) getPrimaryClipMethod.invoke(manager, "com.android.shell");
+            ClipData clipData = getPrimaryClip(method, manager);
            if (clipData == null || clipData.getItemCount() == 0) {
                return null;
            }
            return clipData.getItemAt(0).getText();
        } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Could not invoke " + method.getName(), e);
+            return null;
        }
    }

    public void setText(CharSequence text) {
+        Method method = getSetPrimaryClipMethod();
+        if (method == null) {
+            return;
+        }
        ClipData clipData = ClipData.newPlainText(null, text);
        try {
-            setPrimaryClipMethod.invoke(manager, clipData, "com.android.shell");
+            setPrimaryClip(method, manager, clipData);
        } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy.wrappers;

+import com.genymobile.scrcpy.Ln;
+
 import android.os.IInterface;
 import android.view.InputEvent;

@@ -13,22 +15,33 @@ public final class InputManager {
    public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = 2;

    private final IInterface manager;
-    private final Method injectInputEventMethod;
+    private Method injectInputEventMethod;

    public InputManager(IInterface manager) {
        this.manager = manager;
-        try {
-            injectInputEventMethod = manager.getClass().getMethod("injectInputEvent", InputEvent.class, int.class);
-        } catch (NoSuchMethodException e) {
-            throw new AssertionError(e);
+    }
+
+    private Method getInjectInputEventMethod() {
+        if (injectInputEventMethod == null) {
+            try {
+                injectInputEventMethod = manager.getClass().getMethod("injectInputEvent", InputEvent.class, int.class);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
+        return injectInputEventMethod;
    }

    public boolean injectInputEvent(InputEvent inputEvent, int mode) {
+        Method method = getInjectInputEventMethod();
+        if (method == null) {
+            return false;
+        }
        try {
-            return (Boolean) injectInputEventMethod.invoke(manager, inputEvent, mode);
+            return (Boolean) method.invoke(manager, inputEvent, mode);
        } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Could not invoke " + method.getName(), e);
+            return false;
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy.wrappers;

+import com.genymobile.scrcpy.Ln;
+
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.IInterface;
@@ -9,24 +11,35 @@ import java.lang.reflect.Method;

 public final class PowerManager {
    private final IInterface manager;
-    private final Method isScreenOnMethod;
+    private Method isScreenOnMethod;

    public PowerManager(IInterface manager) {
        this.manager = manager;
-        try {
-            @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
-            String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
-            isScreenOnMethod = manager.getClass().getMethod(methodName);
-        } catch (NoSuchMethodException e) {
-            throw new AssertionError(e);
+    }
+
+    private Method getIsScreenOnMethod() {
+        if (isScreenOnMethod == null) {
+            try {
+                @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
+                        String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
+                isScreenOnMethod = manager.getClass().getMethod(methodName);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
+        return isScreenOnMethod;
    }

    public boolean isScreenOn() {
+        Method method = getIsScreenOnMethod();
+        if (method == null) {
+            return false;
+        }
        try {
-            return (Boolean) isScreenOnMethod.invoke(manager);
+            return (Boolean) method.invoke(manager);
        } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Could not invoke " + method.getName(), e);
+            return false;
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
@@ -17,35 +17,49 @@ public class StatusBarManager {
        this.manager = manager;
    }

-    public void expandNotificationsPanel() {
+    private Method getExpandNotificationsPanelMethod() {
        if (expandNotificationsPanelMethod == null) {
            try {
                expandNotificationsPanelMethod = manager.getClass().getMethod("expandNotificationsPanel");
            } catch (NoSuchMethodException e) {
-                Ln.e("ServiceBarManager.expandNotificationsPanel() is not available on this device");
-                return;
+                Ln.e("Could not find method", e);
            }
        }
-        try {
-            expandNotificationsPanelMethod.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke ServiceBarManager.expandNotificationsPanel()", e);
-        }
+        return expandNotificationsPanelMethod;
    }

-    public void collapsePanels() {
+    private Method getCollapsePanelsMethod() {
        if (collapsePanelsMethod == null) {
            try {
                collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
            } catch (NoSuchMethodException e) {
-                Ln.e("ServiceBarManager.collapsePanels() is not available on this device");
-                return;
+                Ln.e("Could not find method", e);
            }
        }
+        return collapsePanelsMethod;
+    }
+
+    public void expandNotificationsPanel() {
+        Method method = getExpandNotificationsPanelMethod();
+        if (method == null) {
+            return;
+        }
        try {
-            collapsePanelsMethod.invoke(manager);
+            method.invoke(manager);
        } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke ServiceBarManager.collapsePanels()", e);
+            Ln.e("Could not invoke " + method.getName(), e);
+        }
+    }
+
+    public void collapsePanels() {
+        Method method = getCollapsePanelsMethod();
+        if (method == null) {
+            return;
+        }
+        try {
+            method.invoke(manager);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@@ -1,11 +1,16 @@
 package com.genymobile.scrcpy.wrappers;

+import com.genymobile.scrcpy.Ln;
+
 import android.annotation.SuppressLint;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
 import android.view.Surface;

+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
@SuppressLint("PrivateApi")
 public final class SurfaceControl {

@@ -23,6 +28,9 @@ public final class SurfaceControl {
        }
    }

+    private static Method getBuiltInDisplayMethod;
+    private static Method setDisplayPowerModeMethod;
+
    private SurfaceControl() {
        // only static methods
    }
@@ -76,24 +84,62 @@ public final class SurfaceControl {
        }
    }

-    public static IBinder getBuiltInDisplay(int builtInDisplayId) {
-        try {
-            // the method signature has changed in Android Q
-            // <https://github.com/Genymobile/scrcpy/issues/586>
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                return (IBinder) CLASS.getMethod("getBuiltInDisplay", int.class).invoke(null, builtInDisplayId);
+    private static Method getGetBuiltInDisplayMethod() {
+        if (getBuiltInDisplayMethod == null) {
+            try {
+                // the method signature has changed in Android Q
+                // <https://github.com/Genymobile/scrcpy/issues/586>
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    getBuiltInDisplayMethod = CLASS.getMethod("getBuiltInDisplay", int.class);
+                } else {
+                    getBuiltInDisplayMethod = CLASS.getMethod("getInternalDisplayToken");
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
            }
-            return (IBinder) CLASS.getMethod("getPhysicalDisplayToken", long.class).invoke(null, builtInDisplayId);
-        } catch (Exception e) {
-            throw new AssertionError(e);
+        }
+        return getBuiltInDisplayMethod;
+    }
+
+    public static IBinder getBuiltInDisplay() {
+        Method method = getGetBuiltInDisplayMethod();
+        if (method == null) {
+            return null;
+        }
+        try {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                // call getBuiltInDisplay(0)
+                return (IBinder) method.invoke(null, 0);
+            }
+
+            // call getInternalDisplayToken()
+            return (IBinder) method.invoke(null);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
+            return null;
        }
    }

+    private static Method getSetDisplayPowerModeMethod() {
+        if (setDisplayPowerModeMethod == null) {
+            try {
+                setDisplayPowerModeMethod = CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
+        }
+        return setDisplayPowerModeMethod;
+    }
+
    public static void setDisplayPowerMode(IBinder displayToken, int mode) {
+        Method method = getSetDisplayPowerModeMethod();
+        if (method == null) {
+            return;
+        }
        try {
-            CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class).invoke(null, displayToken, mode);
-        } catch (Exception e) {
-            throw new AssertionError(e);
+            method.invoke(null, displayToken, mode);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }

--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -76,35 +76,6 @@ public class ControlMessageReaderTest {
        Assert.assertEquals(new String(text, StandardCharsets.US_ASCII), event.getText());
    }

-    @Test
-    @SuppressWarnings("checkstyle:MagicNumber")
-    public void testParseMouseEvent() throws IOException {
-        ControlMessageReader reader = new ControlMessageReader();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_INJECT_MOUSE_EVENT);
-        dos.writeByte(MotionEvent.ACTION_DOWN);
-        dos.writeInt(MotionEvent.BUTTON_PRIMARY);
-        dos.writeInt(100);
-        dos.writeInt(200);
-        dos.writeShort(1080);
-        dos.writeShort(1920);
-
-        byte[] packet = bos.toByteArray();
-
-        reader.readFrom(new ByteArrayInputStream(packet));
-        ControlMessage event = reader.next();
-
-        Assert.assertEquals(ControlMessage.TYPE_INJECT_MOUSE_EVENT, event.getType());
-        Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
-        Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getButtons());
-        Assert.assertEquals(100, event.getPosition().getPoint().getX());
-        Assert.assertEquals(200, event.getPosition().getPoint().getY());
-        Assert.assertEquals(1080, event.getPosition().getScreenSize().getWidth());
-        Assert.assertEquals(1920, event.getPosition().getScreenSize().getHeight());
-    }
-
    @Test
    @SuppressWarnings("checkstyle:MagicNumber")
    public void testParseTouchEvent() throws IOException {
@@ -114,12 +85,13 @@ public class ControlMessageReaderTest {
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_INJECT_TOUCH_EVENT);
        dos.writeByte(MotionEvent.ACTION_DOWN);
-        dos.writeLong(-42); // fingerId
+        dos.writeLong(-42); // pointerId
        dos.writeInt(100);
        dos.writeInt(200);
        dos.writeShort(1080);
        dos.writeShort(1920);
        dos.writeShort(0xffff); // pressure
+        dos.writeInt(MotionEvent.BUTTON_PRIMARY);

        byte[] packet = bos.toByteArray();

@@ -128,12 +100,13 @@ public class ControlMessageReaderTest {

        Assert.assertEquals(ControlMessage.TYPE_INJECT_TOUCH_EVENT, event.getType());
        Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
-        Assert.assertEquals(-42, event.getFingerId());
+        Assert.assertEquals(-42, event.getPointerId());
        Assert.assertEquals(100, event.getPosition().getPoint().getX());
        Assert.assertEquals(200, event.getPosition().getPoint().getY());
        Assert.assertEquals(1080, event.getPosition().getScreenSize().getWidth());
        Assert.assertEquals(1920, event.getPosition().getScreenSize().getHeight());
        Assert.assertEquals(1f, event.getPressure(), 0f); // must be exact
+        Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getButtons());
    }

    @Test
Author	SHA1	Message	Date
Diego Fernando Díaz A	ad6b8847d4	Add option to disable window decoration Add --window-borderless parameter. Signed-off-by: Romain Vimont <rom@rom1v.com>	2019-11-03 18:18:41 +01:00
Romain Vimont	fba89e6f73	Add option to specify the initial window size Add --window-width and --window-height parameters. If only one is provided, the other is computed so that the aspect ratio is preserved.	2019-11-03 18:18:41 +01:00
Romain Vimont	4bf2b80c75	Update manpage for --window-{x,y} options	2019-11-03 18:18:41 +01:00
Diego Fernando Díaz A	f983ec67fa	Add option to specify the initial window position Add --window-x and --window-y parameters. Signed-off-by: Romain Vimont <rom@rom1v.com>	2019-11-03 18:18:39 +01:00
Romain Vimont	120f08ee96	Fix manpage option parameter format The parameter for --window-title was not underlined the same way as others.	2019-11-03 16:51:47 +01:00
Romain Vimont	0415672a75	Merge branch 'master' into dev	2019-11-03 15:56:10 +01:00
Romain Vimont	3ea4742321	Call ninja without changing directory In build instructions, use: ninja -Cx ... instead of: cd x ninja ...	2019-10-31 21:05:04 +01:00
Romain Vimont	95fd64b5de	Add scrcpy version in recorded video metadata It might help to understand problems in recorded videos.	2019-10-31 20:57:57 +01:00
Romain Vimont	ab205084dc	Merge pull request #896 from yangfl/upstream Add manpage for scrcpy	2019-10-31 13:44:01 +01:00
yangfl	4696878a97	Add manpage for scrcpy	2019-10-31 18:18:19 +08:00
Romain Vimont	3da95b52bd	Rename scrcpy-server.jar to scrcpy-server The server name ending with .jar has several drawbacks: - meson requires the jar executable to attempt to modify it: <https://github.com/Genymobile/scrcpy/issues/404#issuecomment-456065923> <https://github.com/mesonbuild/meson/issues/4844> - meson warns during "ninja install" <https://github.com/Genymobile/scrcpy/issues/458> - some users try to execute it on the computer as a java executable Removing the extension solves all these problems.	2019-10-31 10:54:29 +01:00
Romain Vimont	c72f677435	Merge branch 'master' into dev	2019-10-30 23:29:44 +01:00
Romain Vimont	1380f6e00f	Fix help for --record-format Record format requires a parameter.	2019-10-30 22:51:40 +01:00
Romain Vimont	d841718956	Add a script to build the server without gradle Gradle versions may sometimes cause problems. This script offers an alternative.	2019-10-30 21:47:20 +01:00
Romain Vimont	17d53be3ef	Fix mouse events conversion The conversion from SDL mouse state to Android mouse state used wrong constants as mask. Fixes <https://github.com/Genymobile/scrcpy/issues/635>	2019-10-25 11:09:06 +02:00
Romain Vimont	f9938dbf88	Inject button state for touch/mouse events The buttons state was forwarded, but ignored by the server.	2019-10-25 11:04:04 +02:00
Romain Vimont	f6c8460ebb	Rename window size functions for clarity Now, get_window_size() returns the current window size (fullscreen or not), while get_windowed_window_size() always returned the windowed size (the size when fullscreen is disabled).	2019-10-20 16:08:16 +02:00
Romain Vimont	c33a147fd0	Fix "turn screen off" on Android Q Call getInternalDisplayToken(), which retrieve the id of the first physical display (which is not necessarily 0 anymore). Fixes <https://github.com/Genymobile/scrcpy/issues/835>	2019-10-17 23:25:00 +02:00
Romain Vimont	8b33c6c108	Adapt copy-paste methods for Android 10 The methods getPrimaryClip() and setPrimaryClip() expect an additional parameter since Android 10. Fixes <https://github.com/Genymobile/scrcpy/issues/796>.	2019-10-17 22:21:47 +02:00
Romain Vimont	5b7a0cd8e9	Extract String literal to static constant	2019-10-17 22:11:39 +02:00
Romain Vimont	bab9361948	Do not crash on control error Some devices do not have some methods that we invoke via reflection, or their call do not return the expected value. In that case, do not crash the whole controller.	2019-10-17 22:09:54 +02:00
Romain Vimont	6220456def	Merge mouse and touch events Both are handled the very same way on the device.	2019-10-03 20:37:49 +02:00
Romain Vimont	7e1d52c119	Rename "touch pointer" to "pointer" There are only touch pointers now, mouse pointers have been removed.	2019-10-03 20:27:28 +02:00
Romain Vimont	280d5b718c	Use common pointers for mouse and touch The mouse is a pointer like any other.	2019-10-03 20:05:29 +02:00
Romain Vimont	30168f0428	Ignore duplicate mouse events In SDL, a touch event may simulate an identical mouse event. Since we already handle touch event, ignore these duplicates.	2019-10-03 20:05:29 +02:00
Romain Vimont	b5a2d99bc2	Send touch events from the client On SDL touch events, send control messages to the server.	2019-10-03 20:05:29 +02:00
Romain Vimont	f765aae352	Inject touch events on the server On receiving an "inject touch" control message, update the local pointers state and inject touches.	2019-10-03 20:05:29 +02:00
Romain Vimont	77f876e29c	Add "inject touch" control message Add a control message type in the protocol to forward touch events to the device.	2019-10-03 20:05:27 +02:00
Romain Vimont	d90549d1e6	Rename "pointer" to "mouse pointer" This will help to distinguish them from "touch pointers".	2019-10-02 21:40:26 +02:00
Romain Vimont	810ff80ba7	Add buffer_write64be() Add a function to write 64 bits in big-endian from a uint64_t.	2019-10-02 21:40:26 +02:00