WIP: attempt to fix #702

Write the whole first data packet along with the config packet in the
codec extradata to write the header.

BUILD.md

@@ -43,7 +43,7 @@ Install the required packages from your package manager.
 sudo apt install ffmpeg libsdl2-2.0-0
 
 # client build dependencies
-sudo apt install gcc git pkg-config meson ninja-build \
+sudo apt install make gcc git pkg-config meson ninja-build \
                  libavcodec-dev libavformat-dev libavutil-dev \
                  libsdl2-dev
 
@@ -195,7 +195,8 @@ Then, build:
 
 ```bash
 meson x --buildtype release --strip -Db_lto=true
-ninja -Cx
+cd x
+ninja
 ```
 
 _Note: `ninja` [must][ninja-user] be run as a non-root user (only `ninja
@@ -218,13 +219,13 @@ To run without installing:
 After a successful build, you can install _scrcpy_ on the system:
 
 ```bash
-sudo ninja -Cx install    # without sudo on Windows
+sudo ninja install    # without sudo on Windows
 ```
 
 This installs two files:
 
  - `/usr/local/bin/scrcpy`
- - `/usr/local/share/scrcpy/scrcpy-server`
+ - `/usr/local/share/scrcpy/scrcpy-server.jar`
 
 Just remove them to "uninstall" the application.
 
@@ -243,7 +244,8 @@ configuration:
 
 ```bash
 meson x --buildtype release --strip -Db_lto=true \
-    -Dprebuilt_server=/path/to/scrcpy-server
+    -Dprebuilt_server=/path/to/scrcpy-server.jar
-ninja -Cx
+cd x
-sudo ninja -Cx install
+ninja
+sudo ninja install
 ```

DEVELOP.md

@@ -3,7 +3,7 @@
 ## Overview
 
 This application is composed of two parts:
- - the server (`scrcpy-server`), to be executed on the device,
+ - the server (`scrcpy-server.jar`), 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`).
+`scrcpy-server.jar`).
 
 [dex]: https://en.wikipedia.org/wiki/Dalvik_(software)
 [apk]: https://en.wikipedia.org/wiki/Android_application_package
@@ -268,33 +268,3 @@ For more details, go read the code!
 
 If you find a bug, or have an awesome idea to implement, please discuss and
 contribute ;-)
-
-
-### Debug the server
-
-The server is pushed to the device by the client on startup.
-
-To debug it, enable the server debugger during configuration:
-
-```bash
-meson x -Dserver_debugger=true
-# or, if x is already configured
-meson configure x -Dserver_debugger=true
-```
-
-Then recompile.
-
-When you start scrcpy, it will start a debugger on port 5005 on the device.
-Redirect that port to the computer:
-
-```bash
-adb forward tcp:5005 tcp:5005
-```
-
-In Android Studio, _Run_ > _Debug_ > _Edit configurations..._ On the left, click on
-`+`, _Remote_, and fill the form:
-
- - Host: `localhost`
- - Port: `5005`
-
-Then click on _Debug_.

FAQ.md

@@ -1,5 +1,10 @@
 # Frequently Asked Questions
 
+## Common issues
+
+The application is very young, it is not unlikely that you encounter problems
+with it.
+
 Here are the common reported problems and their status.
 
 
@@ -15,13 +20,9 @@ Windows may need some [drivers] to detect your device.
 [drivers]: https://developer.android.com/studio/run/oem-usb.html
 
 
-### I can only mirror, I cannot interact with the device
+### Mouse clicks do not work
 
 On some devices, you may need to enable an option to allow [simulating input].
-In developer options, enable:
-
-> **USB debugging (Security settings)**  
-> _Allow granting permissions and simulating input via USB debugging_
 
 [simulating input]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
 
@@ -42,16 +43,6 @@ meson x --buildtype release -Dhidpi_support=false
 However, the video will be displayed at lower resolution.
 
 
-### The quality is low on HiDPI display
-
-On Windows, you may need to configure the [scaling behavior].
-
-> `scrcpy.exe` > Properties > Compatibility > Change high DPI settings >
-> Override high DPI scaling behavior > Scaling performed by: _Application_.
-
-[scaling behavior]: https://github.com/Genymobile/scrcpy/issues/40#issuecomment-424466723
-
-
 ### KWin compositor crashes
 
 On Plasma Desktop, compositor is disabled while _scrcpy_ is running.
@@ -59,26 +50,3 @@ On Plasma Desktop, compositor is disabled while _scrcpy_ is running.
 As a workaround, [disable "Block compositing"][kwin].
 
 [kwin]: https://github.com/Genymobile/scrcpy/issues/114#issuecomment-378778613
-
-
-### I get an error "Could not open video stream"
-
-There may be many reasons. One common cause is that the hardware encoder of your
-device is not able to encode at the given definition:
-
-```
-ERROR: Exception on thread Thread[main,5,main]
-android.media.MediaCodec$CodecException: Error 0xfffffc0e
-...
-Exit due to uncaughtException in main thread:
-ERROR: Could not open video stream
-INFO: Initial texture: 1080x2336
-```
-
-Just try with a lower definition:
-
-```
-scrcpy -m 1920
-scrcpy -m 1024
-scrcpy -m 800
-```

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).
+# locations (e.g. /usr/bin/scrcpy and /usr/share/scrcpy/scrcpy-server.jar).
 #
 # 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 "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server.jar "$(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 "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server.jar "$(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)/"

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` file, configure its path in
+To override the path of the `scrcpy-server.jar` file, configure its path in
 `SCRCPY_SERVER_PATH`.
 
 [useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345

app/meson.build

@@ -3,10 +3,10 @@ src = [
     'src/command.c',
     'src/control_msg.c',
     'src/controller.c',
+    'src/convert.c',
     'src/decoder.c',
     'src/device.c',
     'src/device_msg.c',
-    'src/event_converter.c',
     'src/file_handler.c',
     'src/fps_counter.c',
     'src/input_manager.c',
@@ -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 accessible from the same
+# build a "portable" version (with scrcpy-server.jar accessible from the same
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))
 
@@ -109,15 +109,12 @@ conf.set('DEFAULT_MAX_SIZE', '0')  # 0: unlimited
 # overridden by option --bit-rate
 conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps
 
+# enable High DPI support
+conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))
+
 # disable console on Windows
 conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole'))
 
-# run a server debugger and wait for a client to be attached
-conf.set('SERVER_DEBUGGER', get_option('server_debugger'))
-
-# enable a workaround for bug #15
-conf.set('HIDPI_WORKAROUND', get_option('hidpi_workaround'))
-
 configure_file(configuration: conf, output: 'config.h')
 
 src_dir = include_directories('src')
@@ -137,8 +134,6 @@ executable('scrcpy', src,
            c_args: c_args,
            link_args: link_args)
 
-install_man('scrcpy.1')
-
 
 ### TESTS
 

app/scrcpy.1

@@ -1,231 +0,0 @@
-.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.
-
-
-.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

app/src/buffer_util.h

@@ -4,8 +4,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "config.h"
-
 static inline void
 buffer_write16be(uint8_t *buf, uint16_t value) {
     buf[0] = value >> 8;
@@ -20,12 +18,6 @@ buffer_write32be(uint8_t *buf, uint32_t value) {
     buf[3] = value;
 }
 
-static inline void
-buffer_write64be(uint8_t *buf, uint64_t value) {
-    buffer_write32be(buf, value >> 32);
-    buffer_write32be(&buf[4], (uint32_t) value);
-}
-
 static inline uint16_t
 buffer_read16be(const uint8_t *buf) {
     return (buf[0] << 8) | buf[1];

app/src/cbuf.h

@@ -5,8 +5,6 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "config.h"
-
 // To define a circular buffer type of 20 ints:
 //     struct cbuf_int CBUF(int, 20);
 //

app/src/command.c

@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "log.h"
 #include "str_util.h"

app/src/command.h

@@ -33,8 +33,6 @@
 
 #endif
 
-#include "config.h"
-
 # define NO_EXIT_CODE -1
 
 enum process_result {

app/src/common.h

@@ -3,8 +3,6 @@
 
 #include <stdint.h>
 
-#include "config.h"
-
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)

app/src/control_msg.c

@@ -1,9 +1,7 @@
 #include "control_msg.h"
 
 #include <string.h>
-#include <SDL2/SDL_assert.h>
 
-#include "config.h"
 #include "buffer_util.h"
 #include "log.h"
 #include "str_util.h"
@@ -25,16 +23,6 @@ write_string(const char *utf8, size_t max_len, unsigned char *buf) {
     return 2 + len;
 }
 
-static uint16_t
-to_fixed_point_16(float f) {
-    SDL_assert(f >= 0.0f && f <= 1.0f);
-    uint32_t u = f * 0x1p16f; // 2^16
-    if (u >= 0xffff) {
-        u = 0xffff;
-    }
-    return (uint16_t) u;
-}
-
 size_t
 control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
     buf[0] = msg->type;
@@ -49,15 +37,11 @@ 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_TOUCH_EVENT:
+        case CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT:
-            buf[1] = msg->inject_touch_event.action;
+            buf[1] = msg->inject_mouse_event.action;
-            buffer_write64be(&buf[2], msg->inject_touch_event.pointer_id);
+            buffer_write32be(&buf[2], msg->inject_mouse_event.buttons);
-            write_position(&buf[10], &msg->inject_touch_event.position);
+            write_position(&buf[6], &msg->inject_mouse_event.position);
-            uint16_t pressure =
+            return 18;
-                to_fixed_point_16(msg->inject_touch_event.pressure);
-            buffer_write16be(&buf[22], pressure);
-            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],

app/src/control_msg.h

@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "config.h"
 #include "android/input.h"
 #include "android/keycodes.h"
 #include "common.h"
@@ -15,12 +14,10 @@
 #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_TOUCH_EVENT,
+    CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
     CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
     CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
     CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
@@ -50,10 +47,8 @@ struct control_msg {
         struct {
             enum android_motionevent_action action;
             enum android_motionevent_buttons buttons;
-            uint64_t pointer_id;
             struct position position;
-            float pressure;
+        } inject_mouse_event;
-        } inject_touch_event;
         struct {
             struct position position;
             int32_t hscroll;

app/src/controller.h

@@ -5,7 +5,6 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
 #include "cbuf.h"
 #include "control_msg.h"
 #include "net.h"

app/src/convert.c

@@ -1,11 +1,9 @@
-#include "event_converter.h"
+#include "convert.h"
-
-#include "config.h"
 
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false
 
-bool
+static bool
 convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {
     switch (from) {
         MAP(SDL_KEYDOWN, AKEY_EVENT_ACTION_DOWN);
@@ -33,7 +31,8 @@ autocomplete_metastate(enum android_metastate metastate) {
     return metastate;
 }
 
-enum android_metastate
+
+static enum android_metastate
 convert_meta_state(SDL_Keymod mod) {
     enum android_metastate metastate = 0;
     if (mod & KMOD_LSHIFT) {
@@ -74,7 +73,7 @@ convert_meta_state(SDL_Keymod mod) {
     return autocomplete_metastate(metastate);
 }
 
-bool
+static bool
 convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
     switch (from) {
         MAP(SDLK_RETURN,       AKEYCODE_ENTER);
@@ -128,7 +127,16 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
     }
 }
 
-enum android_motionevent_buttons
+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;
     if (state & SDL_BUTTON_LMASK) {
@@ -140,30 +148,81 @@ convert_mouse_buttons(uint32_t state) {
     if (state & SDL_BUTTON_MMASK) {
         buttons |= AMOTION_EVENT_BUTTON_TERTIARY;
     }
-    if (state & SDL_BUTTON_X1MASK) {
+    if (state & SDL_BUTTON_X1) {
         buttons |= AMOTION_EVENT_BUTTON_BACK;
     }
-    if (state & SDL_BUTTON_X2MASK) {
+    if (state & SDL_BUTTON_X2) {
         buttons |= AMOTION_EVENT_BUTTON_FORWARD;
     }
     return buttons;
 }
 
 bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
+input_key_from_sdl_to_android(const SDL_KeyboardEvent *from,
-    switch (from) {
+                              struct control_msg *to) {
-        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
+    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
-        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
+
-        FAIL;
+    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
+        return false;
     }
+
+    uint16_t mod = from->keysym.mod;
+    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod)) {
+        return false;
+    }
+
+    to->inject_keycode.metastate = convert_meta_state(mod);
+
+    return true;
 }
 
 bool
-convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
+mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from,
-    switch (from) {
+                                 struct size screen_size,
-        MAP(SDL_FINGERMOTION, AMOTION_EVENT_ACTION_MOVE);
+                                 struct control_msg *to) {
-        MAP(SDL_FINGERDOWN,   AMOTION_EVENT_ACTION_DOWN);
+    to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
-        MAP(SDL_FINGERUP,     AMOTION_EVENT_ACTION_UP);
+
-        FAIL;
+    if (!convert_mouse_action(from->type, &to->inject_mouse_event.action)) {
+        return false;
     }
+
+    to->inject_mouse_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;
+}
+
+bool
+mouse_motion_from_sdl_to_android(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;
+
+    return true;
+}
+
+bool
+mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from,
+                                struct position position,
+                                struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
+
+    to->inject_scroll_event.position = position;
+
+    int mul = from->direction == SDL_MOUSEWHEEL_NORMAL ? 1 : -1;
+    // SDL behavior seems inconsistent between horizontal and vertical scrolling
+    // so reverse the horizontal
+    // <https://wiki.libsdl.org/SDL_MouseWheelEvent#Remarks>
+    to->inject_scroll_event.hscroll = -mul * from->x;
+    to->inject_scroll_event.vscroll = mul * from->y;
+
+    return true;
 }

app/src/convert.h

@@ -0,0 +1,41 @@
+#ifndef CONVERT_H
+#define CONVERT_H
+
+#include <stdbool.h>
+#include <SDL2/SDL_events.h>
+
+#include "control_msg.h"
+
+struct complete_mouse_motion_event {
+    SDL_MouseMotionEvent *mouse_motion_event;
+    struct size screen_size;
+};
+
+struct complete_mouse_wheel_event {
+    SDL_MouseWheelEvent *mouse_wheel_event;
+    struct point position;
+};
+
+bool
+input_key_from_sdl_to_android(const SDL_KeyboardEvent *from,
+                              struct control_msg *to);
+
+bool
+mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from,
+                                 struct size screen_size,
+                                 struct control_msg *to);
+
+// the video size may be different from the real device size, so we need the
+// size to which the absolute position apply, to scale it accordingly
+bool
+mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from,
+                                 struct size screen_size,
+                                 struct control_msg *to);
+
+// on Android, a scroll event requires the current mouse position
+bool
+mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from,
+                                struct position position,
+                                struct control_msg *to);
+
+#endif

app/src/decoder.c

@@ -8,8 +8,8 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "compat.h"
+#include "config.h"
 #include "buffer_util.h"
 #include "events.h"
 #include "lock_util.h"

app/src/decoder.h

@@ -4,8 +4,6 @@
 #include <stdbool.h>
 #include <libavformat/avformat.h>
 
-#include "config.h"
-
 struct video_buffer;
 
 struct decoder {

app/src/device.c

@@ -1,6 +1,4 @@
 #include "device.h"
-
-#include "config.h"
 #include "log.h"
 
 bool

app/src/device.h

@@ -3,7 +3,6 @@
 
 #include <stdbool.h>
 
-#include "config.h"
 #include "common.h"
 #include "net.h"
 

app/src/device_msg.c

@@ -3,7 +3,6 @@
 #include <string.h>
 #include <SDL2/SDL_assert.h>
 
-#include "config.h"
 #include "buffer_util.h"
 #include "log.h"
 

app/src/device_msg.h

@@ -5,8 +5,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #define DEVICE_MSG_TEXT_MAX_LENGTH 4093
 #define DEVICE_MSG_SERIALIZED_MAX_SIZE (3 + DEVICE_MSG_TEXT_MAX_LENGTH)
 

app/src/event_converter.h

@@ -1,28 +0,0 @@
-#ifndef CONVERT_H
-#define CONVERT_H
-
-#include <stdbool.h>
-#include <SDL2/SDL_events.h>
-
-#include "config.h"
-#include "control_msg.h"
-
-bool
-convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to);
-
-enum android_metastate
-convert_meta_state(SDL_Keymod mod);
-
-bool
-convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod);
-
-enum android_motionevent_buttons
-convert_mouse_buttons(uint32_t state);
-
-bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to);
-
-bool
-convert_touch_action(SDL_EventType from, enum android_motionevent_action *to);
-
-#endif

app/src/file_handler.h

@@ -5,7 +5,6 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
 #include "cbuf.h"
 #include "command.h"
 

app/src/fps_counter.c

@@ -3,7 +3,6 @@
 #include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_timer.h>
 
-#include "config.h"
 #include "lock_util.h"
 #include "log.h"
 

app/src/fps_counter.h

@@ -7,8 +7,6 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
-
 struct fps_counter {
     SDL_Thread *thread;
     SDL_mutex *mutex;

app/src/input_manager.c

@@ -1,9 +1,7 @@
 #include "input_manager.h"
 
 #include <SDL2/SDL_assert.h>
-
+#include "convert.h"
-#include "config.h"
-#include "event_converter.h"
 #include "lock_util.h"
 #include "log.h"
 
@@ -104,7 +102,7 @@ press_back_or_turn_screen_on(struct controller *controller) {
     msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
 
     if (!controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'press back or turn screen on'");
+        LOGW("Could not request 'turn screen on'");
     }
 }
 
@@ -212,7 +210,7 @@ clipboard_paste(struct controller *controller) {
 }
 
 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                  const SDL_TextInputEvent *event) {
     char c = event->text[0];
     if (isalpha(c) || c == ' ') {
@@ -227,32 +225,14 @@ input_manager_process_text_input(struct input_manager *im,
         LOGW("Could not strdup input text");
         return;
     }
-    if (!controller_push_msg(im->controller, &msg)) {
+    if (!controller_push_msg(input_manager->controller, &msg)) {
         SDL_free(msg.inject_text.text);
         LOGW("Could not request 'inject text'");
     }
 }
 
-static bool
-convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
-
-    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
-        return false;
-    }
-
-    uint16_t mod = from->keysym.mod;
-    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod)) {
-        return false;
-    }
-
-    to->inject_keycode.metastate = convert_meta_state(mod);
-
-    return true;
-}
-
 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                           const SDL_KeyboardEvent *event,
                           bool control) {
     // control: indicates the state of the command-line option --no-control
@@ -279,7 +259,7 @@ input_manager_process_key(struct input_manager *im,
         return;
     }
 
-    struct controller *controller = im->controller;
+    struct controller *controller = input_manager->controller;
 
     // capture all Ctrl events
     if (ctrl || cmd) {
@@ -354,23 +334,23 @@ input_manager_process_key(struct input_manager *im,
                 return;
             case SDLK_f:
                 if (!shift && cmd && !repeat && down) {
-                    screen_switch_fullscreen(im->screen);
+                    screen_switch_fullscreen(input_manager->screen);
                 }
                 return;
             case SDLK_x:
                 if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_fit(im->screen);
+                    screen_resize_to_fit(input_manager->screen);
                 }
                 return;
             case SDLK_g:
                 if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_pixel_perfect(im->screen);
+                    screen_resize_to_pixel_perfect(input_manager->screen);
                 }
                 return;
             case SDLK_i:
                 if (!shift && cmd && !repeat && down) {
                     struct fps_counter *fps_counter =
-                        im->video_buffer->fps_counter;
+                        input_manager->video_buffer->fps_counter;
                     switch_fps_counter_state(fps_counter);
                 }
                 return;
@@ -393,129 +373,56 @@ input_manager_process_key(struct input_manager *im,
     }
 
     struct control_msg msg;
-    if (convert_input_key(event, &msg)) {
+    if (input_key_from_sdl_to_android(event, &msg)) {
         if (!controller_push_msg(controller, &msg)) {
             LOGW("Could not request 'inject keycode'");
         }
     }
 }
 
-static bool
-convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    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->frame_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;
-}
-
 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                    const SDL_MouseMotionEvent *event) {
     if (!event->state) {
         // do not send motion events when no button is pressed
         return;
     }
-    if (event->which == SDL_TOUCH_MOUSEID) {
-        // simulated from touch events, so it's a duplicate
-        return;
-    }
     struct control_msg msg;
-    if (convert_mouse_motion(event, im->screen, &msg)) {
+    if (mouse_motion_from_sdl_to_android(event,
-        if (!controller_push_msg(im->controller, &msg)) {
+                                         input_manager->screen->frame_size,
+                                         &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse motion event'");
         }
     }
 }
 
 static bool
-convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
+is_outside_device_screen(struct input_manager *input_manager, int x, int y)
-              struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    struct size frame_size = screen->frame_size;
-
-    to->inject_touch_event.pointer_id = from->fingerId;
-    to->inject_touch_event.position.screen_size = frame_size;
-    // SDL touch event coordinates are normalized in the range [0; 1]
-    to->inject_touch_event.position.point.x = from->x * frame_size.width;
-    to->inject_touch_event.position.point.y = from->y * frame_size.height;
-    to->inject_touch_event.pressure = from->pressure;
-    to->inject_touch_event.buttons = 0;
-    return true;
-}
-
-void
-input_manager_process_touch(struct input_manager *im,
-                            const SDL_TouchFingerEvent *event) {
-    struct control_msg msg;
-    if (convert_touch(event, im->screen, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
-            LOGW("Could not request 'inject touch event'");
-        }
-    }
-}
-
-static bool
-is_outside_device_screen(struct input_manager *im, int x, int y)
 {
-    return x < 0 || x >= im->screen->frame_size.width ||
+    return x < 0 || x >= input_manager->screen->frame_size.width ||
-           y < 0 || y >= im->screen->frame_size.height;
+           y < 0 || y >= input_manager->screen->frame_size.height;
-}
-
-static bool
-convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
-    to->inject_touch_event.position.screen_size = screen->frame_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));
-
-    return true;
 }
 
 void
-input_manager_process_mouse_button(struct input_manager *im,
+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(im->controller);
+            press_back_or_turn_screen_on(input_manager->controller);
             return;
         }
         if (control && event->button == SDL_BUTTON_MIDDLE) {
-            action_home(im->controller, ACTION_DOWN | ACTION_UP);
+            action_home(input_manager->controller, ACTION_DOWN | ACTION_UP);
             return;
         }
         // double-click on black borders resize to fit the device screen
         if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
             bool outside =
-                is_outside_device_screen(im, event->x, event->y);
+                is_outside_device_screen(input_manager, event->x, event->y);
             if (outside) {
-                screen_resize_to_fit(im->screen);
+                screen_resize_to_fit(input_manager->screen);
                 return;
             }
         }
@@ -527,41 +434,25 @@ input_manager_process_mouse_button(struct input_manager *im,
     }
 
     struct control_msg msg;
-    if (convert_mouse_button(event, im->screen, &msg)) {
+    if (mouse_button_from_sdl_to_android(event,
-        if (!controller_push_msg(im->controller, &msg)) {
+                                         input_manager->screen->frame_size,
+                                         &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse button event'");
         }
     }
 }
 
-static bool
-convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
-                    struct control_msg *to) {
-    struct position position = {
-        .screen_size = screen->frame_size,
-        .point = get_mouse_point(screen),
-    };
-
-    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
-
-    to->inject_scroll_event.position = position;
-
-    int mul = from->direction == SDL_MOUSEWHEEL_NORMAL ? 1 : -1;
-    // SDL behavior seems inconsistent between horizontal and vertical scrolling
-    // so reverse the horizontal
-    // <https://wiki.libsdl.org/SDL_MouseWheelEvent#Remarks>
-    to->inject_scroll_event.hscroll = -mul * from->x;
-    to->inject_scroll_event.vscroll = mul * from->y;
-
-    return true;
-}
-
 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                   const SDL_MouseWheelEvent *event) {
+    struct position position = {
+        .screen_size = input_manager->screen->frame_size,
+        .point = get_mouse_point(input_manager->screen),
+    };
     struct control_msg msg;
-    if (convert_mouse_wheel(event, im->screen, &msg)) {
+    if (mouse_wheel_from_sdl_to_android(event, position, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse wheel event'");
         }
     }

app/src/input_manager.h

@@ -3,7 +3,6 @@
 
 #include <stdbool.h>
 
-#include "config.h"
 #include "common.h"
 #include "controller.h"
 #include "fps_counter.h"
@@ -17,29 +16,25 @@ struct input_manager {
 };
 
 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                  const SDL_TextInputEvent *event);
 
 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                           const SDL_KeyboardEvent *event,
                           bool control);
 
 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                    const SDL_MouseMotionEvent *event);
 
 void
-input_manager_process_touch(struct input_manager *im,
+input_manager_process_mouse_button(struct input_manager *input_manager,
-                            const SDL_TouchFingerEvent *event);
-
-void
-input_manager_process_mouse_button(struct input_manager *im,
                                    const SDL_MouseButtonEvent *event,
                                    bool control);
 
 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                   const SDL_MouseWheelEvent *event);
 
 #endif

app/src/lock_util.h

@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <SDL2/SDL_mutex.h>
 
-#include "config.h"
 #include "log.h"
 
 static inline void

app/src/main.c

@@ -8,8 +8,8 @@
 #define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
 #include <SDL2/SDL.h>
 
-#include "config.h"
 #include "compat.h"
+#include "config.h"
 #include "log.h"
 #include "recorder.h"
 
@@ -59,7 +59,7 @@ static void usage(const char *arg0) {
         "    -f, --fullscreen\n"
         "        Start in fullscreen.\n"
         "\n"
-        "    -F, --record-format format\n"
+        "    -F, --record-format\n"
         "        Force recording format (either mp4 or mkv).\n"
         "\n"
         "    -h, --help\n"
@@ -328,7 +328,7 @@ parse_args(struct args *args, int argc, char *argv[]) {
         {"push-target",           required_argument, NULL,
                                                  OPT_PUSH_TARGET},
         {"record",                required_argument, NULL, 'r'},
-        {"record-format",         required_argument, NULL, 'F'},
+        {"record-format",         required_argument, NULL, 'f'},
         {"render-expired-frames", no_argument,       NULL,
                                                  OPT_RENDER_EXPIRED_FRAMES},
         {"serial",                required_argument, NULL, 's'},

app/src/net.c

@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 
-#include "config.h"
 #include "log.h"
 
 #ifdef __WINDOWS__

app/src/net.h

@@ -17,8 +17,6 @@
   typedef int socket_t;
 #endif
 
-#include "config.h"
-
 bool
 net_init(void);
 

app/src/queue.h

@@ -6,8 +6,6 @@
 #include <stddef.h>
 #include <SDL2/SDL_assert.h>
 
-#include "config.h"
-
 // To define a queue type of "struct foo":
 //    struct queue_foo QUEUE(struct foo);
 #define QUEUE(TYPE) { \

app/src/receiver.h

@@ -5,7 +5,6 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
 #include "net.h"
 
 // receive events from the device

app/src/recorder.c

@@ -3,8 +3,8 @@
 #include <libavutil/time.h>
 #include <SDL2/SDL_assert.h>
 
-#include "config.h"
 #include "compat.h"
+#include "config.h"
 #include "lock_util.h"
 #include "log.h"
 
@@ -33,11 +33,6 @@ record_packet_new(const AVPacket *packet) {
     if (!rec) {
         return NULL;
     }
-
-    // av_packet_ref() does not initialize all fields in old FFmpeg versions
-    // See <https://github.com/Genymobile/scrcpy/issues/707>
-    av_init_packet(&rec->packet);
-
     if (av_packet_ref(&rec->packet, packet)) {
         SDL_free(rec);
         return NULL;
@@ -92,7 +87,6 @@ recorder_init(struct recorder *recorder,
     recorder->format = format;
     recorder->declared_frame_size = declared_frame_size;
     recorder->header_written = false;
-    recorder->previous = NULL;
 
     return true;
 }
@@ -135,9 +129,6 @@ 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);
@@ -228,22 +219,13 @@ recorder_rescale_packet(struct recorder *recorder, AVPacket *packet) {
 
 bool
 recorder_write(struct recorder *recorder, AVPacket *packet) {
+    SDL_assert(packet->pts != AV_NOPTS_VALUE);
     if (!recorder->header_written) {
-        if (packet->pts != AV_NOPTS_VALUE) {
-            LOGE("The first packet is not a config packet");
-            return false;
-        }
         bool ok = recorder_write_header(recorder, packet);
         if (!ok) {
             return false;
         }
         recorder->header_written = true;
-        return true;
-    }
-
-    if (packet->pts == AV_NOPTS_VALUE) {
-        // ignore config packets
-        return true;
     }
 
     recorder_rescale_packet(recorder, packet);
@@ -266,19 +248,6 @@ run_recorder(void *data) {
 
         if (recorder->stopped && queue_is_empty(&recorder->queue)) {
             mutex_unlock(recorder->mutex);
-            struct record_packet *last = recorder->previous;
-            if (last) {
-                // assign an arbitrary duration to the last packet
-                last->packet.duration = 100000;
-                bool ok = recorder_write(recorder, &last->packet);
-                if (!ok) {
-                    // failing to write the last frame is not very serious, no
-                    // future frame may depend on it, so the resulting file
-                    // will still be valid
-                    LOGW("Could not record last packet");
-                }
-                record_packet_delete(last);
-            }
             break;
         }
 
@@ -287,20 +256,8 @@ run_recorder(void *data) {
 
         mutex_unlock(recorder->mutex);
 
-        // recorder->previous is only written from this thread, no need to lock
+        bool ok = recorder_write(recorder, &rec->packet);
-        struct record_packet *previous = recorder->previous;
+        record_packet_delete(rec);
-        recorder->previous = rec;
-
-        if (!previous) {
-            // we just received the first packet
-            continue;
-        }
-
-        // we now know the duration of the previous packet
-        previous->packet.duration = rec->packet.pts - previous->packet.pts;
-
-        bool ok = recorder_write(recorder, &previous->packet);
-        record_packet_delete(previous);
         if (!ok) {
             LOGE("Could not record packet");
 

app/src/recorder.h

@@ -6,7 +6,6 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
 #include "common.h"
 #include "queue.h"
 
@@ -35,12 +34,6 @@ struct recorder {
     bool stopped; // set on recorder_stop() by the stream reader
     bool failed; // set on packet write failure
     struct recorder_queue queue;
-
-    // we can write a packet only once we received the next one so that we can
-    // set its duration (next_pts - current_pts)
-    // "previous" is only accessed from the recorder thread, so it does not
-    // need to be protected by the mutex
-    struct record_packet *previous;
 };
 
 bool

app/src/scrcpy.c

@@ -7,7 +7,6 @@
 #include <sys/time.h>
 #include <SDL2/SDL.h>
 
-#include "config.h"
 #include "command.h"
 #include "common.h"
 #include "compat.h"
@@ -145,10 +144,8 @@ handle_event(SDL_Event *event, bool control) {
         case SDL_WINDOWEVENT:
             switch (event->window.event) {
                 case SDL_WINDOWEVENT_EXPOSED:
-                    screen_render(&screen);
-                    break;
                 case SDL_WINDOWEVENT_SIZE_CHANGED:
-                    screen_window_resized(&screen);
+                    screen_render(&screen);
                     break;
             }
             break;
@@ -183,11 +180,6 @@ handle_event(SDL_Event *event, bool control) {
             input_manager_process_mouse_button(&input_manager, &event->button,
                                                control);
             break;
-        case SDL_FINGERMOTION:
-        case SDL_FINGERDOWN:
-        case SDL_FINGERUP:
-            input_manager_process_touch(&input_manager, &event->tfinger);
-            break;
         case SDL_DROPFILE: {
             if (!control) {
                 break;

app/src/scrcpy.h

@@ -5,8 +5,6 @@
 #include <stdint.h>
 #include <recorder.h>
 
-#include "config.h"
-
 struct scrcpy_options {
     const char *serial;
     const char *crop;

app/src/screen.c

@@ -3,7 +3,6 @@
 #include <string.h>
 #include <SDL2/SDL.h>
 
-#include "config.h"
 #include "common.h"
 #include "compat.h"
 #include "icon.xpm"
@@ -16,7 +15,7 @@
 
 // get the window size in a struct size
 static struct size
-get_window_size(SDL_Window *window) {
+get_native_window_size(SDL_Window *window) {
     int width;
     int height;
     SDL_GetWindowSize(window, &width, &height);
@@ -29,11 +28,11 @@ get_window_size(SDL_Window *window) {
 
 // get the windowed window size
 static struct size
-get_windowed_window_size(const struct screen *screen) {
+get_window_size(const struct screen *screen) {
     if (screen->fullscreen) {
         return screen->windowed_window_size;
     }
-    return get_window_size(screen->window);
+    return get_native_window_size(screen->window);
 }
 
 // set the window size to be applied when fullscreen is disabled
@@ -112,8 +111,8 @@ 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 windowed_size = get_windowed_window_size(screen);
+    struct size current_size = get_window_size(screen);
-    return get_optimal_size(windowed_size, frame_size);
+    return get_optimal_size(current_size, frame_size);
 }
 
 // initially, there is no current size, so use the frame size as current size
@@ -134,57 +133,16 @@ create_texture(SDL_Renderer *renderer, struct size frame_size) {
                              frame_size.width, frame_size.height);
 }
 
-#ifdef HIDPI_WORKAROUND
-static void
-screen_get_sizes(struct screen *screen, struct screen_sizes *out) {
-    int ww, wh, dw, dh;
-    SDL_GetWindowSize(screen->window, &ww, &wh);
-    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
-    out->window.width = ww;
-    out->window.height = wh;
-    out->window.width = dw;
-    out->window.height = dh;
-}
-#endif
-
-// This may be called more than once to work around SDL bugs
-static bool
-screen_init_renderer_and_texture(struct screen *screen) {
-    screen->renderer = SDL_CreateRenderer(screen->window, -1,
-                                          SDL_RENDERER_ACCELERATED);
-    if (!screen->renderer) {
-        LOGC("Could not create renderer: %s", SDL_GetError());
-        return false;
-    }
-
-    if (SDL_RenderSetLogicalSize(screen->renderer, screen->frame_size.width,
-                                 screen->frame_size.height)) {
-        LOGE("Could not set renderer logical size: %s", SDL_GetError());
-        return false;
-    }
-
-    screen->texture = create_texture(screen->renderer, screen->frame_size);
-    if (!screen->texture) {
-        LOGC("Could not create texture: %s", SDL_GetError());
-        return false;
-    }
-
-#ifdef HIDPI_WORKAROUND
-    screen_get_sizes(screen, &screen->sizes);
-#endif
-
-    return true;
-}
-
 bool
 screen_init_rendering(struct screen *screen, const char *window_title,
                       struct size frame_size, bool always_on_top) {
     screen->frame_size = frame_size;
 
     struct size window_size = get_initial_optimal_size(frame_size);
-    uint32_t window_flags = SDL_WINDOW_HIDDEN
+    uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE;
-                          | SDL_WINDOW_RESIZABLE
+#ifdef HIDPI_SUPPORT
-                          | SDL_WINDOW_ALLOW_HIGHDPI;
+    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+#endif
     if (always_on_top) {
 #ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
         window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
@@ -203,6 +161,21 @@ screen_init_rendering(struct screen *screen, const char *window_title,
         return false;
     }
 
+    screen->renderer = SDL_CreateRenderer(screen->window, -1,
+                                          SDL_RENDERER_ACCELERATED);
+    if (!screen->renderer) {
+        LOGC("Could not create renderer: %s", SDL_GetError());
+        screen_destroy(screen);
+        return false;
+    }
+
+    if (SDL_RenderSetLogicalSize(screen->renderer, frame_size.width,
+                                 frame_size.height)) {
+        LOGE("Could not set renderer logical size: %s", SDL_GetError());
+        screen_destroy(screen);
+        return false;
+    }
+
     SDL_Surface *icon = read_xpm(icon_xpm);
     if (icon) {
         SDL_SetWindowIcon(screen->window, icon);
@@ -213,7 +186,9 @@ screen_init_rendering(struct screen *screen, const char *window_title,
 
     LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width,
                                                   frame_size.height);
-    if (!screen_init_renderer_and_texture(screen)) {
+    screen->texture = create_texture(screen->renderer, frame_size);
+    if (!screen->texture) {
+        LOGC("Could not create texture: %s", SDL_GetError());
         screen_destroy(screen);
         return false;
     }
@@ -253,11 +228,11 @@ prepare_for_frame(struct screen *screen, struct size new_frame_size) {
         // frame dimension changed, destroy texture
         SDL_DestroyTexture(screen->texture);
 
-        struct size windowed_size = get_windowed_window_size(screen);
+        struct size current_size = get_window_size(screen);
         struct size target_size = {
-            (uint32_t) windowed_size.width * new_frame_size.width
+            (uint32_t) current_size.width * new_frame_size.width
                     / screen->frame_size.width,
-            (uint32_t) windowed_size.height * new_frame_size.height
+            (uint32_t) current_size.height * new_frame_size.height
                     / screen->frame_size.height,
         };
         target_size = get_optimal_size(target_size, new_frame_size);
@@ -302,43 +277,6 @@ screen_update_frame(struct screen *screen, struct video_buffer *vb) {
     return true;
 }
 
-#ifdef HIDPI_WORKAROUND
-// workaround for <https://github.com/Genymobile/scrcpy/issues/15>
-static inline bool
-screen_fix_hidpi(struct screen *screen) {
-    struct screen_sizes cur;
-    screen_get_sizes(screen, &cur);
-
-    struct screen_sizes *prev = &screen->sizes;
-
-    bool width_ratio_changed = cur.window.width * prev->drawable.width !=
-                               cur.drawable.width * prev->window.width;
-    bool height_ratio_changed = cur.window.height * prev->drawable.height !=
-                                cur.drawable.height * prev->window.height;
-    if (width_ratio_changed || height_ratio_changed) {
-        SDL_DestroyTexture(screen->texture);
-        SDL_DestroyRenderer(screen->renderer);
-        if (!screen_init_renderer_and_texture(screen)) {
-            screen->texture = NULL;
-            screen->renderer = NULL;
-            return false;
-        }
-
-        LOGI("Renderer reset after hidpi scaling changed");
-    }
-
-    return true;
-}
-#endif
-
-void
-screen_window_resized(struct screen *screen) {
-#ifdef HIDPI_WORKAROUND
-    screen_fix_hidpi(screen);
-#endif
-    screen_render(screen);
-}
-
 void
 screen_render(struct screen *screen) {
     SDL_RenderClear(screen->renderer);
@@ -350,7 +288,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_window_size(screen->window);
+        screen->windowed_window_size = get_native_window_size(screen->window);
     }
     uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
     if (SDL_SetWindowFullscreen(screen->window, new_mode)) {

app/src/screen.h

@@ -5,7 +5,6 @@
 #include <SDL2/SDL.h>
 #include <libavformat/avformat.h>
 
-#include "config.h"
 #include "common.h"
 
 struct video_buffer;
@@ -20,12 +19,6 @@ struct screen {
     bool has_frame;
     bool fullscreen;
     bool no_window;
-#ifdef HIDPI_WORKAROUND
-    struct screen_sizes {
-        struct size window;
-        struct size drawable;
-    } sizes;
-#endif
 };
 
 #define SCREEN_INITIALIZER {  \
@@ -66,10 +59,6 @@ screen_destroy(struct screen *screen);
 bool
 screen_update_frame(struct screen *screen, struct video_buffer *vb);
 
-// update content after window resizing
-void
-screen_window_resized(struct screen *screen);
-
 // render the texture to the renderer
 void
 screen_render(struct screen *screen);

app/src/server.c

@@ -13,7 +13,7 @@
 #include "net.h"
 
 #define SOCKET_NAME "scrcpy"
-#define SERVER_FILENAME "scrcpy-server"
+#define SERVER_FILENAME "scrcpy-server.jar"
 
 #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 in the same directory as the executable
+    // use scrcpy-server.jar in the same directory as the executable
     char *executable_path = get_executable_path();
     if (!executable_path) {
         LOGE("Could not get executable path, "
@@ -124,11 +124,6 @@ execute_server(struct server *server, const struct server_params *params) {
         "shell",
         "CLASSPATH=/data/local/tmp/" SERVER_FILENAME,
         "app_process",
-#ifdef SERVER_DEBUGGER
-# define SERVER_DEBUGGER_PORT "5005"
-        "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
-            SERVER_DEBUGGER_PORT,
-#endif
         "/", // unused
         "com.genymobile.scrcpy.Server",
         max_size_string,
@@ -138,17 +133,6 @@ execute_server(struct server *server, const struct server_params *params) {
         "true", // always send frame meta (packet boundaries + timestamp)
         params->control ? "true" : "false",
     };
-#ifdef SERVER_DEBUGGER
-    LOGI("Server debugger waiting for a client on device port "
-         SERVER_DEBUGGER_PORT "...");
-    // From the computer, run
-    //     adb forward tcp:5005 tcp:5005
-    // Then, from Android Studio: Run > Debug > Edit configurations...
-    // On the left, click on '+', "Remote", with:
-    //     Host: localhost
-    //     Port: 5005
-    // Then click on "Debug"
-#endif
     return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
 }
 

app/src/server.h

@@ -4,7 +4,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "config.h"
 #include "command.h"
 #include "net.h"
 

app/src/str_util.c

@@ -10,8 +10,6 @@
 
 #include <SDL2/SDL_stdinc.h>
 
-#include "config.h"
-
 size_t
 xstrncpy(char *dest, const char *src, size_t n) {
     size_t i;

app/src/str_util.h

@@ -3,8 +3,6 @@
 
 #include <stddef.h>
 
-#include "config.h"
-
 // like strncpy, except:
 //  - it copies at most n-1 chars
 //  - the dest string is nul-terminated

app/src/stream.c

@@ -8,8 +8,8 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "compat.h"
+#include "config.h"
 #include "buffer_util.h"
 #include "decoder.h"
 #include "events.h"
@@ -69,15 +69,6 @@ notify_stopped(void) {
     SDL_PushEvent(&stop_event);
 }
 
-static bool
-process_config_packet(struct stream *stream, AVPacket *packet) {
-    if (stream->recorder && !recorder_push(stream->recorder, packet)) {
-        LOGE("Could not send config packet to recorder");
-        return false;
-    }
-    return true;
-}
-
 static bool
 process_frame(struct stream *stream, AVPacket *packet) {
     if (stream->decoder && !decoder_push(stream->decoder, packet)) {
@@ -157,13 +148,7 @@ stream_push_packet(struct stream *stream, AVPacket *packet) {
         }
     }
 
-    if (is_config) {
+    if (!is_config) {
-        // config packet
-        bool ok = process_config_packet(stream, packet);
-        if (!ok) {
-            return false;
-        }
-    } else {
         // data packet
         bool ok = stream_parse(stream, packet);
 

app/src/stream.h

@@ -7,7 +7,6 @@
 #include <SDL2/SDL_atomic.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
 #include "net.h"
 
 struct video_buffer;

app/src/sys/unix/command.c

@@ -7,8 +7,6 @@
 
 #include "command.h"
 
-#include "config.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

app/src/sys/unix/net.c

@@ -2,8 +2,6 @@
 
 #include <unistd.h>
 
-#include "config.h"
-
 bool
 net_init(void) {
     // do nothing

app/src/sys/win/net.c

@@ -1,6 +1,5 @@
 #include "net.h"
 
-#include "config.h"
 #include "log.h"
 
 bool

app/src/tiny_xpm.c

@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
 #include "log.h"
 
 struct index {

app/src/tiny_xpm.h

@@ -3,8 +3,6 @@
 
 #include <SDL2/SDL.h>
 
-#include "config.h"
-
 SDL_Surface *
 read_xpm(char *xpm[]);
 

app/src/video_buffer.h

@@ -4,7 +4,6 @@
 #include <stdbool.h>
 #include <SDL2/SDL_mutex.h>
 
-#include "config.h"
 #include "fps_counter.h"
 
 // forward declarations

app/tests/test_control_msg_serialize.c

@@ -67,39 +67,35 @@ static void test_serialize_inject_text_long(void) {
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
 
-static void test_serialize_inject_touch_event(void) {
+static void test_serialize_inject_mouse_event(void) {
     struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
+        .type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
-        .inject_touch_event = {
+        .inject_mouse_event = {
             .action = AMOTION_EVENT_ACTION_DOWN,
-            .pointer_id = 0x1234567887654321L,
+            .buttons = AMOTION_EVENT_BUTTON_PRIMARY,
             .position = {
                 .point = {
-                    .x = 100,
+                    .x = 260,
-                    .y = 200,
+                    .y = 1026,
                 },
                 .screen_size = {
                     .width = 1080,
                     .height = 1920,
                 },
             },
-            .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 == 28);
+    assert(size == 18);
 
     const unsigned char expected[] = {
-        CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
+        CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
         0x00, // AKEY_EVENT_ACTION_DOWN
-        0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // pointer id
+        0x00, 0x00, 0x00, 0x01, // AMOTION_EVENT_BUTTON_PRIMARY
-        0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xc8, // 100 200
+        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
         0x04, 0x38, 0x07, 0x80, // 1080 1920
-        0xff, 0xff, // pressure
-        0x00, 0x00, 0x00, 0x01 // AMOTION_EVENT_BUTTON_PRIMARY
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -240,7 +236,7 @@ int main(void) {
     test_serialize_inject_keycode();
     test_serialize_inject_text();
     test_serialize_inject_text_long();
-    test_serialize_inject_touch_event();
+    test_serialize_inject_mouse_event();
     test_serialize_inject_scroll_event();
     test_serialize_back_or_screen_on();
     test_serialize_expand_notification_panel();

meson_options.txt

@@ -3,6 +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 from the same directory as the scrcpy executable')
+option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server.jar from the same directory as the scrcpy executable')
-option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
+option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support')
-option('hidpi_workaround', type: 'boolean', value: true, description: 'Enable a workaround for bug #15')

release.sh

@@ -23,21 +23,21 @@ cd -
 make -f Makefile.CrossWindows
 
 # the generated server must be the same everywhere
-cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win32/scrcpy-server
+cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win32/scrcpy-server.jar
-cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win64/scrcpy-server
+cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win64/scrcpy-server.jar
 
 # get version name
 TAG=$(git describe --tags --always)
 
 # create release directory
 mkdir -p "release-$TAG"
-cp "$BUILDDIR/server/scrcpy-server" "release-$TAG/scrcpy-server-$TAG"
+cp "$BUILDDIR/server/scrcpy-server.jar" "release-$TAG/scrcpy-server-$TAG.jar"
 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" \
+sha256sum "scrcpy-server-$TAG.jar" \
           "scrcpy-win32-$TAG.zip" \
           "scrcpy-win64-$TAG.zip" > SHA256SUMS.txt
 

run

@@ -20,4 +20,4 @@ then
     exit 1
 fi
 
-SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" "$BUILDDIR/app/scrcpy" "$@"
+SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server.jar" "$BUILDDIR/app/scrcpy" "$@"

scripts/run-scrcpy.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server" "$MESON_BUILD_ROOT/app/scrcpy"
+SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server.jar" "$MESON_BUILD_ROOT/app/scrcpy"

server/build_without_gradle.sh

@@ -1,62 +0,0 @@
-#!/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"

server/meson.build

@@ -4,9 +4,8 @@ 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',
+                  output: 'scrcpy-server.jar',
                   command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
-                  console: true,
                   install: true,
                   install_dir: 'share/scrcpy')
 else
@@ -16,7 +15,7 @@ else
     endif
     custom_target('scrcpy-server-prebuilt',
                   input: prebuilt_server,
-                  output: 'scrcpy-server',
+                  output: 'scrcpy-server.jar',
                   command: ['cp', '@INPUT@', '@OUTPUT@'],
                   install: true,
                   install_dir: 'share/scrcpy')

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

@@ -7,7 +7,7 @@ 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_TOUCH_EVENT = 2;
+    public static final int TYPE_INJECT_MOUSE_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;
@@ -22,8 +22,6 @@ 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 pointerId;
-    private float pressure;
     private Position position;
     private int hScroll;
     private int vScroll;
@@ -32,63 +30,60 @@ public final class ControlMessage {
     }
 
     public static ControlMessage createInjectKeycode(int action, int keycode, int metaState) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = TYPE_INJECT_KEYCODE;
+        event.type = TYPE_INJECT_KEYCODE;
-        msg.action = action;
+        event.action = action;
-        msg.keycode = keycode;
+        event.keycode = keycode;
-        msg.metaState = metaState;
+        event.metaState = metaState;
-        return msg;
+        return event;
     }
 
     public static ControlMessage createInjectText(String text) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = TYPE_INJECT_TEXT;
+        event.type = TYPE_INJECT_TEXT;
-        msg.text = text;
+        event.text = text;
-        return msg;
+        return event;
     }
 
-    public static ControlMessage createInjectTouchEvent(int action, long pointerId, Position position, float pressure,
+    public static ControlMessage createInjectMouseEvent(int action, int buttons, Position position) {
-            int buttons) {
+        ControlMessage event = new ControlMessage();
-        ControlMessage msg = new ControlMessage();
+        event.type = TYPE_INJECT_MOUSE_EVENT;
-        msg.type = TYPE_INJECT_TOUCH_EVENT;
+        event.action = action;
-        msg.action = action;
+        event.buttons = buttons;
-        msg.pointerId = pointerId;
+        event.position = position;
-        msg.pressure = pressure;
+        return event;
-        msg.position = position;
-        msg.buttons = buttons;
-        return msg;
     }
 
     public static ControlMessage createInjectScrollEvent(Position position, int hScroll, int vScroll) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = TYPE_INJECT_SCROLL_EVENT;
+        event.type = TYPE_INJECT_SCROLL_EVENT;
-        msg.position = position;
+        event.position = position;
-        msg.hScroll = hScroll;
+        event.hScroll = hScroll;
-        msg.vScroll = vScroll;
+        event.vScroll = vScroll;
-        return msg;
+        return event;
     }
 
     public static ControlMessage createSetClipboard(String text) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = TYPE_SET_CLIPBOARD;
+        event.type = TYPE_SET_CLIPBOARD;
-        msg.text = text;
+        event.text = text;
-        return msg;
+        return event;
     }
 
     /**
      * @param mode one of the {@code Device.SCREEN_POWER_MODE_*} constants
      */
     public static ControlMessage createSetScreenPowerMode(int mode) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = TYPE_SET_SCREEN_POWER_MODE;
+        event.type = TYPE_SET_SCREEN_POWER_MODE;
-        msg.action = mode;
+        event.action = mode;
-        return msg;
+        return event;
     }
 
     public static ControlMessage createEmpty(int type) {
-        ControlMessage msg = new ControlMessage();
+        ControlMessage event = new ControlMessage();
-        msg.type = type;
+        event.type = type;
-        return msg;
+        return event;
     }
 
     public int getType() {
@@ -115,14 +110,6 @@ public final class ControlMessage {
         return buttons;
     }
 
-    public long getPointerId() {
-        return pointerId;
-    }
-
-    public float getPressure() {
-        return pressure;
-    }
-
     public Position getPosition() {
         return position;
     }

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

@@ -10,7 +10,6 @@ public class ControlMessageReader {
 
     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;
 
@@ -60,8 +59,8 @@ public class ControlMessageReader {
             case ControlMessage.TYPE_INJECT_TEXT:
                 msg = parseInjectText();
                 break;
-            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
+            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                msg = parseInjectTouchEvent();
+                msg = parseInjectMouseEvent();
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                 msg = parseInjectScrollEvent();
@@ -121,20 +120,14 @@ public class ControlMessageReader {
         return ControlMessage.createInjectText(text);
     }
 
-    @SuppressWarnings("checkstyle:MagicNumber")
+    private ControlMessage parseInjectMouseEvent() {
-    private ControlMessage parseInjectTouchEvent() {
+        if (buffer.remaining() < INJECT_MOUSE_EVENT_PAYLOAD_LENGTH) {
-        if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
             return null;
         }
         int action = toUnsigned(buffer.get());
-        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);
         int buttons = buffer.getInt();
-        return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, buttons);
+        Position position = readPosition(buffer);
+        return ControlMessage.createInjectMouseEvent(action, buttons, position);
     }
 
     private ControlMessage parseInjectScrollEvent() {

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

@@ -19,32 +19,38 @@ public class Controller {
 
     private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
 
-    private long lastTouchDown;
+    private long lastMouseDown;
-    private final PointersState pointersState = new PointersState();
+    private final MotionEvent.PointerProperties[] pointerProperties = {new MotionEvent.PointerProperties()};
-    private final MotionEvent.PointerProperties[] pointerProperties =
+    private final MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()};
-            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;
-        initPointers();
+        initPointer();
         sender = new DeviceMessageSender(connection);
     }
 
-    private void initPointers() {
+    private void initPointer() {
-        for (int i = 0; i < PointersState.MAX_POINTERS; ++i) {
+        MotionEvent.PointerProperties props = pointerProperties[0];
-            MotionEvent.PointerProperties props = new MotionEvent.PointerProperties();
+        props.id = 0;
-            props.toolType = MotionEvent.TOOL_TYPE_FINGER;
+        props.toolType = MotionEvent.TOOL_TYPE_FINGER;
 
-            MotionEvent.PointerCoords coords = new MotionEvent.PointerCoords();
+        MotionEvent.PointerCoords coords = pointerCoords[0];
-            coords.orientation = 0;
+        coords.orientation = 0;
-            coords.size = 1;
+        coords.pressure = 1;
+        coords.size = 1;
+    }
 
-            pointerProperties[i] = props;
+    private void setPointerCoords(Point point) {
-            pointerCoords[i] = coords;
+        MotionEvent.PointerCoords coords = pointerCoords[0];
-        }
+        coords.x = point.getX();
+        coords.y = point.getY();
+    }
+
+    private void setScroll(int hScroll, int vScroll) {
+        MotionEvent.PointerCoords coords = pointerCoords[0];
+        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
+        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
     }
 
     @SuppressWarnings("checkstyle:MagicNumber")
@@ -81,8 +87,8 @@ public class Controller {
             case ControlMessage.TYPE_INJECT_TEXT:
                 injectText(msg.getText());
                 break;
-            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
+            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
+                injectMouse(msg.getAction(), msg.getButtons(), msg.getPosition());
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                 injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
@@ -142,42 +148,19 @@ public class Controller {
         return successCount;
     }
 
-    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int buttons) {
+    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;
         }
-
+        setPointerCoords(point);
-        int pointerIndex = pointersState.getPointerIndex(pointerId);
+        MotionEvent event = MotionEvent.obtain(lastMouseDown, now, action, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, 0, 0,
-        if (pointerIndex == -1) {
+                InputDevice.SOURCE_TOUCHSCREEN, 0);
-            Ln.w("Too many pointers for touch event");
-            return false;
-        }
-        Pointer pointer = pointersState.get(pointerIndex);
-        pointer.setPoint(point);
-        pointer.setPressure(pressure);
-        pointer.setUp(action == MotionEvent.ACTION_UP);
-
-        int pointerCount = pointersState.update(pointerProperties, pointerCoords);
-
-        if (pointerCount == 1) {
-            if (action == MotionEvent.ACTION_DOWN) {
-                lastTouchDown = now;
-            }
-        } else {
-            // secondary pointers must use ACTION_POINTER_* ORed with the pointerIndex
-            if (action == MotionEvent.ACTION_UP) {
-                action = MotionEvent.ACTION_POINTER_UP | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
-            } else if (action == MotionEvent.ACTION_DOWN) {
-                action = MotionEvent.ACTION_POINTER_DOWN | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
-            }
-        }
-
-        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties,
-                pointerCoords, 0, buttons, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
         return injectEvent(event);
     }
 
@@ -188,30 +171,23 @@ public class Controller {
             // ignore event
             return false;
         }
-
+        setPointerCoords(point);
-        MotionEvent.PointerProperties props = pointerProperties[0];
+        setScroll(hScroll, vScroll);
-        props.id = 0;
+        MotionEvent event = MotionEvent.obtain(lastMouseDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, 0,
-
+                0, InputDevice.SOURCE_MOUSE, 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,
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                0, 0, InputDevice.SOURCE_KEYBOARD);
+                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) {

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

@@ -161,11 +161,7 @@ public final class Device {
      * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
      */
     public void setScreenPowerMode(int mode) {
-        IBinder d = SurfaceControl.getBuiltInDisplay();
+        IBinder d = SurfaceControl.getBuiltInDisplay(0);
-        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"));
     }

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

@@ -1,55 +0,0 @@
-package com.genymobile.scrcpy;
-
-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 Pointer(long id, int localId) {
-        this.id = id;
-        this.localId = localId;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public int getLocalId() {
-        return localId;
-    }
-
-    public Point getPoint() {
-        return point;
-    }
-
-    public void setPoint(Point point) {
-        this.point = point;
-    }
-
-    public float getPressure() {
-        return pressure;
-    }
-
-    public void setPressure(float pressure) {
-        this.pressure = pressure;
-    }
-
-    public boolean isUp() {
-        return up;
-    }
-
-    public void setUp(boolean up) {
-        this.up = up;
-    }
-}

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

@@ -1,103 +0,0 @@
-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);
-            }
-        }
-    }
-}

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";
+    private static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
 
     private Server() {
         // not instantiable

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

@@ -1,102 +1,44 @@
 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 Method getPrimaryClipMethod;
+    private final Method getPrimaryClipMethod;
-    private Method setPrimaryClipMethod;
+    private final Method setPrimaryClipMethod;
 
     public ClipboardManager(IInterface manager) {
         this.manager = manager;
-    }
+        try {
-
+            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
-    private Method getGetPrimaryClipMethod() {
+            setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
-        if (getPrimaryClipMethod == null) {
+        } catch (NoSuchMethodException e) {
-            try {
+            throw new AssertionError(e);
-                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 = getPrimaryClip(method, manager);
+            ClipData clipData = (ClipData) getPrimaryClipMethod.invoke(manager, "com.android.shell");
             if (clipData == null || clipData.getItemCount() == 0) {
                 return null;
             }
             return clipData.getItemAt(0).getText();
         } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke " + method.getName(), e);
+            throw new AssertionError(e);
-            return null;
         }
     }
 
     public void setText(CharSequence text) {
-        Method method = getSetPrimaryClipMethod();
-        if (method == null) {
-            return;
-        }
         ClipData clipData = ClipData.newPlainText(null, text);
         try {
-            setPrimaryClip(method, manager, clipData);
+            setPrimaryClipMethod.invoke(manager, clipData, "com.android.shell");
         } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke " + method.getName(), e);
+            throw new AssertionError(e);
         }
     }
 }

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

@@ -1,7 +1,5 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
-
 import android.os.IInterface;
 import android.view.InputEvent;
 
@@ -15,33 +13,22 @@ public final class InputManager {
     public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = 2;
 
     private final IInterface manager;
-    private Method injectInputEventMethod;
+    private final Method injectInputEventMethod;
 
     public InputManager(IInterface manager) {
         this.manager = manager;
-    }
+        try {
-
+            injectInputEventMethod = manager.getClass().getMethod("injectInputEvent", InputEvent.class, int.class);
-    private Method getInjectInputEventMethod() {
+        } catch (NoSuchMethodException e) {
-        if (injectInputEventMethod == null) {
+            throw new AssertionError(e);
-            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) method.invoke(manager, inputEvent, mode);
+            return (Boolean) injectInputEventMethod.invoke(manager, inputEvent, mode);
         } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke " + method.getName(), e);
+            throw new AssertionError(e);
-            return false;
         }
     }
 }

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

@@ -1,7 +1,5 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
-
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.IInterface;
@@ -11,35 +9,24 @@ import java.lang.reflect.Method;
 
 public final class PowerManager {
     private final IInterface manager;
-    private Method isScreenOnMethod;
+    private final Method isScreenOnMethod;
 
     public PowerManager(IInterface manager) {
         this.manager = manager;
-    }
+        try {
-
+            @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
-    private Method getIsScreenOnMethod() {
+            String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
-        if (isScreenOnMethod == null) {
+            isScreenOnMethod = manager.getClass().getMethod(methodName);
-            try {
+        } catch (NoSuchMethodException e) {
-                @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
+            throw new AssertionError(e);
-                        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) method.invoke(manager);
+            return (Boolean) isScreenOnMethod.invoke(manager);
         } catch (InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Could not invoke " + method.getName(), e);
+            throw new AssertionError(e);
-            return false;
         }
     }
 }

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

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

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

@@ -1,16 +1,11 @@
 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 {
 
@@ -28,9 +23,6 @@ public final class SurfaceControl {
         }
     }
 
-    private static Method getBuiltInDisplayMethod;
-    private static Method setDisplayPowerModeMethod;
-
     private SurfaceControl() {
         // only static methods
     }
@@ -84,62 +76,24 @@ public final class SurfaceControl {
         }
     }
 
-    private static Method getGetBuiltInDisplayMethod() {
+    public static IBinder getBuiltInDisplay(int builtInDisplayId) {
-        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 getBuiltInDisplayMethod;
-    }
-
-    public static IBinder getBuiltInDisplay() {
-        Method method = getGetBuiltInDisplayMethod();
-        if (method == null) {
-            return 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) {
-                // call getBuiltInDisplay(0)
+                return (IBinder) CLASS.getMethod("getBuiltInDisplay", int.class).invoke(null, builtInDisplayId);
-                return (IBinder) method.invoke(null, 0);
             }
-
+            return (IBinder) CLASS.getMethod("getPhysicalDisplayToken", long.class).invoke(null, builtInDisplayId);
-            // call getInternalDisplayToken()
+        } catch (Exception e) {
-            return (IBinder) method.invoke(null);
+            throw new AssertionError(e);
-        } 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 {
-            method.invoke(null, displayToken, mode);
+            CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class).invoke(null, displayToken, mode);
-        } catch (InvocationTargetException | IllegalAccessException e) {
+        } catch (Exception e) {
-            Ln.e("Could not invoke " + method.getName(), e);
+            throw new AssertionError(e);
         }
     }
 

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

@@ -14,7 +14,7 @@ public final class WindowManager {
         try {
             Class<?> cls = manager.getClass();
             try {
-                return (Integer) cls.getMethod("getRotation").invoke(manager);
+                return (Integer) manager.getClass().getMethod("getRotation").invoke(manager);
             } catch (NoSuchMethodException e) {
                 // method changed since this commit:
                 // https://android.googlesource.com/platform/frameworks/base/+/8ee7285128c3843401d4c4d0412cd66e86ba49e3%5E%21/#F2

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

@@ -77,36 +77,24 @@ public class ControlMessageReaderTest {
     }
 
     @Test
-    @SuppressWarnings("checkstyle:MagicNumber")
+    public void testParseMouseEvent() throws IOException {
-    public void testParseTouchEvent() throws IOException {
         ControlMessageReader reader = new ControlMessageReader();
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_INJECT_TOUCH_EVENT);
+        dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
         dos.writeByte(MotionEvent.ACTION_DOWN);
-        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);
-
+        dos.writeInt(KeyEvent.META_CTRL_ON);
         byte[] packet = bos.toByteArray();
 
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 
-        Assert.assertEquals(ControlMessage.TYPE_INJECT_TOUCH_EVENT, event.getType());
+        Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
-        Assert.assertEquals(-42, event.getPointerId());
+        Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
-        Assert.assertEquals(100, event.getPosition().getPoint().getX());
+        Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
-        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