Update BUILD.md

Update the macOS section.

PR #1559 <https://github.com/Genymobile/scrcpy/pull/1559>

Signed-off-by: Romain Vimont <rom@rom1v.com>

.gitignore

@@ -1,8 +1,5 @@
 build/
 /dist/
-/build-*/
-/build_*/
-/release-*/
 .idea/
 .gradle/
 /x/

BUILD.md

@@ -176,8 +176,8 @@ Additionally, if you want to build the server, install Java 8 from Caskroom, and
 make it avaliable from the `PATH`:
 
 ```bash
-brew tap caskroom/versions
+brew tap homebrew/cask-versions
-brew cask install java8
+brew cask install adoptopenjdk/openjdk/adoptopenjdk8
 export JAVA_HOME="$(/usr/libexec/java_home --version 1.8)"
 export PATH="$JAVA_HOME/bin:$PATH"
 ```
@@ -190,12 +190,17 @@ See [pierlon/scrcpy-docker](https://github.com/pierlon/scrcpy-docker).
 ## Common steps
 
 If you want to build the server, install the [Android SDK] (_Android Studio_),
-and set `ANDROID_HOME` to its directory. For example:
+and set `ANDROID_SDK_ROOT` to its directory. For example:
 
 [Android SDK]: https://developer.android.com/studio/index.html
 
 ```bash
-export ANDROID_HOME=~/android/sdk
+# Linux
+export ANDROID_SDK_ROOT=~/Android/Sdk
+# Mac
+export ANDROID_SDK_ROOT=~/Library/Android/sdk
+# Windows
+set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdk
 ```
 
 If you don't want to build the server, use the [prebuilt server].

README.md

@@ -49,6 +49,11 @@ A [Snap] package is available: [`scrcpy`][snap-link].
 
 [snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager)
 
+For Fedora, a [COPR] package is available: [`scrcpy`][copr-link].
+
+[COPR]: https://fedoraproject.org/wiki/Category:Copr
+[copr-link]: https://copr.fedorainfracloud.org/coprs/zeno/scrcpy/
+
 For Arch Linux, an [AUR] package is available: [`scrcpy`][aur-link].
 
 [AUR]: https://wiki.archlinux.org/index.php/Arch_User_Repository
@@ -301,7 +306,7 @@ ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer
 From another terminal:
 
 ```bash
-scrcpy --force-adb-forwrad
+scrcpy --force-adb-forward
 ```
 
 
@@ -354,7 +359,7 @@ scrcpy --fullscreen
 scrcpy -f  # short version
 ```
 
-Fullscreen can then be toggled dynamically with `MOD`+`f`.
+Fullscreen can then be toggled dynamically with `Ctrl`+`f`.
 
 #### Rotation
 
@@ -370,17 +375,17 @@ Possibles values are:
  - `2`: 180 degrees
  - `3`: 90 degrees clockwise
 
-The rotation can also be changed dynamically with `MOD`+`←` _(left)_ and
+The rotation can also be changed dynamically with `Ctrl`+`←` _(left)_ and
-`MOD`+`→` _(right)_.
+`Ctrl`+`→` _(right)_.
 
 Note that _scrcpy_ manages 3 different rotations:
- - `MOD`+`r` requests the device to switch between portrait and landscape (the
+ - `Ctrl`+`r` requests the device to switch between portrait and landscape (the
    current running app may refuse, if it does support the requested
    orientation).
  - `--lock-video-orientation` changes the mirroring orientation (the orientation
    of the video sent from the device to the computer). This affects the
    recording.
- - `--rotation` (or `MOD`+`←`/`MOD`+`→`) rotates only the window content. This
+ - `--rotation` (or `Ctrl`+`←`/`Ctrl`+`→`) rotates only the window content. This
    affects only the display, not the recording.
 
 
@@ -437,11 +442,11 @@ scrcpy --turn-screen-off
 scrcpy -S
 ```
 
-Or by pressing `MOD`+`o` at any time.
+Or by pressing `Ctrl`+`o` at any time.
 
-To turn it back on, press `MOD`+`Shift`+`o` (or `POWER`, `MOD`+`p`).
+To turn it back on, press `Ctrl`+`Shift`+`o` (or `POWER`, `Ctrl`+`p`).
 
-It can be useful to also prevent the device to sleep:
+It can also be useful to prevent the device from sleeping:
 
 ```bash
 scrcpy --turn-screen-off --stay-awake
@@ -479,57 +484,28 @@ scrcpy -t
 Note that it only shows _physical_ touches (with the finger on the device).
 
 
-#### Disable screensaver
-
-By default, scrcpy does not prevent the screensaver to run on the computer.
-
-To disable it:
-
-```bash
-scrcpy --disable-screensaver
-```
-
-
 ### Input control
 
 #### Rotate device screen
 
-Press `MOD`+`r` to switch between portrait and landscape modes.
+Press `Ctrl`+`r` to switch between portrait and landscape modes.
 
 Note that it rotates only if the application in foreground supports the
 requested orientation.
 
 #### Copy-paste
 
-Any time the Android clipboard changes, it is automatically synchronized to the
+It is possible to synchronize clipboards between the computer and the device, in
-computer clipboard.
+both directions:
 
-Any `Ctrl` shortcut is forwarded to the device. In particular:
+ - `Ctrl`+`c` copies the device clipboard to the computer clipboard;
- - `Ctrl`+`c` typically copies
+ - `Ctrl`+`Shift`+`v` copies the computer clipboard to the device clipboard (and
- - `Ctrl`+`x` typically cuts
+   pastes if the device runs Android >= 7);
- - `Ctrl`+`v` typically pastes (after computer-to-device clipboard
+ - `Ctrl`+`v` _pastes_ the computer clipboard as a sequence of text events (but
-   synchronization)
+   breaks non-ASCII characters).
 
-This typically works as you expect.
+Moreover, any time the Android clipboard changes, it is automatically
-
+synchronized to the computer clipboard.
-The actual behavior depends on the active application though. For example,
-_Termux_ sends SIGINT on `Ctrl`+`c` instead, and _K-9 Mail_ composes a new
-message.
-
-To copy, cut and paste in all cases (but only supported on Android >= 7):
- - `MOD`+`c` injects `COPY`
- - `MOD`+`x` injects `CUT`
- - `MOD`+`v` injects `PASTE` (after computer-to-device clipboard
-   synchronization)
-
-In addition, `MOD`+`Shift`+`v` allows to inject the computer clipboard text as a
-sequence of key events. This is useful when the component does not accept text
-pasting (for example in _Termux_), but it can break non-ASCII content.
-
-*WARNING:* Pasting the computer clipboard to the device (either via `Ctrl`+`v`
-or `MOD`+`v`) copies the content in the device clipboard. As a consequence, any
-Android application could read its content. You should avoid to paste sensitive
-content (like passwords) that way.
 
 #### Text injection preference
 
@@ -579,62 +555,43 @@ scrcpy --push-target /sdcard/foo/bar/
 
 ### Audio forwarding
 
-Audio is not forwarded by _scrcpy_. Use [USBaudio] (Linux-only).
+Audio is not forwarded by _scrcpy_. Use [sndcpy].
 
 Also see [issue #14].
 
-[USBaudio]: https://github.com/rom1v/usbaudio
+[sndcpy]: https://github.com/rom1v/sndcpy
 [issue #14]: https://github.com/Genymobile/scrcpy/issues/14
 
 
 ## Shortcuts
 
-In the following list, `MOD` is the shortcut modifier. By default, it's (left)
+ | Action                                      |   Shortcut                    |   Shortcut (macOS)
-`Alt` or (left) `Cmd`.
+ | ------------------------------------------- |:----------------------------- |:-----------------------------
-
+ | Switch fullscreen mode                      | `Ctrl`+`f`                    | `Cmd`+`f`
-It can be changed using `--shortcut-mod`. Possible keys are `lctrl`, `rctrl`,
+ | Rotate display left                         | `Ctrl`+`←` _(left)_           | `Cmd`+`←` _(left)_
-`lalt`, `ralt`, `lcmd` and `rcmd`. For example:
+ | Rotate display right                        | `Ctrl`+`→` _(right)_          | `Cmd`+`→` _(right)_
-
+ | Resize window to 1:1 (pixel-perfect)        | `Ctrl`+`g`                    | `Cmd`+`g`
-```bash
+ | Resize window to remove black borders       | `Ctrl`+`x` \| _Double-click¹_ | `Cmd`+`x`  \| _Double-click¹_
-# use RCtrl for shortcuts
+ | Click on `HOME`                             | `Ctrl`+`h` \| _Middle-click_  | `Ctrl`+`h` \| _Middle-click_
-scrcpy --shortcut-mod=rctrl
+ | Click on `BACK`                             | `Ctrl`+`b` \| _Right-click²_  | `Cmd`+`b`  \| _Right-click²_
-
+ | Click on `APP_SWITCH`                       | `Ctrl`+`s`                    | `Cmd`+`s`
-# use either LCtrl+LAlt or LCmd for shortcuts
+ | Click on `MENU`                             | `Ctrl`+`m`                    | `Ctrl`+`m`
-scrcpy --shortcut-mod=lctrl+lalt,lcmd
+ | Click on `VOLUME_UP`                        | `Ctrl`+`↑` _(up)_             | `Cmd`+`↑` _(up)_
-```
+ | Click on `VOLUME_DOWN`                      | `Ctrl`+`↓` _(down)_           | `Cmd`+`↓` _(down)_
-
+ | Click on `POWER`                            | `Ctrl`+`p`                    | `Cmd`+`p`
- | Action                                      |   Shortcut
+ | Power on                                    | _Right-click²_                | _Right-click²_
- | ------------------------------------------- |:-----------------------------
+ | Turn device screen off (keep mirroring)     | `Ctrl`+`o`                    | `Cmd`+`o`
- | Switch fullscreen mode                      | `MOD`+`f`
+ | Turn device screen on                       | `Ctrl`+`Shift`+`o`            | `Cmd`+`Shift`+`o`
- | Rotate display left                         | `MOD`+`←` _(left)_
+ | Rotate device screen                        | `Ctrl`+`r`                    | `Cmd`+`r`
- | Rotate display right                        | `MOD`+`→` _(right)_
+ | Expand notification panel                   | `Ctrl`+`n`                    | `Cmd`+`n`
- | Resize window to 1:1 (pixel-perfect)        | `MOD`+`g`
+ | Collapse notification panel                 | `Ctrl`+`Shift`+`n`            | `Cmd`+`Shift`+`n`
- | Resize window to remove black borders       | `MOD`+`w` \| _Double-click¹_
+ | Copy device clipboard to computer           | `Ctrl`+`c`                    | `Cmd`+`c`
- | Click on `HOME`                             | `MOD`+`h` \| _Middle-click_
+ | Paste computer clipboard to device          | `Ctrl`+`v`                    | `Cmd`+`v`
- | Click on `BACK`                             | `MOD`+`b` \| _Right-click²_
+ | Copy computer clipboard to device and paste | `Ctrl`+`Shift`+`v`            | `Cmd`+`Shift`+`v`
- | Click on `APP_SWITCH`                       | `MOD`+`s`
+ | Enable/disable FPS counter (on stdout)      | `Ctrl`+`i`                    | `Cmd`+`i`
- | Click on `MENU`                             | `MOD`+`m`
- | Click on `VOLUME_UP`                        | `MOD`+`↑` _(up)_
- | Click on `VOLUME_DOWN`                      | `MOD`+`↓` _(down)_
- | Click on `POWER`                            | `MOD`+`p`
- | Power on                                    | _Right-click²_
- | Turn device screen off (keep mirroring)     | `MOD`+`o`
- | Turn device screen on                       | `MOD`+`Shift`+`o`
- | Rotate device screen                        | `MOD`+`r`
- | Expand notification panel                   | `MOD`+`n`
- | Collapse notification panel                 | `MOD`+`Shift`+`n`
- | Copy to clipboard³                          | `MOD`+`c`
- | Cut to clipboard³                           | `MOD`+`x`
- | Synchronize clipboards and paste³           | `MOD`+`v`
- | Inject computer clipboard text              | `MOD`+`Shift`+`v`
- | Enable/disable FPS counter (on stdout)      | `MOD`+`i`
 
 _¹Double-click on black borders to remove them._  
 _²Right-click turns the screen on if it was off, presses BACK otherwise._
-_³Only on Android >= 7._
-
-All `Ctrl`+_key_ shortcuts are forwarded to the device, so they are handled by
-the active application.
 
 
 ## Custom paths

app/meson.build

@@ -164,12 +164,12 @@ if get_option('buildtype') == 'debug'
             'src/cli.c',
             'src/util/str_util.c',
         ]],
-        ['test_control_msg_serialize', [
+        ['test_control_event_serialize', [
             'tests/test_control_msg_serialize.c',
             'src/control_msg.c',
             'src/util/str_util.c',
         ]],
-        ['test_device_msg_deserialize', [
+        ['test_device_event_deserialize', [
             'tests/test_device_msg_deserialize.c',
             'src/device_msg.c',
         ]],
@@ -186,7 +186,7 @@ if get_option('buildtype') == 'debug'
         exe = executable(t[0], t[1],
                          include_directories: src_dir,
                          dependencies: dependencies,
-                         c_args: ['-DSDL_MAIN_HANDLED', '-DSC_TEST'])
+                         c_args: ['-DSDL_MAIN_HANDLED'])
         test(t[0], exe)
     endforeach
 endif

app/scrcpy.1

@@ -43,10 +43,6 @@ The values are expressed in the device natural orientation (typically, portrait
 .B \-\-max\-size
 value is computed on the cropped size.
 
-.TP
-.BI "\-\-disable-screensaver"
-Disable screensaver while scrcpy is running.
-
 .TP
 .BI "\-\-display " id
 Specify the display id to mirror.
@@ -149,16 +145,6 @@ Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each incre
 .BI "\-s, \-\-serial " number
 The device serial number. Mandatory only if several devices are connected to adb.
 
-.TP
-.BI "\-\-shortcut\-mod " key[+...]][,...]
-Specify the modifiers to use for scrcpy shortcuts. Possible keys are "lctrl", "rctrl", "lalt", "ralt", "lcmd" and "rcmd".
-
-A shortcut can consist in several keys, separated by '+'. Several shortcuts can be specified, separated by ','.
-
-For example, to use either LCtrl+LAlt or LCmd for scrcpy shortcuts, pass "lctrl+lalt,lcmd".
-
-Default is "lalt,lcmd" (left-Alt or left-Cmd).
-
 .TP
 .B \-S, \-\-turn\-screen\-off
 Turn the device screen off immediately.
@@ -217,55 +203,52 @@ Default is 0 (automatic).\n
 
 .SH SHORTCUTS
 
-In the following list, MOD is the shortcut modifier. By default, it's (left)
-Alt or (left) Cmd, but it can be configured by \-\-shortcut-mod.
-
 .TP
-.B MOD+f
+.B Ctrl+f
 Switch fullscreen mode
 
 .TP
-.B MOD+Left
+.B Ctrl+Left
 Rotate display left
 
 .TP
-.B MOD+Right
+.B Ctrl+Right
 Rotate display right
 
 .TP
-.B MOD+g
+.B Ctrl+g
 Resize window to 1:1 (pixel\-perfect)
 
 .TP
-.B MOD+w, Double\-click on black borders
+.B Ctrl+x, Double\-click on black borders
 Resize window to remove black borders
 
 .TP
-.B MOD+h, Home, Middle\-click
+.B Ctrl+h, Home, Middle\-click
 Click on HOME
 
 .TP
-.B MOD+b, MOD+Backspace, Right\-click (when screen is on)
+.B Ctrl+b, Ctrl+Backspace, Right\-click (when screen is on)
 Click on BACK
 
 .TP
-.B MOD+s
+.B Ctrl+s
 Click on APP_SWITCH
 
 .TP
-.B MOD+m
+.B Ctrl+m
 Click on MENU
 
 .TP
-.B MOD+Up
+.B Ctrl+Up
 Click on VOLUME_UP
 
 .TP
-.B MOD+Down
+.B Ctrl+Down
 Click on VOLUME_DOWN
 
 .TP
-.B MOD+p
+.B Ctrl+p
 Click on POWER (turn screen on/off)
 
 .TP
@@ -273,43 +256,39 @@ Click on POWER (turn screen on/off)
 Turn screen on
 
 .TP
-.B MOD+o
+.B Ctrl+o
 Turn device screen off (keep mirroring)
 
 .TP
-.B MOD+Shift+o
+.B Ctrl+Shift+o
 Turn device screen on
 
 .TP
-.B MOD+r
+.B Ctrl+r
 Rotate device screen
 
 .TP
-.B MOD+n
+.B Ctrl+n
 Expand notification panel
 
 .TP
-.B MOD+Shift+n
+.B Ctrl+Shift+n
 Collapse notification panel
 
 .TP
-.B Mod+c
+.B Ctrl+c
-Copy to clipboard (inject COPY keycode, Android >= 7 only)
+Copy device clipboard to computer
 
 .TP
-.B Mod+x
+.B Ctrl+v
-Cut to clipboard (inject CUT keycode, Android >= 7 only)
+Paste computer clipboard to device
 
 .TP
-.B MOD+v
+.B Ctrl+Shift+v
-Copy computer clipboard to device, then paste (inject PASTE keycode, Android >= 7 only)
+Copy computer clipboard to device (and paste if the device runs Android >= 7)
 
 .TP
-.B MOD+Shift+v
+.B Ctrl+i
-Inject computer clipboard text as a sequence of key events
-
-.TP
-.B MOD+i
 Enable/disable FPS counter (print frames/second in logs)
 
 .TP

app/src/cli.c

@@ -3,16 +3,20 @@
 #include <assert.h>
 #include <getopt.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include "config.h"
-#include "scrcpy.h"
+#include "recorder.h"
 #include "util/log.h"
 #include "util/str_util.h"
 
 void
 scrcpy_print_usage(const char *arg0) {
+#ifdef __APPLE__
+# define CTRL_OR_CMD "Cmd"
+#else
+# define CTRL_OR_CMD "Ctrl"
+#endif
     fprintf(stderr,
         "Usage: %s [options]\n"
         "\n"
@@ -41,9 +45,6 @@ scrcpy_print_usage(const char *arg0) {
         "        (typically, portrait for a phone, landscape for a tablet).\n"
         "        Any --max-size value is computed on the cropped size.\n"
         "\n"
-        "    --disable-screensaver\n"
-        "        Disable screensaver while scrcpy is running.\n"
-        "\n"
         "    --display id\n"
         "        Specify the display id to mirror.\n"
         "\n"
@@ -138,19 +139,6 @@ scrcpy_print_usage(const char *arg0) {
         "        The device serial number. Mandatory only if several devices\n"
         "        are connected to adb.\n"
         "\n"
-        "    --shortcut-mod key[+...]][,...]\n"
-        "        Specify the modifiers to use for scrcpy shortcuts. Possible\n"
-        "        keys are \"lctrl\", \"rctrl\", \"lalt\", \"ralt\", \"lcmd\"\n"
-        "        and \"rcmd\".\n"
-        "\n"
-        "        A shortcut can consist in several keys, separated by '+'.\n"
-        "        Several shortcuts can be specified, separated by ','.\n"
-        "\n"
-        "        For example, to use either LCtrl+LAlt or LCmd for scrcpy\n"
-        "        shortcuts, pass \"lctrl+lalt,lcmd\".\n"
-        "\n"
-        "        Default is \"lalt,lcmd\" (left-Alt or left-Cmd).\n"
-        "\n"
         "    -S, --turn-screen-off\n"
         "        Turn the device screen off immediately.\n"
         "\n"
@@ -198,82 +186,75 @@ scrcpy_print_usage(const char *arg0) {
         "\n"
         "Shortcuts:\n"
         "\n"
-        "    In the following list, MOD is the shortcut modifier. By default,\n"
+        "    " CTRL_OR_CMD "+f\n"
-        "    it's (left) Alt or (left) Cmd, but it can be configured by\n"
-        "    --shortcut-mod.\n"
-        "\n"
-        "    MOD+f\n"
         "        Switch fullscreen mode\n"
         "\n"
-        "    MOD+Left\n"
+        "    " CTRL_OR_CMD "+Left\n"
         "        Rotate display left\n"
         "\n"
-        "    MOD+Right\n"
+        "    " CTRL_OR_CMD "+Right\n"
         "        Rotate display right\n"
         "\n"
-        "    MOD+g\n"
+        "    " CTRL_OR_CMD "+g\n"
         "        Resize window to 1:1 (pixel-perfect)\n"
         "\n"
-        "    MOD+w\n"
+        "    " CTRL_OR_CMD "+x\n"
         "    Double-click on black borders\n"
         "        Resize window to remove black borders\n"
         "\n"
-        "    MOD+h\n"
+        "    Ctrl+h\n"
         "    Middle-click\n"
         "        Click on HOME\n"
         "\n"
-        "    MOD+b\n"
+        "    " CTRL_OR_CMD "+b\n"
-        "    MOD+Backspace\n"
+        "    " CTRL_OR_CMD "+Backspace\n"
         "    Right-click (when screen is on)\n"
         "        Click on BACK\n"
         "\n"
-        "    MOD+s\n"
+        "    " CTRL_OR_CMD "+s\n"
         "        Click on APP_SWITCH\n"
         "\n"
-        "    MOD+m\n"
+        "    Ctrl+m\n"
         "        Click on MENU\n"
         "\n"
-        "    MOD+Up\n"
+        "    " CTRL_OR_CMD "+Up\n"
         "        Click on VOLUME_UP\n"
         "\n"
-        "    MOD+Down\n"
+        "    " CTRL_OR_CMD "+Down\n"
         "        Click on VOLUME_DOWN\n"
         "\n"
-        "    MOD+p\n"
+        "    " CTRL_OR_CMD "+p\n"
         "        Click on POWER (turn screen on/off)\n"
         "\n"
         "    Right-click (when screen is off)\n"
         "        Power on\n"
         "\n"
-        "    MOD+o\n"
+        "    " CTRL_OR_CMD "+o\n"
         "        Turn device screen off (keep mirroring)\n"
         "\n"
-        "    MOD+Shift+o\n"
+        "    " CTRL_OR_CMD "+Shift+o\n"
         "        Turn device screen on\n"
         "\n"
-        "    MOD+r\n"
+        "    " CTRL_OR_CMD "+r\n"
         "        Rotate device screen\n"
         "\n"
-        "    MOD+n\n"
+        "    " CTRL_OR_CMD "+n\n"
         "        Expand notification panel\n"
         "\n"
-        "    MOD+Shift+n\n"
+        "    " CTRL_OR_CMD "+Shift+n\n"
         "        Collapse notification panel\n"
         "\n"
-        "    MOD+c\n"
+        "    " CTRL_OR_CMD "+c\n"
-        "        Copy to clipboard (inject COPY keycode, Android >= 7 only)\n"
+        "        Copy device clipboard to computer\n"
         "\n"
-        "    MOD+x\n"
+        "    " CTRL_OR_CMD "+v\n"
-        "        Cut to clipboard (inject CUT keycode, Android >= 7 only)\n"
+        "        Paste computer clipboard to device\n"
         "\n"
-        "    MOD+v\n"
+        "    " CTRL_OR_CMD "+Shift+v\n"
-        "        Copy computer clipboard to device, then paste (inject PASTE\n"
+        "        Copy computer clipboard to device (and paste if the device\n"
-        "        keycode, Android >= 7 only)\n"
+        "        runs Android >= 7)\n"
         "\n"
-        "    MOD+Shift+v\n"
+        "    " CTRL_OR_CMD "+i\n"
-        "        Inject computer clipboard text as a sequence of key events\n"
-        "\n"
-        "    MOD+i\n"
         "        Enable/disable FPS counter (print frames/second in logs)\n"
         "\n"
         "    Drag & drop APK file\n"
@@ -398,10 +379,10 @@ parse_rotation(const char *s, uint8_t *rotation) {
 static bool
 parse_window_position(const char *s, int16_t *position) {
     // special value for "auto"
-    static_assert(SC_WINDOW_POSITION_UNDEFINED == -0x8000, "unexpected value");
+    static_assert(WINDOW_POSITION_UNDEFINED == -0x8000, "unexpected value");
 
     if (!strcmp(s, "auto")) {
-        *position = SC_WINDOW_POSITION_UNDEFINED;
+        *position = WINDOW_POSITION_UNDEFINED;
         return true;
     }
 
@@ -430,7 +411,7 @@ parse_window_dimension(const char *s, uint16_t *dimension) {
 }
 
 static bool
-parse_port_range(const char *s, struct sc_port_range *port_range) {
+parse_port_range(const char *s, struct port_range *port_range) {
     long values[2];
     size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
     if (!count) {
@@ -495,116 +476,21 @@ parse_log_level(const char *s, enum sc_log_level *log_level) {
     return false;
 }
 
-// item is a list of mod keys separated by '+' (e.g. "lctrl+lalt")
-// returns a bitwise-or of SC_MOD_* constants (or 0 on error)
-static unsigned
-parse_shortcut_mods_item(const char *item, size_t len) {
-    unsigned mod = 0;
-
-    for (;;) {
-        char *plus = strchr(item, '+');
-        // strchr() does not consider the "len" parameter, to it could find an
-        // occurrence too far in the string (there is no strnchr())
-        bool has_plus = plus && plus < item + len;
-
-        assert(!has_plus || plus > item);
-        size_t key_len = has_plus ? (size_t) (plus - item) : len;
-
-#define STREQ(literal, s, len) \
-    ((sizeof(literal)-1 == len) && !memcmp(literal, s, len))
-
-        if (STREQ("lctrl", item, key_len)) {
-            mod |= SC_MOD_LCTRL;
-        } else if (STREQ("rctrl", item, key_len)) {
-            mod |= SC_MOD_RCTRL;
-        } else if (STREQ("lalt", item, key_len)) {
-            mod |= SC_MOD_LALT;
-        } else if (STREQ("ralt", item, key_len)) {
-            mod |= SC_MOD_RALT;
-        } else if (STREQ("lcmd", item, key_len)) {
-            mod |= SC_MOD_LCMD;
-        } else if (STREQ("rcmd", item, key_len)) {
-            mod |= SC_MOD_RCMD;
-        } else {
-            LOGW("Unknown modifier key: %.*s", (int) key_len, item);
-            return 0;
-        }
-#undef STREQ
-
-        if (!has_plus) {
-            break;
-        }
-
-        item = plus + 1;
-        assert(len >= key_len + 1);
-        len -= key_len + 1;
-    }
-
-    return mod;
-}
-
 static bool
-parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods) {
+parse_record_format(const char *optarg, enum recorder_format *format) {
-    unsigned count = 0;
-    unsigned current = 0;
-
-    // LCtrl+LAlt or RCtrl or LCtrl+RCmd: "lctrl+lalt,rctrl,lctrl+rcmd"
-
-    for (;;) {
-        char *comma = strchr(s, ',');
-        if (comma && count == SC_MAX_SHORTCUT_MODS - 1) {
-            assert(count < SC_MAX_SHORTCUT_MODS);
-            LOGW("Too many shortcut modifiers alternatives");
-            return false;
-        }
-
-        assert(!comma || comma > s);
-        size_t limit = comma ? (size_t) (comma - s) : strlen(s);
-
-        unsigned mod = parse_shortcut_mods_item(s, limit);
-        if (!mod) {
-            LOGE("Invalid modifier keys: %.*s", (int) limit, s);
-            return false;
-        }
-
-        mods->data[current++] = mod;
-        ++count;
-
-        if (!comma) {
-            break;
-        }
-
-        s = comma + 1;
-    }
-
-    mods->count = count;
-
-    return true;
-}
-
-#ifdef SC_TEST
-// expose the function to unit-tests
-bool
-sc_parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods) {
-    return parse_shortcut_mods(s, mods);
-}
-#endif
-
-static bool
-parse_record_format(const char *optarg, enum sc_record_format *format) {
     if (!strcmp(optarg, "mp4")) {
-        *format = SC_RECORD_FORMAT_MP4;
+        *format = RECORDER_FORMAT_MP4;
         return true;
     }
     if (!strcmp(optarg, "mkv")) {
-        *format = SC_RECORD_FORMAT_MKV;
+        *format = RECORDER_FORMAT_MKV;
         return true;
     }
     LOGE("Unsupported format: %s (expected mp4 or mkv)", optarg);
     return false;
 }
 
-static enum sc_record_format
+static enum recorder_format
 guess_record_format(const char *filename) {
     size_t len = strlen(filename);
     if (len < 4) {
@@ -612,10 +498,10 @@ guess_record_format(const char *filename) {
     }
     const char *ext = &filename[len - 4];
     if (!strcmp(ext, ".mp4")) {
-        return SC_RECORD_FORMAT_MP4;
+        return RECORDER_FORMAT_MP4;
     }
     if (!strcmp(ext, ".mkv")) {
-        return SC_RECORD_FORMAT_MKV;
+        return RECORDER_FORMAT_MKV;
     }
     return 0;
 }
@@ -640,8 +526,6 @@ guess_record_format(const char *filename) {
 #define OPT_NO_MIPMAPS             1017
 #define OPT_CODEC_OPTIONS          1018
 #define OPT_FORCE_ADB_FORWARD      1019
-#define OPT_DISABLE_SCREENSAVER    1020
-#define OPT_SHORTCUT_MOD           1021
 
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -650,8 +534,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
         {"bit-rate",               required_argument, NULL, 'b'},
         {"codec-options",          required_argument, NULL, OPT_CODEC_OPTIONS},
         {"crop",                   required_argument, NULL, OPT_CROP},
-        {"disable-screensaver",    no_argument,       NULL,
-                                                  OPT_DISABLE_SCREENSAVER},
         {"display",                required_argument, NULL, OPT_DISPLAY_ID},
         {"force-adb-forward",      no_argument,       NULL,
                                                   OPT_FORCE_ADB_FORWARD},
@@ -674,7 +556,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                                                   OPT_RENDER_EXPIRED_FRAMES},
         {"rotation",               required_argument, NULL, OPT_ROTATION},
         {"serial",                 required_argument, NULL, 's'},
-        {"shortcut-mod",           required_argument, NULL, OPT_SHORTCUT_MOD},
         {"show-touches",           no_argument,       NULL, 't'},
         {"stay-awake",             no_argument,       NULL, 'w'},
         {"turn-screen-off",        no_argument,       NULL, 'S'},
@@ -835,14 +716,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
             case OPT_FORCE_ADB_FORWARD:
                 opts->force_adb_forward = true;
                 break;
-            case OPT_DISABLE_SCREENSAVER:
-                opts->disable_screensaver = true;
-                break;
-            case OPT_SHORTCUT_MOD:
-                if (!parse_shortcut_mods(optarg, &opts->shortcut_mods)) {
-                    return false;
-                }
-                break;
             default:
                 // getopt prints the error message on stderr
                 return false;

app/src/cli.h

@@ -18,9 +18,4 @@ scrcpy_print_usage(const char *arg0);
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]);
 
-#ifdef SC_TEST
-bool
-sc_parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods);
-#endif
-
 #endif

app/src/control_msg.c

@@ -20,9 +20,9 @@ write_position(uint8_t *buf, const struct position *position) {
 static size_t
 write_string(const char *utf8, size_t max_len, unsigned char *buf) {
     size_t len = utf8_truncation_index(utf8, max_len);
-    buffer_write32be(buf, len);
+    buffer_write16be(buf, (uint16_t) len);
-    memcpy(&buf[4], utf8, len);
+    memcpy(&buf[2], utf8, len);
-    return 4 + len;
+    return 2 + len;
 }
 
 static uint16_t
@@ -42,9 +42,8 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
         case CONTROL_MSG_TYPE_INJECT_KEYCODE:
             buf[1] = msg->inject_keycode.action;
             buffer_write32be(&buf[2], msg->inject_keycode.keycode);
-            buffer_write32be(&buf[6], msg->inject_keycode.repeat);
+            buffer_write32be(&buf[6], msg->inject_keycode.metastate);
-            buffer_write32be(&buf[10], msg->inject_keycode.metastate);
+            return 10;
-            return 14;
         case CONTROL_MSG_TYPE_INJECT_TEXT: {
             size_t len =
                 write_string(msg->inject_text.text,

app/src/control_msg.h

@@ -10,11 +10,10 @@
 #include "android/keycodes.h"
 #include "common.h"
 
-#define CONTROL_MSG_MAX_SIZE (1 << 18) // 256k
-
 #define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300
-// type: 1 byte; paste flag: 1 byte; length: 4 bytes
+#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4092
-#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 6)
+#define CONTROL_MSG_SERIALIZED_MAX_SIZE \
+    (4 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)
 
 #define POINTER_ID_MOUSE UINT64_C(-1);
 
@@ -44,7 +43,6 @@ struct control_msg {
         struct {
             enum android_keyevent_action action;
             enum android_keycode keycode;
-            uint32_t repeat;
             enum android_metastate metastate;
         } inject_keycode;
         struct {
@@ -72,7 +70,7 @@ struct control_msg {
     };
 };
 
-// buf size must be at least CONTROL_MSG_MAX_SIZE
+// buf size must be at least CONTROL_MSG_SERIALIZED_MAX_SIZE
 // return the number of bytes written
 size_t
 control_msg_serialize(const struct control_msg *msg, unsigned char *buf);

app/src/controller.c

@@ -60,7 +60,7 @@ controller_push_msg(struct controller *controller,
 static bool
 process_msg(struct controller *controller,
               const struct control_msg *msg) {
-    static unsigned char serialized_msg[CONTROL_MSG_MAX_SIZE];
+    unsigned char serialized_msg[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int length = control_msg_serialize(msg, serialized_msg);
     if (!length) {
         return false;

app/src/device_msg.c

@@ -9,7 +9,7 @@
 ssize_t
 device_msg_deserialize(const unsigned char *buf, size_t len,
                        struct device_msg *msg) {
-    if (len < 5) {
+    if (len < 3) {
         // at least type + empty string length
         return 0; // not available
     }
@@ -17,8 +17,8 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
     msg->type = buf[0];
     switch (msg->type) {
         case DEVICE_MSG_TYPE_CLIPBOARD: {
-            size_t clipboard_len = buffer_read32be(&buf[1]);
+            uint16_t clipboard_len = buffer_read16be(&buf[1]);
-            if (clipboard_len > len - 5) {
+            if (clipboard_len > len - 3) {
                 return 0; // not available
             }
             char *text = SDL_malloc(clipboard_len + 1);
@@ -27,12 +27,12 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
                 return -1;
             }
             if (clipboard_len) {
-                memcpy(text, &buf[5], clipboard_len);
+                memcpy(text, &buf[3], clipboard_len);
             }
             text[clipboard_len] = '\0';
 
             msg->clipboard.text = text;
-            return 5 + clipboard_len;
+            return 3 + clipboard_len;
         }
         default:
             LOGW("Unknown device message type: %d", (int) msg->type);

app/src/device_msg.h

@@ -7,9 +7,8 @@
 
 #include "config.h"
 
-#define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k
+#define DEVICE_MSG_TEXT_MAX_LENGTH 4093
-// type: 1 byte; length: 4 bytes
+#define DEVICE_MSG_SERIALIZED_MAX_SIZE (3 + DEVICE_MSG_TEXT_MAX_LENGTH)
-#define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_MAX_SIZE - 5)
 
 enum device_msg_type {
     DEVICE_MSG_TYPE_CLIPBOARD,

app/src/event_converter.c

@@ -92,10 +92,6 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
         MAP(SDLK_LEFT,         AKEYCODE_DPAD_LEFT);
         MAP(SDLK_DOWN,         AKEYCODE_DPAD_DOWN);
         MAP(SDLK_UP,           AKEYCODE_DPAD_UP);
-        MAP(SDLK_LCTRL,        AKEYCODE_CTRL_LEFT);
-        MAP(SDLK_RCTRL,        AKEYCODE_CTRL_RIGHT);
-        MAP(SDLK_LSHIFT,       AKEYCODE_SHIFT_LEFT);
-        MAP(SDLK_RSHIFT,       AKEYCODE_SHIFT_RIGHT);
     }
 
     if (!(mod & (KMOD_NUM | KMOD_SHIFT))) {
@@ -115,8 +111,8 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
         }
     }
 
-    if (prefer_text && !(mod & KMOD_CTRL)) {
+    if (prefer_text) {
-        // do not forward alpha and space key events (unless Ctrl is pressed)
+        // do not forward alpha and space key events
         return false;
     }
 

app/src/input_manager.c

@@ -1,7 +1,6 @@
 #include "input_manager.h"
 
 #include <assert.h>
-#include <SDL2/SDL_keycode.h>
 
 #include "config.h"
 #include "event_converter.h"
@@ -11,64 +10,6 @@
 static const int ACTION_DOWN = 1;
 static const int ACTION_UP = 1 << 1;
 
-#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
-
-static inline uint16_t
-to_sdl_mod(unsigned mod) {
-    uint16_t sdl_mod = 0;
-    if (mod & SC_MOD_LCTRL) {
-        sdl_mod |= KMOD_LCTRL;
-    }
-    if (mod & SC_MOD_RCTRL) {
-        sdl_mod |= KMOD_RCTRL;
-    }
-    if (mod & SC_MOD_LALT) {
-        sdl_mod |= KMOD_LALT;
-    }
-    if (mod & SC_MOD_RALT) {
-        sdl_mod |= KMOD_RALT;
-    }
-    if (mod & SC_MOD_LCMD) {
-        sdl_mod |= KMOD_LGUI;
-    }
-    if (mod & SC_MOD_RCMD) {
-        sdl_mod |= KMOD_RGUI;
-    }
-    return sdl_mod;
-}
-
-static bool
-is_shortcut_mod(struct input_manager *im, uint16_t sdl_mod) {
-    // keep only the relevant modifier keys
-    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;
-
-    assert(im->sdl_shortcut_mods.count);
-    assert(im->sdl_shortcut_mods.count < SC_MAX_SHORTCUT_MODS);
-    for (unsigned i = 0; i < im->sdl_shortcut_mods.count; ++i) {
-        if (im->sdl_shortcut_mods.data[i] == sdl_mod) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void
-input_manager_init(struct input_manager *im, bool prefer_text,
-                   const struct sc_shortcut_mods *shortcut_mods)
-{
-    im->prefer_text = prefer_text;
-
-    assert(shortcut_mods->count);
-    assert(shortcut_mods->count < SC_MAX_SHORTCUT_MODS);
-    for (unsigned i = 0; i < shortcut_mods->count; ++i) {
-        uint16_t sdl_mod = to_sdl_mod(shortcut_mods->data[i]);
-        assert(sdl_mod);
-        im->sdl_shortcut_mods.data[i] = sdl_mod;
-    }
-    im->sdl_shortcut_mods.count = shortcut_mods->count;
-}
-
 static void
 send_keycode(struct controller *controller, enum android_keycode keycode,
              int actions, const char *name) {
@@ -129,16 +70,6 @@ action_menu(struct controller *controller, int actions) {
     send_keycode(controller, AKEYCODE_MENU, actions, "MENU");
 }
 
-static inline void
-action_copy(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_COPY, actions, "COPY");
-}
-
-static inline void
-action_cut(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_CUT, actions, "CUT");
-}
-
 // turn the screen on if it was off, press BACK otherwise
 static void
 press_back_or_turn_screen_on(struct controller *controller) {
@@ -170,6 +101,16 @@ collapse_notification_panel(struct controller *controller) {
     }
 }
 
+static void
+request_device_clipboard(struct controller *controller) {
+    struct control_msg msg;
+    msg.type = CONTROL_MSG_TYPE_GET_CLIPBOARD;
+
+    if (!controller_push_msg(controller, &msg)) {
+        LOGW("Could not request device clipboard");
+    }
+}
+
 static void
 set_device_clipboard(struct controller *controller, bool paste) {
     char *text = SDL_GetClipboardText();
@@ -269,10 +210,6 @@ rotate_client_right(struct screen *screen) {
 void
 input_manager_process_text_input(struct input_manager *im,
                                  const SDL_TextInputEvent *event) {
-    if (is_shortcut_mod(im, SDL_GetModState())) {
-        // A shortcut must never generate text events
-        return;
-    }
     if (!im->prefer_text) {
         char c = event->text[0];
         if (isalpha(c) || c == ' ') {
@@ -297,7 +234,7 @@ input_manager_process_text_input(struct input_manager *im,
 
 static bool
 convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
-                  bool prefer_text, uint32_t repeat) {
+                  bool prefer_text) {
     to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
 
     if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
@@ -310,7 +247,6 @@ convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
         return false;
     }
 
-    to->inject_keycode.repeat = repeat;
     to->inject_keycode.metastate = convert_meta_state(mod);
 
     return true;
@@ -321,49 +257,71 @@ input_manager_process_key(struct input_manager *im,
                           const SDL_KeyboardEvent *event,
                           bool control) {
     // control: indicates the state of the command-line option --no-control
+    // ctrl: the Ctrl key
 
-    bool smod = is_shortcut_mod(im, event->keysym.mod);
+    bool ctrl = event->keysym.mod & (KMOD_LCTRL | KMOD_RCTRL);
+    bool alt = event->keysym.mod & (KMOD_LALT | KMOD_RALT);
+    bool meta = event->keysym.mod & (KMOD_LGUI | KMOD_RGUI);
+
+    // use Cmd on macOS, Ctrl on other platforms
+#ifdef __APPLE__
+    bool cmd = !ctrl && meta;
+#else
+    if (meta) {
+        // no shortcuts involve Meta on platforms other than macOS, and it must
+        // not be forwarded to the device
+        return;
+    }
+    bool cmd = ctrl; // && !meta, already guaranteed
+#endif
+
+    if (alt) {
+        // no shortcuts involve Alt, and it must not be forwarded to the device
+        return;
+    }
 
     struct controller *controller = im->controller;
 
-    SDL_Keycode keycode = event->keysym.sym;
+    // capture all Ctrl events
-    bool down = event->type == SDL_KEYDOWN;
+    if (ctrl || cmd) {
-    bool ctrl = event->keysym.mod & KMOD_CTRL;
+        SDL_Keycode keycode = event->keysym.sym;
-    bool shift = event->keysym.mod & KMOD_SHIFT;
+        bool down = event->type == SDL_KEYDOWN;
-    bool repeat = event->repeat;
-
-    // The shortcut modifier is pressed
-    if (smod) {
         int action = down ? ACTION_DOWN : ACTION_UP;
+        bool repeat = event->repeat;
+        bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT);
         switch (keycode) {
             case SDLK_h:
-                if (control && !shift && !repeat) {
+                // Ctrl+h on all platform, since Cmd+h is already captured by
+                // the system on macOS to hide the window
+                if (control && ctrl && !meta && !shift && !repeat) {
                     action_home(controller, action);
                 }
                 return;
             case SDLK_b: // fall-through
             case SDLK_BACKSPACE:
-                if (control && !shift && !repeat) {
+                if (control && cmd && !shift && !repeat) {
                     action_back(controller, action);
                 }
                 return;
             case SDLK_s:
-                if (control && !shift && !repeat) {
+                if (control && cmd && !shift && !repeat) {
                     action_app_switch(controller, action);
                 }
                 return;
             case SDLK_m:
-                if (control && !shift && !repeat) {
+                // Ctrl+m on all platform, since Cmd+m is already captured by
+                // the system on macOS to minimize the window
+                if (control && ctrl && !meta && !shift && !repeat) {
                     action_menu(controller, action);
                 }
                 return;
             case SDLK_p:
-                if (control && !shift && !repeat) {
+                if (control && cmd && !shift && !repeat) {
                     action_power(controller, action);
                 }
                 return;
             case SDLK_o:
-                if (control && !repeat && down) {
+                if (control && cmd && down) {
                     enum screen_power_mode mode = shift
                                                 ? SCREEN_POWER_MODE_NORMAL
                                                 : SCREEN_POWER_MODE_OFF;
@@ -371,72 +329,67 @@ input_manager_process_key(struct input_manager *im,
                 }
                 return;
             case SDLK_DOWN:
-                if (control && !shift) {
+                if (control && cmd && !shift) {
                     // forward repeated events
                     action_volume_down(controller, action);
                 }
                 return;
             case SDLK_UP:
-                if (control && !shift) {
+                if (control && cmd && !shift) {
                     // forward repeated events
                     action_volume_up(controller, action);
                 }
                 return;
             case SDLK_LEFT:
-                if (!shift && !repeat && down) {
+                if (cmd && !shift && down) {
                     rotate_client_left(im->screen);
                 }
                 return;
             case SDLK_RIGHT:
-                if (!shift && !repeat && down) {
+                if (cmd && !shift && down) {
                     rotate_client_right(im->screen);
                 }
                 return;
             case SDLK_c:
-                if (control && !shift && !repeat) {
+                if (control && cmd && !shift && !repeat && down) {
-                    action_copy(controller, action);
+                    request_device_clipboard(controller);
-                }
-                return;
-            case SDLK_x:
-                if (control && !shift && !repeat) {
-                    action_cut(controller, action);
                 }
                 return;
             case SDLK_v:
-                if (control && !repeat && down) {
+                if (control && cmd && !repeat && down) {
                     if (shift) {
-                        // inject the text as input events
-                        clipboard_paste(controller);
-                    } else {
                         // store the text in the device clipboard and paste
                         set_device_clipboard(controller, true);
+                    } else {
+                        // inject the text as input events
+                        clipboard_paste(controller);
                     }
                 }
                 return;
             case SDLK_f:
-                if (!shift && !repeat && down) {
+                if (!shift && cmd && !repeat && down) {
                     screen_switch_fullscreen(im->screen);
                 }
                 return;
-            case SDLK_w:
+            case SDLK_x:
-                if (!shift && !repeat && down) {
+                if (!shift && cmd && !repeat && down) {
                     screen_resize_to_fit(im->screen);
                 }
                 return;
             case SDLK_g:
-                if (!shift && !repeat && down) {
+                if (!shift && cmd && !repeat && down) {
                     screen_resize_to_pixel_perfect(im->screen);
                 }
                 return;
             case SDLK_i:
-                if (!shift && !repeat && down) {
+                if (!shift && cmd && !repeat && down) {
                     struct fps_counter *fps_counter =
                         im->video_buffer->fps_counter;
                     switch_fps_counter_state(fps_counter);
                 }
                 return;
             case SDLK_n:
-                if (control && !repeat && down) {
+                if (control && cmd && !repeat && down) {
                     if (shift) {
                         collapse_notification_panel(controller);
                     } else {
@@ -445,7 +398,7 @@ input_manager_process_key(struct input_manager *im,
                 }
                 return;
             case SDLK_r:
-                if (control && !shift && !repeat && down) {
+                if (control && cmd && !shift && !repeat && down) {
                     rotate_device(controller);
                 }
                 return;
@@ -458,20 +411,8 @@ input_manager_process_key(struct input_manager *im,
         return;
     }
 
-    if (event->repeat) {
-        ++im->repeat;
-    } else {
-        im->repeat = 0;
-    }
-
-    if (ctrl && !shift && keycode == SDLK_v && down && !repeat) {
-        // Synchronize the computer clipboard to the device clipboard before
-        // sending Ctrl+v, to allow seamless copy-paste.
-        set_device_clipboard(controller, false);
-    }
-
     struct control_msg msg;
-    if (convert_input_key(event, &msg, im->prefer_text, im->repeat)) {
+    if (convert_input_key(event, &msg, im->prefer_text)) {
         if (!controller_push_msg(controller, &msg)) {
             LOGW("Could not request 'inject keycode'");
         }
@@ -486,7 +427,7 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
     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 =
-        screen_convert_window_to_frame_coords(screen, from->x, from->y);
+        screen_convert_to_frame_coords(screen, from->x, from->y);
     to->inject_touch_event.pressure = 1.f;
     to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
 
@@ -524,15 +465,15 @@ convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
     to->inject_touch_event.pointer_id = from->fingerId;
     to->inject_touch_event.position.screen_size = screen->frame_size;
 
-    int dw;
+    int ww;
-    int dh;
+    int wh;
-    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
+    SDL_GL_GetDrawableSize(screen->window, &ww, &wh);
 
     // SDL touch event coordinates are normalized in the range [0; 1]
-    int32_t x = from->x * dw;
+    int32_t x = from->x * ww;
-    int32_t y = from->y * dh;
+    int32_t y = from->y * wh;
     to->inject_touch_event.position.point =
-        screen_convert_drawable_to_frame_coords(screen, x, y);
+        screen_convert_to_frame_coords(screen, x, y);
 
     to->inject_touch_event.pressure = from->pressure;
     to->inject_touch_event.buttons = 0;
@@ -562,9 +503,8 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
     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 =
-        screen_convert_window_to_frame_coords(screen, from->x, from->y);
+        screen_convert_to_frame_coords(screen, from->x, from->y);
-    to->inject_touch_event.pressure =
+    to->inject_touch_event.pressure = 1.f;
-        from->type == SDL_MOUSEBUTTONDOWN ? 1.f : 0.f;
     to->inject_touch_event.buttons =
         convert_mouse_buttons(SDL_BUTTON(from->button));
 
@@ -628,8 +568,7 @@ convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
 
     struct position position = {
         .screen_size = screen->frame_size,
-        .point = screen_convert_window_to_frame_coords(screen,
+        .point = screen_convert_to_frame_coords(screen, mouse_x, mouse_y),
-                                                       mouse_x, mouse_y),
     };
 
     to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;

app/src/input_manager.h

@@ -3,37 +3,20 @@
 
 #include <stdbool.h>
 
-#include <SDL2/SDL.h>
-
 #include "config.h"
 #include "common.h"
 #include "controller.h"
 #include "fps_counter.h"
-#include "scrcpy.h"
-#include "screen.h"
 #include "video_buffer.h"
+#include "screen.h"
 
 struct input_manager {
     struct controller *controller;
     struct video_buffer *video_buffer;
     struct screen *screen;
-
-    // SDL reports repeated events as a boolean, but Android expects the actual
-    // number of repetitions. This variable keeps track of the count.
-    unsigned repeat;
-
     bool prefer_text;
-
-    struct {
-        unsigned data[SC_MAX_SHORTCUT_MODS];
-        unsigned count;
-    } sdl_shortcut_mods;
 };
 
-void
-input_manager_init(struct input_manager *im, bool prefer_text,
-                   const struct sc_shortcut_mods *shortcut_mods);
-
 void
 input_manager_process_text_input(struct input_manager *im,
                                  const SDL_TextInputEvent *event);

app/src/main.c

@@ -1,6 +1,5 @@
 #include "scrcpy.h"
 
-#include <assert.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <libavformat/avformat.h>
@@ -43,7 +42,7 @@ convert_log_level_to_sdl(enum sc_log_level level) {
             return SDL_LOG_PRIORITY_ERROR;
         default:
             assert(!"unexpected log level");
-            return SDL_LOG_PRIORITY_INFO;
+            return SC_LOG_LEVEL_INFO;
     }
 }
 
@@ -72,7 +71,7 @@ main(int argc, char *argv[]) {
     }
 
     SDL_LogPriority sdl_log = convert_log_level_to_sdl(args.opts.log_level);
-    SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, sdl_log);
+    SDL_LogSetAllPriority(sdl_log);
 
     if (args.help) {
         scrcpy_print_usage(argv[0]);

app/src/receiver.c

@@ -25,19 +25,10 @@ receiver_destroy(struct receiver *receiver) {
 static void
 process_msg(struct device_msg *msg) {
     switch (msg->type) {
-        case DEVICE_MSG_TYPE_CLIPBOARD: {
+        case DEVICE_MSG_TYPE_CLIPBOARD:
-            char *current = SDL_GetClipboardText();
-            bool same = current && !strcmp(current, msg->clipboard.text);
-            SDL_free(current);
-            if (same) {
-                LOGD("Computer clipboard unchanged");
-                return;
-            }
-
             LOGI("Device clipboard copied");
             SDL_SetClipboardText(msg->clipboard.text);
             break;
-        }
     }
 }
 
@@ -69,29 +60,28 @@ static int
 run_receiver(void *data) {
     struct receiver *receiver = data;
 
-    static unsigned char buf[DEVICE_MSG_MAX_SIZE];
+    unsigned char buf[DEVICE_MSG_SERIALIZED_MAX_SIZE];
     size_t head = 0;
 
     for (;;) {
-        assert(head < DEVICE_MSG_MAX_SIZE);
+        assert(head < DEVICE_MSG_SERIALIZED_MAX_SIZE);
-        ssize_t r = net_recv(receiver->control_socket, buf + head,
+        ssize_t r = net_recv(receiver->control_socket, buf,
-                             DEVICE_MSG_MAX_SIZE - head);
+                             DEVICE_MSG_SERIALIZED_MAX_SIZE - head);
         if (r <= 0) {
             LOGD("Receiver stopped");
             break;
         }
 
-        head += r;
+        ssize_t consumed = process_msgs(buf, r);
-        ssize_t consumed = process_msgs(buf, head);
         if (consumed == -1) {
             // an error occurred
             break;
         }
 
         if (consumed) {
-            head -= consumed;
             // shift the remaining data in the buffer
-            memmove(buf, &buf[consumed], head);
+            memmove(buf, &buf[consumed], r - consumed);
+            head = r - consumed;
         }
     }
 

app/src/recorder.c

@@ -63,7 +63,7 @@ recorder_queue_clear(struct recorder_queue *queue) {
 bool
 recorder_init(struct recorder *recorder,
               const char *filename,
-              enum sc_record_format format,
+              enum recorder_format format,
               struct size declared_frame_size) {
     recorder->filename = SDL_strdup(filename);
     if (!recorder->filename) {
@@ -105,10 +105,10 @@ recorder_destroy(struct recorder *recorder) {
 }
 
 static const char *
-recorder_get_format_name(enum sc_record_format format) {
+recorder_get_format_name(enum recorder_format format) {
     switch (format) {
-        case SC_RECORD_FORMAT_MP4: return "mp4";
+        case RECORDER_FORMAT_MP4: return "mp4";
-        case SC_RECORD_FORMAT_MKV: return "matroska";
+        case RECORDER_FORMAT_MKV: return "matroska";
         default: return NULL;
     }
 }

app/src/recorder.h

@@ -8,9 +8,14 @@
 
 #include "config.h"
 #include "common.h"
-#include "scrcpy.h"
 #include "util/queue.h"
 
+enum recorder_format {
+    RECORDER_FORMAT_AUTO,
+    RECORDER_FORMAT_MP4,
+    RECORDER_FORMAT_MKV,
+};
+
 struct record_packet {
     AVPacket packet;
     struct record_packet *next;
@@ -20,7 +25,7 @@ struct recorder_queue QUEUE(struct record_packet);
 
 struct recorder {
     char *filename;
-    enum sc_record_format format;
+    enum recorder_format format;
     AVFormatContext *ctx;
     struct size declared_frame_size;
     bool header_written;
@@ -41,7 +46,7 @@ struct recorder {
 
 bool
 recorder_init(struct recorder *recorder, const char *filename,
-              enum sc_record_format format, struct size declared_frame_size);
+              enum recorder_format format, struct size declared_frame_size);
 
 void
 recorder_destroy(struct recorder *recorder);

app/src/scrcpy.c

@@ -8,8 +8,6 @@
 #include <SDL2/SDL.h>
 
 #ifdef _WIN32
-// not needed here, but winsock2.h must never be included AFTER windows.h
-# include <winsock2.h>
 # include <windows.h>
 #endif
 
@@ -48,14 +46,7 @@ static struct input_manager input_manager = {
     .controller = &controller,
     .video_buffer = &video_buffer,
     .screen = &screen,
-    .repeat = 0,
+    .prefer_text = false, // initialized later
-
-    // initialized later
-    .prefer_text = false,
-    .sdl_shortcut_mods = {
-        .data = {0},
-        .count = 0,
-    },
 };
 
 #ifdef _WIN32
@@ -72,8 +63,7 @@ BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
 
 // init SDL and set appropriate hints
 static bool
-sdl_init_and_configure(bool display, const char *render_driver,
+sdl_init_and_configure(bool display, const char *render_driver) {
-                       bool disable_screensaver) {
     uint32_t flags = display ? SDL_INIT_VIDEO : SDL_INIT_EVENTS;
     if (SDL_Init(flags)) {
         LOGC("Could not initialize SDL: %s", SDL_GetError());
@@ -122,13 +112,8 @@ sdl_init_and_configure(bool display, const char *render_driver,
         LOGW("Could not disable minimize on focus loss");
     }
 
-    if (disable_screensaver) {
+    // Do not disable the screensaver when scrcpy is running
-        LOGD("Screensaver disabled");
+    SDL_EnableScreenSaver();
-        SDL_DisableScreenSaver();
-    } else {
-        LOGD("Screensaver enabled");
-        SDL_EnableScreenSaver();
-    }
 
     return true;
 }
@@ -336,8 +321,7 @@ scrcpy(const struct scrcpy_options *options) {
     bool controller_initialized = false;
     bool controller_started = false;
 
-    if (!sdl_init_and_configure(options->display, options->render_driver,
+    if (!sdl_init_and_configure(options->display, options->render_driver)) {
-                                options->disable_screensaver)) {
         goto end;
     }
 
@@ -443,8 +427,7 @@ scrcpy(const struct scrcpy_options *options) {
         }
     }
 
-    input_manager_init(&input_manager, options->prefer_text,
+    input_manager.prefer_text = options->prefer_text;
-                       &options->shortcut_mods);
 
     ret = event_loop(options->display, options->control);
     LOGD("quit...");

app/src/scrcpy.h

@@ -2,46 +2,13 @@
 #define SCRCPY_H
 
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 
 #include "config.h"
-
+#include "common.h"
-enum sc_log_level {
+#include "input_manager.h"
-    SC_LOG_LEVEL_DEBUG,
+#include "recorder.h"
-    SC_LOG_LEVEL_INFO,
+#include "util/log.h"
-    SC_LOG_LEVEL_WARN,
-    SC_LOG_LEVEL_ERROR,
-};
-
-enum sc_record_format {
-    SC_RECORD_FORMAT_AUTO,
-    SC_RECORD_FORMAT_MP4,
-    SC_RECORD_FORMAT_MKV,
-};
-
-#define SC_MAX_SHORTCUT_MODS 8
-
-enum sc_shortcut_mod {
-    SC_MOD_LCTRL = 1 << 0,
-    SC_MOD_RCTRL = 1 << 1,
-    SC_MOD_LALT = 1 << 2,
-    SC_MOD_RALT = 1 << 3,
-    SC_MOD_LCMD = 1 << 4,
-    SC_MOD_RCMD = 1 << 5,
-};
-
-struct sc_shortcut_mods {
-    unsigned data[SC_MAX_SHORTCUT_MODS];
-    unsigned count;
-};
-
-struct sc_port_range {
-    uint16_t first;
-    uint16_t last;
-};
-
-#define SC_WINDOW_POSITION_UNDEFINED (-0x8000)
 
 struct scrcpy_options {
     const char *serial;
@@ -52,16 +19,15 @@ struct scrcpy_options {
     const char *render_driver;
     const char *codec_options;
     enum sc_log_level log_level;
-    enum sc_record_format record_format;
+    enum recorder_format record_format;
-    struct sc_port_range port_range;
+    struct port_range port_range;
-    struct sc_shortcut_mods shortcut_mods;
     uint16_t max_size;
     uint32_t bit_rate;
     uint16_t max_fps;
     int8_t lock_video_orientation;
     uint8_t rotation;
-    int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
+    int16_t window_x; // WINDOW_POSITION_UNDEFINED for "auto"
-    int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
+    int16_t window_y; // WINDOW_POSITION_UNDEFINED for "auto"
     uint16_t window_width;
     uint16_t window_height;
     uint16_t display_id;
@@ -77,7 +43,6 @@ struct scrcpy_options {
     bool mipmaps;
     bool stay_awake;
     bool force_adb_forward;
-    bool disable_screensaver;
 };
 
 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -89,22 +54,18 @@ struct scrcpy_options {
     .render_driver = NULL, \
     .codec_options = NULL, \
     .log_level = SC_LOG_LEVEL_INFO, \
-    .record_format = SC_RECORD_FORMAT_AUTO, \
+    .record_format = RECORDER_FORMAT_AUTO, \
     .port_range = { \
         .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
         .last = DEFAULT_LOCAL_PORT_RANGE_LAST, \
     }, \
-    .shortcut_mods = { \
-        .data = {SC_MOD_LALT, SC_MOD_LCMD}, \
-        .count = 2, \
-    }, \
     .max_size = DEFAULT_MAX_SIZE, \
     .bit_rate = DEFAULT_BIT_RATE, \
     .max_fps = 0, \
     .lock_video_orientation = DEFAULT_LOCK_VIDEO_ORIENTATION, \
     .rotation = 0, \
-    .window_x = SC_WINDOW_POSITION_UNDEFINED, \
+    .window_x = WINDOW_POSITION_UNDEFINED, \
-    .window_y = SC_WINDOW_POSITION_UNDEFINED, \
+    .window_y = WINDOW_POSITION_UNDEFINED, \
     .window_width = 0, \
     .window_height = 0, \
     .display_id = 0, \
@@ -120,7 +81,6 @@ struct scrcpy_options {
     .mipmaps = true, \
     .stay_awake = false, \
     .force_adb_forward = false, \
-    .disable_screensaver = false, \
 }
 
 bool

app/src/screen.c

@@ -8,7 +8,6 @@
 #include "common.h"
 #include "compat.h"
 #include "icon.xpm"
-#include "scrcpy.h"
 #include "tiny_xpm.h"
 #include "video_buffer.h"
 #include "util/lock.h"
@@ -258,9 +257,9 @@ screen_init_rendering(struct screen *screen, const char *window_title,
         window_flags |= SDL_WINDOW_BORDERLESS;
     }
 
-    int x = window_x != SC_WINDOW_POSITION_UNDEFINED
+    int x = window_x != WINDOW_POSITION_UNDEFINED
           ? window_x : (int) SDL_WINDOWPOS_UNDEFINED;
-    int y = window_y != SC_WINDOW_POSITION_UNDEFINED
+    int y = window_y != WINDOW_POSITION_UNDEFINED
           ? window_y : (int) SDL_WINDOWPOS_UNDEFINED;
     screen->window = SDL_CreateWindow(window_title, x, y,
                                       window_size.width, window_size.height,
@@ -580,14 +579,14 @@ screen_handle_window_event(struct screen *screen,
 }
 
 struct point
-screen_convert_drawable_to_frame_coords(struct screen *screen,
+screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y) {
-                                        int32_t x, int32_t y) {
     unsigned rotation = screen->rotation;
     assert(rotation < 4);
 
     int32_t w = screen->content_size.width;
     int32_t h = screen->content_size.height;
 
+    screen_hidpi_scale_coords(screen, &x, &y);
 
     x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;
     y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;
@@ -616,13 +615,6 @@ screen_convert_drawable_to_frame_coords(struct screen *screen,
     return result;
 }
 
-struct point
-screen_convert_window_to_frame_coords(struct screen *screen,
-                                      int32_t x, int32_t y) {
-    screen_hidpi_scale_coords(screen, &x, &y);
-    return screen_convert_drawable_to_frame_coords(screen, x, y);
-}
-
 void
 screen_hidpi_scale_coords(struct screen *screen, int32_t *x, int32_t *y) {
     // take the HiDPI scaling (dw/ww and dh/wh) into account

app/src/screen.h

@@ -9,6 +9,8 @@
 #include "common.h"
 #include "opengl.h"
 
+#define WINDOW_POSITION_UNDEFINED (-0x8000)
+
 struct video_buffer;
 
 struct screen {
@@ -74,7 +76,7 @@ void
 screen_init(struct screen *screen);
 
 // initialize screen, create window, renderer and texture (window is hidden)
-// window_x and window_y accept SC_WINDOW_POSITION_UNDEFINED
+// window_x and window_y accept WINDOW_POSITION_UNDEFINED
 bool
 screen_init_rendering(struct screen *screen, const char *window_title,
                       struct size frame_size, bool always_on_top,
@@ -124,14 +126,7 @@ screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);
 // convert point from window coordinates to frame coordinates
 // x and y are expressed in pixels
 struct point
-screen_convert_window_to_frame_coords(struct screen *screen,
+screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y);
-                                      int32_t x, int32_t y);
-
-// convert point from drawable coordinates to frame coordinates
-// x and y are expressed in pixels
-struct point
-screen_convert_drawable_to_frame_coords(struct screen *screen,
-                                        int32_t x, int32_t y);
 
 // Convert coordinates from window to drawable.
 // Events are expressed in window coordinates, but content is expressed in

app/src/server.c

@@ -143,7 +143,7 @@ listen_on_port(uint16_t port) {
 
 static bool
 enable_tunnel_reverse_any_port(struct server *server,
-                               struct sc_port_range port_range) {
+                               struct port_range port_range) {
     uint16_t port = port_range.first;
     for (;;) {
         if (!enable_tunnel_reverse(server->serial, port)) {
@@ -189,7 +189,7 @@ enable_tunnel_reverse_any_port(struct server *server,
 
 static bool
 enable_tunnel_forward_any_port(struct server *server,
-                               struct sc_port_range port_range) {
+                               struct port_range port_range) {
     server->tunnel_forward = true;
     uint16_t port = port_range.first;
     for (;;) {
@@ -217,7 +217,7 @@ enable_tunnel_forward_any_port(struct server *server,
 }
 
 static bool
-enable_tunnel_any_port(struct server *server, struct sc_port_range port_range,
+enable_tunnel_any_port(struct server *server, struct port_range port_range,
                        bool force_adb_forward) {
     if (!force_adb_forward) {
         // Attempt to use "adb reverse"

app/src/server.h

@@ -9,7 +9,6 @@
 #include "config.h"
 #include "command.h"
 #include "common.h"
-#include "scrcpy.h"
 #include "util/log.h"
 #include "util/net.h"
 
@@ -21,7 +20,7 @@ struct server {
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
-    struct sc_port_range port_range;
+    struct port_range port_range;
     uint16_t local_port; // selected from port_range
     bool tunnel_enabled;
     bool tunnel_forward; // use "adb forward" instead of "adb reverse"
@@ -48,7 +47,7 @@ struct server_params {
     enum sc_log_level log_level;
     const char *crop;
     const char *codec_options;
-    struct sc_port_range port_range;
+    struct port_range port_range;
     uint16_t max_size;
     uint32_t bit_rate;
     uint16_t max_fps;

app/src/util/log.h

@@ -3,6 +3,13 @@
 
 #include <SDL2/SDL_log.h>
 
+enum sc_log_level {
+    SC_LOG_LEVEL_DEBUG,
+    SC_LOG_LEVEL_INFO,
+    SC_LOG_LEVEL_WARN,
+    SC_LOG_LEVEL_ERROR,
+};
+
 #define LOGV(...) SDL_LogVerbose(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
 #define LOGD(...) SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
 #define LOGI(...) SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)

app/tests/test_buffer_util.c

@@ -65,10 +65,7 @@ static void test_buffer_read64be(void) {
     assert(val == 0xABCD1234567890EF);
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
-    (void) argc;
-    (void) argv;
-
     test_buffer_write16be();
     test_buffer_write32be();
     test_buffer_write64be();

app/tests/test_cbuf.c

@@ -65,10 +65,7 @@ static void test_cbuf_push_take(void) {
     assert(item == 35);
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
-    (void) argc;
-    (void) argv;
-
     test_cbuf_empty();
     test_cbuf_full();
     test_cbuf_push_take();

app/tests/test_cli.c

@@ -1,9 +1,7 @@
 #include <assert.h>
-#include <string.h>
 
 #include "cli.h"
 #include "common.h"
-#include "scrcpy.h"
 
 static void test_flag_version(void) {
     struct scrcpy_cli_args args = {
@@ -75,6 +73,7 @@ static void test_options(void) {
 
     const struct scrcpy_options *opts = &args.opts;
     assert(opts->always_on_top);
+    fprintf(stderr, "%d\n", (int) opts->bit_rate);
     assert(opts->bit_rate == 5000000);
     assert(!strcmp(opts->crop, "100:200:300:400"));
     assert(opts->fullscreen);
@@ -85,7 +84,7 @@ static void test_options(void) {
     assert(opts->port_range.last == 1236);
     assert(!strcmp(opts->push_target, "/sdcard/Movies"));
     assert(!strcmp(opts->record_filename, "file"));
-    assert(opts->record_format == SC_RECORD_FORMAT_MKV);
+    assert(opts->record_format == RECORDER_FORMAT_MKV);
     assert(opts->render_expired_frames);
     assert(!strcmp(opts->serial, "0123456789abcdef"));
     assert(opts->show_touches);
@@ -120,54 +119,13 @@ static void test_options2(void) {
     assert(!opts->control);
     assert(!opts->display);
     assert(!strcmp(opts->record_filename, "file.mp4"));
-    assert(opts->record_format == SC_RECORD_FORMAT_MP4);
+    assert(opts->record_format == RECORDER_FORMAT_MP4);
 }
 
-static void test_parse_shortcut_mods(void) {
+int main(void) {
-    struct sc_shortcut_mods mods;
-    bool ok;
-
-    ok = sc_parse_shortcut_mods("lctrl", &mods);
-    assert(ok);
-    assert(mods.count == 1);
-    assert(mods.data[0] == SC_MOD_LCTRL);
-
-    ok = sc_parse_shortcut_mods("lctrl+lalt", &mods);
-    assert(ok);
-    assert(mods.count == 1);
-    assert(mods.data[0] == (SC_MOD_LCTRL | SC_MOD_LALT));
-
-    ok = sc_parse_shortcut_mods("rctrl,lalt", &mods);
-    assert(ok);
-    assert(mods.count == 2);
-    assert(mods.data[0] == SC_MOD_RCTRL);
-    assert(mods.data[1] == SC_MOD_LALT);
-
-    ok = sc_parse_shortcut_mods("lcmd,rcmd+lalt,lctrl+rctrl+ralt", &mods);
-    assert(ok);
-    assert(mods.count == 3);
-    assert(mods.data[0] == SC_MOD_LCMD);
-    assert(mods.data[1] == (SC_MOD_RCMD | SC_MOD_LALT));
-    assert(mods.data[2] == (SC_MOD_LCTRL | SC_MOD_RCTRL | SC_MOD_RALT));
-
-    ok = sc_parse_shortcut_mods("", &mods);
-    assert(!ok);
-
-    ok = sc_parse_shortcut_mods("lctrl+", &mods);
-    assert(!ok);
-
-    ok = sc_parse_shortcut_mods("lctrl,", &mods);
-    assert(!ok);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
     test_flag_version();
     test_flag_help();
     test_options();
     test_options2();
-    test_parse_shortcut_mods();
     return 0;
 };

app/tests/test_control_msg_serialize.c

@@ -9,20 +9,18 @@ static void test_serialize_inject_keycode(void) {
         .inject_keycode = {
             .action = AKEY_EVENT_ACTION_UP,
             .keycode = AKEYCODE_ENTER,
-            .repeat = 5,
             .metastate = AMETA_SHIFT_ON | AMETA_SHIFT_LEFT_ON,
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 14);
+    assert(size == 10);
 
     const unsigned char expected[] = {
         CONTROL_MSG_TYPE_INJECT_KEYCODE,
         0x01, // AKEY_EVENT_ACTION_UP
         0x00, 0x00, 0x00, 0x42, // AKEYCODE_ENTER
-        0x00, 0x00, 0x00, 0X05, // repeat
         0x00, 0x00, 0x00, 0x41, // AMETA_SHIFT_ON | AMETA_SHIFT_LEFT_ON
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
@@ -36,13 +34,13 @@ static void test_serialize_inject_text(void) {
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 18);
+    assert(size == 16);
 
     const unsigned char expected[] = {
         CONTROL_MSG_TYPE_INJECT_TEXT,
-        0x00, 0x00, 0x00, 0x0d, // text length
+        0x00, 0x0d, // text length
         'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
@@ -56,17 +54,15 @@ static void test_serialize_inject_text_long(void) {
     text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
     msg.inject_text.text = text;
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
+    assert(size == 3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
 
-    unsigned char expected[5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
+    unsigned char expected[3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
     expected[0] = CONTROL_MSG_TYPE_INJECT_TEXT;
-    expected[1] = 0x00;
+    expected[1] = 0x01;
-    expected[2] = 0x00;
+    expected[2] = 0x2c; // text length (16 bits)
-    expected[3] = 0x01;
+    memset(&expected[3], 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
-    expected[4] = 0x2c; // text length (32 bits)
-    memset(&expected[5], 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
 
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -92,7 +88,7 @@ static void test_serialize_inject_touch_event(void) {
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 28);
 
@@ -127,7 +123,7 @@ static void test_serialize_inject_scroll_event(void) {
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 21);
 
@@ -146,7 +142,7 @@ static void test_serialize_back_or_screen_on(void) {
         .type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 1);
 
@@ -161,7 +157,7 @@ static void test_serialize_expand_notification_panel(void) {
         .type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 1);
 
@@ -176,7 +172,7 @@ static void test_serialize_collapse_notification_panel(void) {
         .type = CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL,
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 1);
 
@@ -191,7 +187,7 @@ static void test_serialize_get_clipboard(void) {
         .type = CONTROL_MSG_TYPE_GET_CLIPBOARD,
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 1);
 
@@ -210,14 +206,14 @@ static void test_serialize_set_clipboard(void) {
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 19);
+    assert(size == 17);
 
     const unsigned char expected[] = {
         CONTROL_MSG_TYPE_SET_CLIPBOARD,
         1, // paste
-        0x00, 0x00, 0x00, 0x0d, // text length
+        0x00, 0x0d, // text length
         'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
@@ -231,7 +227,7 @@ static void test_serialize_set_screen_power_mode(void) {
         },
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 2);
 
@@ -247,7 +243,7 @@ static void test_serialize_rotate_device(void) {
         .type = CONTROL_MSG_TYPE_ROTATE_DEVICE,
     };
 
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
+    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
     assert(size == 1);
 
@@ -257,10 +253,7 @@ static void test_serialize_rotate_device(void) {
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
-    (void) argc;
-    (void) argv;
-
     test_serialize_inject_keycode();
     test_serialize_inject_text();
     test_serialize_inject_text_long();

app/tests/test_device_msg_deserialize.c

@@ -4,17 +4,16 @@
 #include "device_msg.h"
 
 #include <stdio.h>
-
 static void test_deserialize_clipboard(void) {
     const unsigned char input[] = {
         DEVICE_MSG_TYPE_CLIPBOARD,
-        0x00, 0x00, 0x00, 0x03, // text length
+        0x00, 0x03, // text length
         0x41, 0x42, 0x43, // "ABC"
     };
 
     struct device_msg msg;
     ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
-    assert(r == 8);
+    assert(r == 6);
 
     assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
     assert(msg.clipboard.text);
@@ -23,33 +22,7 @@ static void test_deserialize_clipboard(void) {
     device_msg_destroy(&msg);
 }
 
-static void test_deserialize_clipboard_big(void) {
+int main(void) {
-    unsigned char input[DEVICE_MSG_MAX_SIZE];
-    input[0] = DEVICE_MSG_TYPE_CLIPBOARD;
-    input[1] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0xff000000u) >> 24;
-    input[2] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0x00ff0000u) >> 16;
-    input[3] = (DEVICE_MSG_TEXT_MAX_LENGTH & 0x0000ff00u) >> 8;
-    input[4] =  DEVICE_MSG_TEXT_MAX_LENGTH & 0x000000ffu;
-
-    memset(input + 5, 'a', DEVICE_MSG_TEXT_MAX_LENGTH);
-
-    struct device_msg msg;
-    ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
-    assert(r == DEVICE_MSG_MAX_SIZE);
-
-    assert(msg.type == DEVICE_MSG_TYPE_CLIPBOARD);
-    assert(msg.clipboard.text);
-    assert(strlen(msg.clipboard.text) == DEVICE_MSG_TEXT_MAX_LENGTH);
-    assert(msg.clipboard.text[0] == 'a');
-
-    device_msg_destroy(&msg);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
     test_deserialize_clipboard();
-    test_deserialize_clipboard_big();
     return 0;
 }

app/tests/test_queue.c

@@ -32,10 +32,7 @@ static void test_queue(void) {
     assert(queue_is_empty(&queue));
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
-    (void) argc;
-    (void) argv;
-
     test_queue();
     return 0;
 }

app/tests/test_strutil.c

@@ -286,10 +286,7 @@ static void test_parse_integer_with_suffix(void) {
     assert(!ok);
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
-    (void) argc;
-    (void) argv;
-
     test_xstrncpy_simple();
     test_xstrncpy_just_fit();
     test_xstrncpy_truncated();

server/build_without_gradle.sh

@@ -42,6 +42,8 @@ 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
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
+    android/content/IOnPrimaryClipChangedListener.aidl
 
 echo "Compiling java sources..."
 cd ../java
@@ -55,6 +57,7 @@ cd "$CLASSES_DIR"
 "$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
     --output "$BUILD_DIR/classes.dex" \
     android/view/*.class \
+    android/content/*.class \
     com/genymobile/scrcpy/*.class \
     com/genymobile/scrcpy/wrappers/*.class
 

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

@@ -19,19 +19,18 @@ public final class CleanUp {
         // not instantiable
     }
 
-    public static void configure(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {
+    public static void configure(boolean disableShowTouches, int restoreStayOn) throws IOException {
-        boolean needProcess = disableShowTouches || restoreStayOn != -1 || restoreNormalPowerMode;
+        boolean needProcess = disableShowTouches || restoreStayOn != -1;
         if (needProcess) {
-            startProcess(disableShowTouches, restoreStayOn, restoreNormalPowerMode);
+            startProcess(disableShowTouches, restoreStayOn);
         } else {
             // There is no additional clean up to do when scrcpy dies
             unlinkSelf();
         }
     }
 
-    private static void startProcess(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {
+    private static void startProcess(boolean disableShowTouches, int restoreStayOn) throws IOException {
-        String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(disableShowTouches), String.valueOf(
+        String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(disableShowTouches), String.valueOf(restoreStayOn)};
-                restoreStayOn), String.valueOf(restoreNormalPowerMode)};
 
         ProcessBuilder builder = new ProcessBuilder(cmd);
         builder.environment().put("CLASSPATH", SERVER_PATH);
@@ -60,7 +59,6 @@ public final class CleanUp {
 
         boolean disableShowTouches = Boolean.parseBoolean(args[0]);
         int restoreStayOn = Integer.parseInt(args[1]);
-        boolean restoreNormalPowerMode = Boolean.parseBoolean(args[2]);
 
         if (disableShowTouches || restoreStayOn != -1) {
             ServiceManager serviceManager = new ServiceManager();
@@ -75,10 +73,5 @@ public final class CleanUp {
                 }
             }
         }
-
-        if (restoreNormalPowerMode) {
-            Ln.i("Restoring normal power mode");
-            Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
-        }
     }
 }

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

@@ -17,6 +17,8 @@ public final class ControlMessage {
     public static final int TYPE_SET_SCREEN_POWER_MODE = 9;
     public static final int TYPE_ROTATE_DEVICE = 10;
 
+    public static final int FLAGS_PASTE = 1;
+
     private int type;
     private String text;
     private int metaState; // KeyEvent.META_*
@@ -28,18 +30,16 @@ public final class ControlMessage {
     private Position position;
     private int hScroll;
     private int vScroll;
-    private boolean paste;
+    private int flags;
-    private int repeat;
 
     private ControlMessage() {
     }
 
-    public static ControlMessage createInjectKeycode(int action, int keycode, int repeat, int metaState) {
+    public static ControlMessage createInjectKeycode(int action, int keycode, int metaState) {
         ControlMessage msg = new ControlMessage();
         msg.type = TYPE_INJECT_KEYCODE;
         msg.action = action;
         msg.keycode = keycode;
-        msg.repeat = repeat;
         msg.metaState = metaState;
         return msg;
     }
@@ -75,7 +75,9 @@ public final class ControlMessage {
         ControlMessage msg = new ControlMessage();
         msg.type = TYPE_SET_CLIPBOARD;
         msg.text = text;
-        msg.paste = paste;
+        if (paste) {
+            msg.flags = FLAGS_PASTE;
+        }
         return msg;
     }
 
@@ -139,11 +141,7 @@ public final class ControlMessage {
         return vScroll;
     }
 
-    public boolean getPaste() {
+    public int getFlags() {
-        return paste;
+        return flags;
-    }
-
-    public int getRepeat() {
-        return repeat;
     }
 }

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

@@ -8,19 +8,20 @@ import java.nio.charset.StandardCharsets;
 
 public class ControlMessageReader {
 
-    static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 13;
+    static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 9;
     static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 27;
     static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
     static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
     static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 1;
 
-    private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k
+    public static final int CLIPBOARD_TEXT_MAX_LENGTH = 4092; // 4096 - 1 (type) - 1 (parse flag) - 2 (length)
-
-    public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 6; // type: 1 byte; paste flag: 1 byte; length: 4 bytes
     public static final int INJECT_TEXT_MAX_LENGTH = 300;
 
-    private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
+    private static final int RAW_BUFFER_SIZE = 4096;
+
+    private final byte[] rawBuffer = new byte[RAW_BUFFER_SIZE];
     private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
+    private final byte[] textBuffer = new byte[CLIPBOARD_TEXT_MAX_LENGTH];
 
     public ControlMessageReader() {
         // invariant: the buffer is always in "get" mode
@@ -98,23 +99,20 @@ public class ControlMessageReader {
         }
         int action = toUnsigned(buffer.get());
         int keycode = buffer.getInt();
-        int repeat = buffer.getInt();
         int metaState = buffer.getInt();
-        return ControlMessage.createInjectKeycode(action, keycode, repeat, metaState);
+        return ControlMessage.createInjectKeycode(action, keycode, metaState);
     }
 
     private String parseString() {
-        if (buffer.remaining() < 4) {
+        if (buffer.remaining() < 2) {
             return null;
         }
-        int len = buffer.getInt();
+        int len = toUnsigned(buffer.getShort());
         if (buffer.remaining() < len) {
             return null;
         }
-        int position = buffer.position();
+        buffer.get(textBuffer, 0, len);
-        // Move the buffer position to consume the text
+        return new String(textBuffer, 0, len, StandardCharsets.UTF_8);
-        buffer.position(position + len);
-        return new String(rawBuffer, position, len, StandardCharsets.UTF_8);
     }
 
     private ControlMessage parseInjectText() {
@@ -154,12 +152,12 @@ public class ControlMessageReader {
         if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
             return null;
         }
-        boolean paste = buffer.get() != 0;
+        boolean parse = buffer.get() != 0;
         String text = parseString();
         if (text == null) {
             return null;
         }
-        return ControlMessage.createSetClipboard(text, paste);
+        return ControlMessage.createSetClipboard(text, parse);
     }
 
     private ControlMessage parseSetScreenPowerMode() {

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

@@ -48,10 +48,10 @@ public class Controller {
     public void control() throws IOException {
         // on start, power on the device
         if (!device.isScreenOn()) {
-            device.injectKeycode(KeyEvent.KEYCODE_WAKEUP);
+            device.injectKeycode(KeyEvent.KEYCODE_POWER);
 
             // dirty hack
-            // After the keycode is injected, the device is powered on asynchronously.
+            // After POWER is injected, the device is powered on asynchronously.
             // To turn the device screen off while mirroring, the client will send a message that
             // would be handled before the device is actually powered on, so its effect would
             // be "canceled" once the device is turned back on.
@@ -74,7 +74,7 @@ public class Controller {
         switch (msg.getType()) {
             case ControlMessage.TYPE_INJECT_KEYCODE:
                 if (device.supportsInputEvents()) {
-                    injectKeycode(msg.getAction(), msg.getKeycode(), msg.getRepeat(), msg.getMetaState());
+                    injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState());
                 }
                 break;
             case ControlMessage.TYPE_INJECT_TEXT:
@@ -110,12 +110,13 @@ public class Controller {
                 }
                 break;
             case ControlMessage.TYPE_SET_CLIPBOARD:
-                setClipboard(msg.getText(), msg.getPaste());
+                boolean paste = (msg.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
+                setClipboard(msg.getText(), paste);
                 break;
             case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                 if (device.supportsInputEvents()) {
                     int mode = msg.getAction();
-                    boolean setPowerModeOk = Device.setScreenPowerMode(mode);
+                    boolean setPowerModeOk = device.setScreenPowerMode(mode);
                     if (setPowerModeOk) {
                         Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
                     }
@@ -129,8 +130,8 @@ public class Controller {
         }
     }
 
-    private boolean injectKeycode(int action, int keycode, int repeat, int metaState) {
+    private boolean injectKeycode(int action, int keycode, int metaState) {
-        return device.injectKeyEvent(action, keycode, repeat, metaState);
+        return device.injectKeyEvent(action, keycode, 0, metaState);
     }
 
     private boolean injectChar(char c) {
@@ -165,7 +166,7 @@ public class Controller {
 
         Point point = device.getPhysicalPoint(position);
         if (point == null) {
-            Ln.w("Ignore touch event, it was generated for a different device size");
+            // ignore event
             return false;
         }
 
@@ -224,7 +225,7 @@ public class Controller {
     }
 
     private boolean pressBackOrTurnScreenOn() {
-        int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_WAKEUP;
+        int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
         return device.injectKeycode(keycode);
     }
 

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

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy;
 
-import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
@@ -81,28 +80,23 @@ public final class Device {
 
         if (options.getControl()) {
             // If control is enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = serviceManager.getClipboardManager();
+            serviceManager.getClipboardManager().addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
-            if (clipboardManager != null) {
+                @Override
-                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
+                public void dispatchPrimaryClipChanged() {
-                    @Override
+                    if (isSettingClipboard.get()) {
-                    public void dispatchPrimaryClipChanged() {
+                        // This is a notification for the change we are currently applying, ignore it
-                        if (isSettingClipboard.get()) {
+                        return;
-                            // This is a notification for the change we are currently applying, ignore it
+                    }
-                            return;
+                    synchronized (Device.this) {
-                        }
+                        if (clipboardListener != null) {
-                        synchronized (Device.this) {
+                            String text = getClipboardText();
-                            if (clipboardListener != null) {
+                            if (text != null) {
-                                String text = getClipboardText();
+                                clipboardListener.onClipboardTextChanged(text);
-                                if (text != null) {
-                                    clipboardListener.onClipboardTextChanged(text);
-                                }
                             }
                         }
                     }
-                });
+                }
-            } else {
+            });
-                Ln.w("No clipboard manager, copy-paste between device and computer will not work");
-            }
         }
 
         if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
@@ -205,11 +199,7 @@ public final class Device {
     }
 
     public String getClipboardText() {
-        ClipboardManager clipboardManager = serviceManager.getClipboardManager();
+        CharSequence s = serviceManager.getClipboardManager().getText();
-        if (clipboardManager == null) {
-            return null;
-        }
-        CharSequence s = clipboardManager.getText();
         if (s == null) {
             return null;
         }
@@ -217,30 +207,16 @@ public final class Device {
     }
 
     public boolean setClipboardText(String text) {
-        ClipboardManager clipboardManager = serviceManager.getClipboardManager();
-        if (clipboardManager == null) {
-            return false;
-        }
-
-        String currentClipboard = getClipboardText();
-        if (currentClipboard == null || currentClipboard.equals(text)) {
-            // The clipboard already contains the requested text.
-            // Since pasting text from the computer involves setting the device clipboard, it could be set twice on a copy-paste. This would cause
-            // the clipboard listeners to be notified twice, and that would flood the Android keyboard clipboard history. To workaround this
-            // problem, do not explicitly set the clipboard text if it already contains the expected content.
-            return false;
-        }
-
         isSettingClipboard.set(true);
-        boolean ok = clipboardManager.setText(text);
+        boolean ok = serviceManager.getClipboardManager().setText(text);
         isSettingClipboard.set(false);
         return ok;
     }
 
     /**
-     * @param mode one of the {@code POWER_MODE_*} constants
+     * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
      */
-    public static boolean setScreenPowerMode(int mode) {
+    public boolean setScreenPowerMode(int mode) {
         IBinder d = SurfaceControl.getBuiltInDisplay();
         if (d == null) {
             Ln.e("Could not get built-in display");

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

@@ -7,10 +7,10 @@ import java.nio.charset.StandardCharsets;
 
 public class DeviceMessageWriter {
 
-    private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k
+    public static final int CLIPBOARD_TEXT_MAX_LENGTH = 4093;
-    public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 5; // type: 1 byte; length: 4 bytes
+    private static final int MAX_EVENT_SIZE = CLIPBOARD_TEXT_MAX_LENGTH + 3;
 
-    private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
+    private final byte[] rawBuffer = new byte[MAX_EVENT_SIZE];
     private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
 
     public void writeTo(DeviceMessage msg, OutputStream output) throws IOException {
@@ -21,7 +21,7 @@ public class DeviceMessageWriter {
                 String text = msg.getText();
                 byte[] raw = text.getBytes(StandardCharsets.UTF_8);
                 int len = StringUtils.getUtf8TruncationIndex(raw, CLIPBOARD_TEXT_MAX_LENGTH);
-                buffer.putInt(len);
+                buffer.putShort((short) len);
                 buffer.put(raw, 0, len);
                 output.write(rawBuffer, 0, buffer.position());
                 break;

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

@@ -49,7 +49,7 @@ public final class Server {
             }
         }
 
-        CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn, true);
+        CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn);
 
         boolean tunnelForward = options.isTunnelForward();
 

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

@@ -77,14 +77,7 @@ public final class ServiceManager {
 
     public ClipboardManager getClipboardManager() {
         if (clipboardManager == null) {
-            IInterface clipboard = getService("clipboard", "android.content.IClipboard");
+            clipboardManager = new ClipboardManager(getService("clipboard", "android.content.IClipboard"));
-            if (clipboard == null) {
-                // Some devices have no clipboard manager
-                // <https://github.com/Genymobile/scrcpy/issues/1440>
-                // <https://github.com/Genymobile/scrcpy/issues/1556>
-                return null;
-            }
-            clipboardManager = new ClipboardManager(clipboard);
         }
         return clipboardManager;
     }

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

@@ -25,7 +25,6 @@ public class ControlMessageReaderTest {
         dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
         dos.writeByte(KeyEvent.ACTION_UP);
         dos.writeInt(KeyEvent.KEYCODE_ENTER);
-        dos.writeInt(5); // repeat
         dos.writeInt(KeyEvent.META_CTRL_ON);
         byte[] packet = bos.toByteArray();
 
@@ -38,7 +37,6 @@ public class ControlMessageReaderTest {
         Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
         Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
-        Assert.assertEquals(5, event.getRepeat());
         Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
     }
 
@@ -50,7 +48,7 @@ public class ControlMessageReaderTest {
         DataOutputStream dos = new DataOutputStream(bos);
         dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
         byte[] text = "testé".getBytes(StandardCharsets.UTF_8);
-        dos.writeInt(text.length);
+        dos.writeShort(text.length);
         dos.write(text);
         byte[] packet = bos.toByteArray();
 
@@ -70,7 +68,7 @@ public class ControlMessageReaderTest {
         dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
         byte[] text = new byte[ControlMessageReader.INJECT_TEXT_MAX_LENGTH];
         Arrays.fill(text, (byte) 'a');
-        dos.writeInt(text.length);
+        dos.writeShort(text.length);
         dos.write(text);
         byte[] packet = bos.toByteArray();
 
@@ -220,7 +218,7 @@ public class ControlMessageReaderTest {
         dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
         dos.writeByte(1); // paste
         byte[] text = "testé".getBytes(StandardCharsets.UTF_8);
-        dos.writeInt(text.length);
+        dos.writeShort(text.length);
         dos.write(text);
 
         byte[] packet = bos.toByteArray();
@@ -230,7 +228,9 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals("testé", event.getText());
-        Assert.assertTrue(event.getPaste());
+
+        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
+        Assert.assertTrue(parse);
     }
 
     @Test
@@ -246,7 +246,7 @@ public class ControlMessageReaderTest {
         Arrays.fill(rawText, (byte) 'a');
         String text = new String(rawText, 0, rawText.length);
 
-        dos.writeInt(rawText.length);
+        dos.writeShort(rawText.length);
         dos.write(rawText);
 
         byte[] packet = bos.toByteArray();
@@ -256,7 +256,9 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals(text, event.getText());
-        Assert.assertTrue(event.getPaste());
+
+        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
+        Assert.assertTrue(parse);
     }
 
     @Test
@@ -306,13 +308,11 @@ public class ControlMessageReaderTest {
         dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
         dos.writeByte(KeyEvent.ACTION_UP);
         dos.writeInt(KeyEvent.KEYCODE_ENTER);
-        dos.writeInt(0); // repeat
         dos.writeInt(KeyEvent.META_CTRL_ON);
 
         dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
         dos.writeByte(MotionEvent.ACTION_DOWN);
         dos.writeInt(MotionEvent.BUTTON_PRIMARY);
-        dos.writeInt(1); // repeat
         dos.writeInt(KeyEvent.META_CTRL_ON);
 
         byte[] packet = bos.toByteArray();
@@ -322,14 +322,12 @@ public class ControlMessageReaderTest {
         Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
         Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
-        Assert.assertEquals(0, event.getRepeat());
         Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
 
         event = reader.next();
         Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
         Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
-        Assert.assertEquals(1, event.getRepeat());
         Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
     }
 
@@ -343,7 +341,6 @@ public class ControlMessageReaderTest {
         dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
         dos.writeByte(KeyEvent.ACTION_UP);
         dos.writeInt(KeyEvent.KEYCODE_ENTER);
-        dos.writeInt(4); // repeat
         dos.writeInt(KeyEvent.META_CTRL_ON);
 
         dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
@@ -356,7 +353,6 @@ public class ControlMessageReaderTest {
         Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
         Assert.assertEquals(KeyEvent.KEYCODE_ENTER, event.getKeycode());
-        Assert.assertEquals(4, event.getRepeat());
         Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
 
         event = reader.next();
@@ -364,7 +360,6 @@ public class ControlMessageReaderTest {
 
         bos.reset();
         dos.writeInt(MotionEvent.BUTTON_PRIMARY);
-        dos.writeInt(5); // repeat
         dos.writeInt(KeyEvent.META_CTRL_ON);
         packet = bos.toByteArray();
         reader.readFrom(new ByteArrayInputStream(packet));
@@ -374,7 +369,6 @@ public class ControlMessageReaderTest {
         Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
         Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
         Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
-        Assert.assertEquals(5, event.getRepeat());
         Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
     }
 }

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

@@ -19,7 +19,7 @@ public class DeviceMessageWriterTest {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(bos);
         dos.writeByte(DeviceMessage.TYPE_CLIPBOARD);
-        dos.writeInt(data.length);
+        dos.writeShort(data.length);
         dos.write(data);
 
         byte[] expected = bos.toByteArray();