Synchronize device clipboard to computer

Automatically synchronize the device clipboard to the computer any time it changes. This allows seamless copy-paste from Android to the computer. Fixes #1056 <https://github.com/Genymobile/scrcpy/issues/1056#issuecomment-631363684>
2020-05-23 19:13:28 +02:00
30 changed files with 229 additions and 836 deletions
--- a/BUILD.md
+++ b/BUILD.md
@@ -249,10 +249,10 @@ You can then [run](README.md#run) _scrcpy_.

 ## Prebuilt server

- - [`scrcpy-server-v1.14`][direct-scrcpy-server]  
-   _(SHA-256: 1d1b18a2b80e956771fd63b99b414d2d028713a8f12ddfa5a369709ad4295620)_
+ - [`scrcpy-server-v1.13`][direct-scrcpy-server]  
+   _(SHA-256: 5fee64ca1ccdc2f38550f31f5353c66de3de30c2e929a964e30fa2d005d5f885)_

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.14/scrcpy-server-v1.14
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.13/scrcpy-server-v1.13

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# scrcpy (v1.14)
+# scrcpy (v1.13)

 This application provides display and control of Android devices connected on
 USB (or [over TCP/IP][article-tcpip]). It does not require any _root_ access.
@@ -69,10 +69,10 @@ hard).
 For Windows, for simplicity, a prebuilt archive with all the dependencies
 (including `adb`) is available:

- - [`scrcpy-win64-v1.14.zip`][direct-win64]  
-   _(SHA-256: 2be9139e46e29cf2f5f695848bb2b75a543b8f38be1133257dc5068252abc25f)_
+ - [`scrcpy-win64-v1.13.zip`][direct-win64]  
+   _(SHA-256: 806aafc00d4db01513193addaa24f47858893ba5efe75770bfef6ae1ea987d27)_

-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.14/scrcpy-win64-v1.14.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.13/scrcpy-win64-v1.13.zip

 It is also available in [Chocolatey]:

@@ -289,22 +289,6 @@ From another terminal:
 scrcpy
 ```

-To avoid enabling remote port forwarding, you could force a forward connection
-instead (notice the `-L` instead of `-R`):
-
-```bash
-adb kill-server    # kill the local adb server on 5037
-ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer
-# keep this open
-```
-
-From another terminal:
-
-```bash
-scrcpy --force-adb-forwrad
-```
-
-
 Like for wireless connections, it may be useful to reduce quality:

 ```
@@ -417,7 +401,7 @@ The secondary display may only be controlled if the device runs at least Android

 #### Stay awake

-To prevent the device to sleep after some delay when the device is plugged in:
+To prevent the device to sleep after some delay:

 ```bash
 scrcpy --stay-awake
@@ -439,7 +423,7 @@ scrcpy -S

 Or by pressing `Ctrl`+`o` at any time.

-To turn it back on, press `Ctrl`+`Shift`+`o` (or `POWER`, `Ctrl`+`p`).
+To turn it back on, press `POWER` (or `Ctrl`+`p`).

 It can be useful to also prevent the device to sleep:

@@ -494,8 +478,7 @@ It is possible to synchronize clipboards between the computer and the device, in
 both directions:

 - `Ctrl`+`c` copies the device clipboard to the computer clipboard;
- - `Ctrl`+`Shift`+`v` copies the computer clipboard to the device clipboard (and
-   pastes if the device runs Android >= 7);
+ - `Ctrl`+`Shift`+`v` copies the computer clipboard to the device clipboard;
 - `Ctrl`+`v` _pastes_ the computer clipboard as a sequence of text events (but
   breaks non-ASCII characters).

@@ -560,36 +543,32 @@ Also see [issue #14].

 ## Shortcuts

-_`Meta` is typically the `Windows` key on the keyboard, or `Cmd` on macOS._
-
- | Action                                               |   Shortcut
- | ---------------------------------------------------- |:-----------------------------
- | Switch fullscreen mode                               | `Meta`+`f`
- | Rotate display left                                  | `Meta`+`←` _(left)_
- | Rotate display right                                 | `Meta`+`→` _(right)_
- | Resize window to 1:1 (pixel-perfect)                 | `Meta`+`g`
- | Resize window to remove black borders                | `Meta`+`w` \| _Double-click¹_
- | Click on `HOME`                                      | `Meta`+`h` \| _Middle-click_
- | Click on `BACK`                                      | `Meta`+`b` \| _Right-click²_
- | Click on `APP_SWITCH`                                | `Meta`+`s`
- | Click on `MENU`                                      | `Meta`+`m`
- | Click on `VOLUME_UP`                                 | `Meta`+`↑` _(up)_
- | Click on `VOLUME_DOWN`                               | `Meta`+`↓` _(down)_
- | Click on `POWER`                                     | `Meta`+`p`
- | Power on                                             | _Right-click²_
- | Turn device screen off (keep mirroring)              | `Meta`+`o`
- | Turn device screen on                                | `Meta`+`Shift`+`o`
- | Rotate device screen                                 | `Meta`+`r`
- | Expand notification panel                            | `Meta`+`n`
- | Collapse notification panel                          | `Meta`+`Shift`+`n`
- | Press COPY³, then Copy device clipboard to computer  | `Meta`+`c`
- | Press CUT³                                           | `Meta`+`x`
- | Paste computer clipboard to device                   | `Meta`+`v`
- | Enable/disable FPS counter (on stdout)               | `Meta`+`i`
+ | Action                                 |   Shortcut                    |   Shortcut (macOS)
+ | -------------------------------------- |:----------------------------- |:-----------------------------
+ | Switch fullscreen mode                 | `Ctrl`+`f`                    | `Cmd`+`f`
+ | Rotate display left                    | `Ctrl`+`←` _(left)_           | `Cmd`+`←` _(left)_
+ | Rotate display right                   | `Ctrl`+`→` _(right)_          | `Cmd`+`→` _(right)_
+ | Resize window to 1:1 (pixel-perfect)   | `Ctrl`+`g`                    | `Cmd`+`g`
+ | Resize window to remove black borders  | `Ctrl`+`x` \| _Double-click¹_ | `Cmd`+`x`  \| _Double-click¹_
+ | Click on `HOME`                        | `Ctrl`+`h` \| _Middle-click_  | `Ctrl`+`h` \| _Middle-click_
+ | Click on `BACK`                        | `Ctrl`+`b` \| _Right-click²_  | `Cmd`+`b`  \| _Right-click²_
+ | Click on `APP_SWITCH`                  | `Ctrl`+`s`                    | `Cmd`+`s`
+ | Click on `MENU`                        | `Ctrl`+`m`                    | `Ctrl`+`m`
+ | Click on `VOLUME_UP`                   | `Ctrl`+`↑` _(up)_             | `Cmd`+`↑` _(up)_
+ | Click on `VOLUME_DOWN`                 | `Ctrl`+`↓` _(down)_           | `Cmd`+`↓` _(down)_
+ | Click on `POWER`                       | `Ctrl`+`p`                    | `Cmd`+`p`
+ | Power on                               | _Right-click²_                | _Right-click²_
+ | Turn device screen off (keep mirroring)| `Ctrl`+`o`                    | `Cmd`+`o`
+ | Rotate device screen                   | `Ctrl`+`r`                    | `Cmd`+`r`
+ | Expand notification panel              | `Ctrl`+`n`                    | `Cmd`+`n`
+ | Collapse notification panel            | `Ctrl`+`Shift`+`n`            | `Cmd`+`Shift`+`n`
+ | Copy device clipboard to computer      | `Ctrl`+`c`                    | `Cmd`+`c`
+ | Paste computer clipboard to device     | `Ctrl`+`v`                    | `Cmd`+`v`
+ | Copy computer clipboard to device      | `Ctrl`+`Shift`+`v`            | `Cmd`+`Shift`+`v`
+ | Enable/disable FPS counter (on stdout) | `Ctrl`+`i`                    | `Cmd`+`i`

 _¹Double-click on black borders to remove them._  
-_²Right-click turns the screen on if it was off, presses BACK otherwise._  
-_³Only if the device runs Android >= 7._
+_²Right-click turns the screen on if it was off, presses BACK otherwise._


 ## Custom paths
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -25,16 +25,6 @@ Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are

 Default is 8000000.

-.TP
-.BI "\-\-codec\-options " key[:type]=value[,...]
-Set a list of comma-separated key:type=value options for the device encoder.
-
-The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
-
-The list of possible codec options is available in the Android documentation
-.UR https://d.android.com/reference/android/media/MediaFormat
-.UE .
-
 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
@@ -52,10 +42,6 @@ The list of possible display ids can be listed by "adb shell dumpsys display"

 Default is 0.

-.TP
-.B \-\-force\-adb\-forward
-Do not attempt to use "adb reverse" to connect to the device.
-
 .TP
 .B \-f, \-\-fullscreen
 Start in fullscreen.
@@ -129,7 +115,6 @@ Force recording format (either mp4 or mkv).
 Request SDL to use the given render driver (this is just a hint).

 Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".
-
 .UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
 .UE

@@ -151,7 +136,7 @@ Turn the device screen off immediately.

 .TP
 .B \-t, \-\-show\-touches
-Enable "show touches" on start, restore the initial value on exit.
+Enable "show touches" on start, restore the initial value on exit..

 It only shows physical touches (not clicks from scrcpy).

@@ -159,15 +144,9 @@ It only shows physical touches (not clicks from scrcpy).
 .B \-v, \-\-version
 Print the version of scrcpy.

-.TP
-.BI "\-V, \-\-verbosity " value
-Set the log level ("debug", "info", "warn" or "error").
-
-Default is "info" for release builds, "debug" for debug builds.
-
 .TP
 .B \-w, \-\-stay-awake
-Keep the device on while scrcpy is running, when the device is plugged in.
+Keep the device on while scrcpy is running.

 .TP
 .B \-\-window\-borderless
@@ -204,51 +183,51 @@ Default is 0 (automatic).\n
 .SH SHORTCUTS

 .TP
-.B Meta+f
+.B Ctrl+f
 Switch fullscreen mode

 .TP
-.B Meta+Left
+.B Ctrl+Left
 Rotate display left

 .TP
-.B Meta+Right
+.B Ctrl+Right
 Rotate display right

 .TP
-.B Meta+g
+.B Ctrl+g
 Resize window to 1:1 (pixel\-perfect)

 .TP
-.B Meta+w, Double\-click on black borders
+.B Ctrl+x, Double\-click on black borders
 Resize window to remove black borders

 .TP
-.B Meta+h, Home, Middle\-click
+.B Ctrl+h, Home, Middle\-click
 Click on HOME

 .TP
-.B Meta+b, Meta+Backspace, Right\-click (when screen is on)
+.B Ctrl+b, Ctrl+Backspace, Right\-click (when screen is on)
 Click on BACK

 .TP
-.B Meta+s
+.B Ctrl+s
 Click on APP_SWITCH

 .TP
-.B Meta+m
+.B Ctrl+m
 Click on MENU

 .TP
-.B Meta+Up
+.B Ctrl+Up
 Click on VOLUME_UP

 .TP
-.B Meta+Down
+.B Ctrl+Down
 Click on VOLUME_DOWN

 .TP
-.B Meta+p
+.B Ctrl+p
 Click on POWER (turn screen on/off)

 .TP
@@ -256,39 +235,35 @@ Click on POWER (turn screen on/off)
 Turn screen on

 .TP
-.B Meta+o
+.B Ctrl+o
 Turn device screen off (keep mirroring)

 .TP
-.B Meta+Shift+o
-Turn device screen on
-
-.TP
-.B Meta+r
+.B Ctrl+r
 Rotate device screen

 .TP
-.B Meta+n
+.B Ctrl+n
 Expand notification panel

 .TP
-.B Meta+Shift+n
+.B Ctrl+Shift+n
 Collapse notification panel

 .TP
-.B Meta+c
-Press COPY (Android >= 7), then copy device clipboard to computer
+.B Ctrl+c
+Copy device clipboard to computer

 .TP
-.B Meta+x
-Press CUT (Android >= 7)
-
-.TP
-.B Meta+v
+.B Ctrl+v
 Paste computer clipboard to device

 .TP
-.B Meta+i
+.B Ctrl+Shift+v
+Copy computer clipboard to device
+
+.TP
+.B Ctrl+i
 Enable/disable FPS counter (print frames/second in logs)

 .TP
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -13,9 +13,9 @@
 void
 scrcpy_print_usage(const char *arg0) {
 #ifdef __APPLE__
-# define MOD "Cmd"
+# define CTRL_OR_CMD "Cmd"
 #else
-# define MOD "Meta"
+# define CTRL_OR_CMD "Ctrl"
 #endif
    fprintf(stderr,
        "Usage: %s [options]\n"
@@ -30,15 +30,6 @@ scrcpy_print_usage(const char *arg0) {
        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
        "        Default is %d.\n"
        "\n"
-        "    --codec-options key[:type]=value[,...]\n"
-        "        Set a list of comma-separated key:type=value options for the\n"
-        "        device encoder.\n"
-        "        The possible values for 'type' are 'int' (default), 'long',\n"
-        "        'float' and 'string'.\n"
-        "        The list of possible codec options is available in the\n"
-        "        Android documentation:\n"
-        "        <https://d.android.com/reference/android/media/MediaFormat>\n"
-        "\n"
        "    --crop width:height:x:y\n"
        "        Crop the device screen on the server.\n"
        "        The values are expressed in the device natural orientation\n"
@@ -54,10 +45,6 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "        Default is 0.\n"
        "\n"
-        "    --force-adb-forward\n"
-        "        Do not attempt to use \"adb reverse\" to connect to the\n"
-        "        the device.\n"
-        "\n"
        "    -f, --fullscreen\n"
        "        Start in fullscreen.\n"
        "\n"
@@ -149,18 +136,9 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "    -v, --version\n"
        "        Print the version of scrcpy.\n"
-        "\n"
-        "    -V, --verbosity value\n"
-        "        Set the log level (debug, info, warn or error).\n"
-#ifndef NDEBUG
-        "        Default is debug.\n"
-#else
-        "        Default is info.\n"
-#endif
        "\n"
        "    -w, --stay-awake\n"
-        "        Keep the device on while scrcpy is running, when the device\n"
-        "        is plugged in.\n"
+        "        Keep the device on while scrcpy is running.\n"
        "\n"
        "    --window-borderless\n"
        "        Disable window decorations (display borderless window).\n"
@@ -186,19 +164,19 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "Shortcuts:\n"
        "\n"
-        "    " MOD "+f\n"
+        "    " CTRL_OR_CMD "+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"
@@ -206,55 +184,51 @@ scrcpy_print_usage(const char *arg0) {
        "    Middle-click\n"
        "        Click on HOME\n"
        "\n"
-        "    " MOD "+b\n"
-        "    " MOD "+Backspace\n"
+        "    " CTRL_OR_CMD "+b\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"
        "    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"
-        "        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"
-        "        Press COPY (Android >= 7), then copy device clipboard to\n"
-        "        computer\n"
+        "    " CTRL_OR_CMD "+c\n"
+        "        Copy device clipboard to computer\n"
        "\n"
-        "    " MOD "+x\n"
-        "        Press CUT (Android >= 7)\n"
-        "\n"
-        "    " MOD "+v\n"
+        "    " CTRL_OR_CMD "+v\n"
        "        Paste computer clipboard to device\n"
        "\n"
-        "    " MOD "+i\n"
+        "    " CTRL_OR_CMD "+Shift+v\n"
+        "        Copy computer clipboard to device\n"
+        "\n"
+        "    " CTRL_OR_CMD "+i\n"
        "        Enable/disable FPS counter (print frames/second in logs)\n"
        "\n"
        "    Drag & drop APK file\n"
@@ -265,7 +239,6 @@ scrcpy_print_usage(const char *arg0) {
        DEFAULT_LOCK_VIDEO_ORIENTATION, DEFAULT_LOCK_VIDEO_ORIENTATION >= 0 ? "" : " (unlocked)",
        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
-#undef MOD
 }

 static bool
@@ -451,32 +424,6 @@ parse_display_id(const char *s, uint16_t *display_id) {
    return true;
 }

-static bool
-parse_log_level(const char *s, enum sc_log_level *log_level) {
-    if (!strcmp(s, "debug")) {
-        *log_level = SC_LOG_LEVEL_DEBUG;
-        return true;
-    }
-
-    if (!strcmp(s, "info")) {
-        *log_level = SC_LOG_LEVEL_INFO;
-        return true;
-    }
-
-    if (!strcmp(s, "warn")) {
-        *log_level = SC_LOG_LEVEL_WARN;
-        return true;
-    }
-
-    if (!strcmp(s, "error")) {
-        *log_level = SC_LOG_LEVEL_ERROR;
-        return true;
-    }
-
-    LOGE("Could not parse log level: %s", s);
-    return false;
-}
-
 static bool
 parse_record_format(const char *optarg, enum recorder_format *format) {
    if (!strcmp(optarg, "mp4")) {
@@ -525,19 +472,14 @@ guess_record_format(const char *filename) {
 #define OPT_ROTATION               1015
 #define OPT_RENDER_DRIVER          1016
 #define OPT_NO_MIPMAPS             1017
-#define OPT_CODEC_OPTIONS          1018
-#define OPT_FORCE_ADB_FORWARD      1019

 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    static const struct option long_options[] = {
        {"always-on-top",          no_argument,       NULL, OPT_ALWAYS_ON_TOP},
        {"bit-rate",               required_argument, NULL, 'b'},
-        {"codec-options",          required_argument, NULL, OPT_CODEC_OPTIONS},
        {"crop",                   required_argument, NULL, OPT_CROP},
        {"display",                required_argument, NULL, OPT_DISPLAY_ID},
-        {"force-adb-forward",      no_argument,       NULL,
-                                                  OPT_FORCE_ADB_FORWARD},
        {"fullscreen",             no_argument,       NULL, 'f'},
        {"help",                   no_argument,       NULL, 'h'},
        {"lock-video-orientation", required_argument, NULL,
@@ -560,7 +502,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"show-touches",           no_argument,       NULL, 't'},
        {"stay-awake",             no_argument,       NULL, 'w'},
        {"turn-screen-off",        no_argument,       NULL, 'S'},
-        {"verbosity",              required_argument, NULL, 'V'},
        {"version",                no_argument,       NULL, 'v'},
        {"window-title",           required_argument, NULL, OPT_WINDOW_TITLE},
        {"window-x",               required_argument, NULL, OPT_WINDOW_X},
@@ -577,8 +518,8 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    optind = 0; // reset to start from the first argument in tests

    int c;
-    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTvV:w",
-                            long_options, NULL)) != -1) {
+    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTvw", long_options,
+                            NULL)) != -1) {
        switch (c) {
            case 'b':
                if (!parse_bit_rate(optarg, &opts->bit_rate)) {
@@ -657,11 +598,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
            case 'v':
                args->version = true;
                break;
-            case 'V':
-                if (!parse_log_level(optarg, &opts->log_level)) {
-                    return false;
-                }
-                break;
            case 'w':
                opts->stay_awake = true;
                break;
@@ -711,12 +647,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
            case OPT_NO_MIPMAPS:
                opts->mipmaps = false;
                break;
-            case OPT_CODEC_OPTIONS:
-                opts->codec_options = optarg;
-                break;
-            case OPT_FORCE_ADB_FORWARD:
-                opts->force_adb_forward = true;
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -66,15 +66,11 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
            buffer_write32be(&buf[17],
                             (uint32_t) msg->inject_scroll_event.vscroll);
            return 21;
-        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
-            buf[1] = msg->get_clipboard.copy;
-            return 2;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD: {
-            buf[1] = !!msg->set_clipboard.paste;
-            size_t len = write_string(msg->set_clipboard.text,
+            size_t len = write_string(msg->inject_text.text,
                                      CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH,
-                                      &buf[2]);
-            return 2 + len;
+                                      &buf[1]);
+            return 1 + len;
        }
        case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
            buf[1] = msg->set_screen_power_mode.mode;
@@ -82,6 +78,7 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
        case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL:
+        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
        case CONTROL_MSG_TYPE_ROTATE_DEVICE:
            // no additional data
            return 1;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -11,9 +11,9 @@
 #include "common.h"

 #define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300
-#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4092
+#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4093
 #define CONTROL_MSG_SERIALIZED_MAX_SIZE \
-    (4 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)
+    (3 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)

 #define POINTER_ID_MOUSE UINT64_C(-1);

@@ -60,12 +60,8 @@ struct control_msg {
            int32_t hscroll;
            int32_t vscroll;
        } inject_scroll_event;
-        struct {
-            bool copy;
-        } get_clipboard;
        struct {
            char *text; // owned, to be freed by SDL_free()
-            bool paste;
        } set_clipboard;
        struct {
            enum screen_power_mode mode;
--- a/app/src/event_converter.c
+++ b/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))) {
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -70,11 +70,6 @@ action_menu(struct controller *controller, int actions) {
    send_keycode(controller, AKEYCODE_MENU, actions, "MENU");
 }

-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) {
@@ -107,10 +102,9 @@ collapse_notification_panel(struct controller *controller) {
 }

 static void
-request_device_clipboard(struct controller *controller, bool copy) {
+request_device_clipboard(struct controller *controller) {
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_GET_CLIPBOARD;
-    msg.get_clipboard.copy = copy;

    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request device clipboard");
@@ -118,7 +112,7 @@ request_device_clipboard(struct controller *controller, bool copy) {
 }

 static void
-set_device_clipboard(struct controller *controller, bool paste) {
+set_device_clipboard(struct controller *controller) {
    char *text = SDL_GetClipboardText();
    if (!text) {
        LOGW("Could not get clipboard text: %s", SDL_GetError());
@@ -133,7 +127,6 @@ set_device_clipboard(struct controller *controller, bool paste) {
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_SET_CLIPBOARD;
    msg.set_clipboard.text = text;
-    msg.set_clipboard.paste = paste;

    if (!controller_push_msg(controller, &msg)) {
        SDL_free(text);
@@ -268,128 +261,131 @@ input_manager_process_key(struct input_manager *im,
    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);
-    bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT);
+
+    // 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 is not forwarded to the device
+        // 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;
-    bool down = event->type == SDL_KEYDOWN;
-
-    // Capture all Meta events
-    if (meta) {
-        if (ctrl) {
-            // No shortcuts involve Ctrl+Meta
-            return;
-        }
-
+    // capture all Ctrl events
+    if (ctrl || cmd) {
+        SDL_Keycode keycode = event->keysym.sym;
+        bool down = event->type == SDL_KEYDOWN;
        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) {
-                    enum screen_power_mode mode = shift
-                                                ? SCREEN_POWER_MODE_NORMAL
-                                                : SCREEN_POWER_MODE_OFF;
-                    set_screen_power_mode(controller, mode);
+                if (control && cmd && !shift && down) {
+                    set_screen_power_mode(controller, SCREEN_POWER_MODE_OFF);
                }
                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 && down) {
-                    // Press COPY, then get the clipboard content
-                    request_device_clipboard(controller, true);
-                }
-                return;
-            case SDLK_x:
-                if (control && !shift && !repeat && down) {
-                    // For convenience (especially on macOS), bind Meta+x to
-                    // CUT (even if it is already accessible by pressing Ctrl+x
-                    // on the device)
-                    action_cut(controller, action);
+                if (control && cmd && !shift && !repeat && down) {
+                    request_device_clipboard(controller);
                }
                return;
            case SDLK_v:
-                if (control && !shift && !repeat && down) {
-                    // Inject the text as input events
-                    clipboard_paste(controller);
+                if (control && cmd && !repeat && down) {
+                    if (shift) {
+                        // store the text in the device clipboard
+                        set_device_clipboard(controller);
+                    } 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:
-                if (!shift && !repeat && down) {
+            case SDLK_x:
+                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 {
@@ -398,7 +394,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;
@@ -411,14 +407,6 @@ input_manager_process_key(struct input_manager *im,
        return;
    }

-    assert(!meta);
-
-    if (ctrl && !shift && keycode == SDLK_v && down) {
-        // Synchronize the computer clipboard to the device clipboard before
-        // sending Ctrl+v
-        set_device_clipboard(controller, false);
-    }
-
    struct control_msg msg;
    if (convert_input_key(event, &msg, im->prefer_text)) {
        if (!controller_push_msg(controller, &msg)) {
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -29,24 +29,6 @@ print_version(void) {
                                               LIBAVUTIL_VERSION_MICRO);
 }

-static SDL_LogPriority
-convert_log_level_to_sdl(enum sc_log_level level) {
-    switch (level) {
-        case SC_LOG_LEVEL_DEBUG:
-            return SDL_LOG_PRIORITY_DEBUG;
-        case SC_LOG_LEVEL_INFO:
-            return SDL_LOG_PRIORITY_INFO;
-        case SC_LOG_LEVEL_WARN:
-            return SDL_LOG_PRIORITY_WARN;
-        case SC_LOG_LEVEL_ERROR:
-            return SDL_LOG_PRIORITY_ERROR;
-        default:
-            assert(!"unexpected log level");
-            return SC_LOG_LEVEL_INFO;
-    }
-}
-
-
 int
 main(int argc, char *argv[]) {
 #ifdef __WINDOWS__
@@ -56,23 +38,20 @@ main(int argc, char *argv[]) {
    setbuf(stderr, NULL);
 #endif

+#ifndef NDEBUG
+    SDL_LogSetAllPriority(SDL_LOG_PRIORITY_DEBUG);
+#endif
+
    struct scrcpy_cli_args args = {
        .opts = SCRCPY_OPTIONS_DEFAULT,
        .help = false,
        .version = false,
    };

-#ifndef NDEBUG
-    args.opts.log_level = SC_LOG_LEVEL_DEBUG;
-#endif
-
    if (!scrcpy_parse_args(&args, argc, argv)) {
        return 1;
    }

-    SDL_LogPriority sdl_log = convert_log_level_to_sdl(args.opts.log_level);
-    SDL_LogSetAllPriority(sdl_log);
-
    if (args.help) {
        scrcpy_print_usage(argv[0]);
        return 0;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -293,7 +293,6 @@ bool
 scrcpy(const struct scrcpy_options *options) {
    bool record = !!options->record_filename;
    struct server_params params = {
-        .log_level = options->log_level,
        .crop = options->crop,
        .port_range = options->port_range,
        .max_size = options->max_size,
@@ -304,8 +303,6 @@ scrcpy(const struct scrcpy_options *options) {
        .display_id = options->display_id,
        .show_touches = options->show_touches,
        .stay_awake = options->stay_awake,
-        .codec_options = options->codec_options,
-        .force_adb_forward = options->force_adb_forward,
    };
    if (!server_start(&server, options->serial, &params)) {
        return false;
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -8,7 +8,6 @@
 #include "common.h"
 #include "input_manager.h"
 #include "recorder.h"
-#include "util/log.h"

 struct scrcpy_options {
    const char *serial;
@@ -17,8 +16,6 @@ struct scrcpy_options {
    const char *window_title;
    const char *push_target;
    const char *render_driver;
-    const char *codec_options;
-    enum sc_log_level log_level;
    enum recorder_format record_format;
    struct port_range port_range;
    uint16_t max_size;
@@ -42,7 +39,6 @@ struct scrcpy_options {
    bool window_borderless;
    bool mipmaps;
    bool stay_awake;
-    bool force_adb_forward;
 };

 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -52,8 +48,6 @@ struct scrcpy_options {
    .window_title = NULL, \
    .push_target = NULL, \
    .render_driver = NULL, \
-    .codec_options = NULL, \
-    .log_level = SC_LOG_LEVEL_INFO, \
    .record_format = RECORDER_FORMAT_AUTO, \
    .port_range = { \
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
@@ -80,7 +74,6 @@ struct scrcpy_options {
    .window_borderless = false, \
    .mipmaps = true, \
    .stay_awake = false, \
-    .force_adb_forward = false, \
 }

 bool
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -217,46 +217,24 @@ enable_tunnel_forward_any_port(struct server *server,
 }

 static bool
-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"
-        if (enable_tunnel_reverse_any_port(server, port_range)) {
-            return true;
-        }
-
-        // if "adb reverse" does not work (e.g. over "adb connect"), it
-        // fallbacks to "adb forward", so the app socket is the client
-
-        LOGW("'adb reverse' failed, fallback to 'adb forward'");
+enable_tunnel_any_port(struct server *server, struct port_range port_range) {
+    if (enable_tunnel_reverse_any_port(server, port_range)) {
+        return true;
    }

+    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
+    // "adb forward", so the app socket is the client
+
+    LOGW("'adb reverse' failed, fallback to 'adb forward'");
    return enable_tunnel_forward_any_port(server, port_range);
 }

-static const char *
-log_level_to_server_string(enum sc_log_level level) {
-    switch (level) {
-        case SC_LOG_LEVEL_DEBUG:
-            return "debug";
-        case SC_LOG_LEVEL_INFO:
-            return "info";
-        case SC_LOG_LEVEL_WARN:
-            return "warn";
-        case SC_LOG_LEVEL_ERROR:
-            return "error";
-        default:
-            assert(!"unexpected log level");
-            return "(unknown)";
-    }
-}
-
 static process_t
 execute_server(struct server *server, const struct server_params *params) {
    char max_size_string[6];
    char bit_rate_string[11];
    char max_fps_string[6];
-    char lock_video_orientation_string[5];
+    char lock_video_orientation_string[3];
    char display_id_string[6];
    sprintf(max_size_string, "%"PRIu16, params->max_size);
    sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
@@ -281,7 +259,6 @@ execute_server(struct server *server, const struct server_params *params) {
        "/", // unused
        "com.genymobile.scrcpy.Server",
        SCRCPY_VERSION,
-        log_level_to_server_string(params->log_level),
        max_size_string,
        bit_rate_string,
        max_fps_string,
@@ -293,7 +270,6 @@ execute_server(struct server *server, const struct server_params *params) {
        display_id_string,
        params->show_touches ? "true" : "false",
        params->stay_awake ? "true" : "false",
-        params->codec_options ? params->codec_options : "-",
    };
 #ifdef SERVER_DEBUGGER
    LOGI("Server debugger waiting for a client on device port "
@@ -389,8 +365,7 @@ server_start(struct server *server, const char *serial,
        goto error1;
    }

-    if (!enable_tunnel_any_port(server, params->port_range,
-                                params->force_adb_forward)) {
+    if (!enable_tunnel_any_port(server, params->port_range)) {
        goto error1;
    }

--- a/app/src/server.h
+++ b/app/src/server.h
@@ -9,7 +9,6 @@
 #include "config.h"
 #include "command.h"
 #include "common.h"
-#include "util/log.h"
 #include "util/net.h"

 struct server {
@@ -44,9 +43,7 @@ struct server {
 }

 struct server_params {
-    enum sc_log_level log_level;
    const char *crop;
-    const char *codec_options;
    struct port_range port_range;
    uint16_t max_size;
    uint32_t bit_rate;
@@ -56,7 +53,6 @@ struct server_params {
    uint16_t display_id;
    bool show_touches;
    bool stay_awake;
-    bool force_adb_forward;
 };

 // init default values
--- a/app/src/util/log.h
+++ b/app/src/util/log.h
@@ -3,13 +3,6 @@

 #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__)
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -185,18 +185,14 @@ static void test_serialize_collapse_notification_panel(void) {
 static void test_serialize_get_clipboard(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_GET_CLIPBOARD,
-        .get_clipboard = {
-            .copy = true,
-        },
    };

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

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_GET_CLIPBOARD,
-        1, // copy
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -204,19 +200,17 @@ static void test_serialize_get_clipboard(void) {
 static void test_serialize_set_clipboard(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        .set_clipboard = {
-            .paste = true,
+        .inject_text = {
            .text = "hello, world!",
        },
    };

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

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        1, // paste
        0x00, 0x0d, // text length
        'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
    };
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '1.14',
+        version: '1.13',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/prebuilt-deps/Makefile
+++ b/prebuilt-deps/Makefile
@@ -35,6 +35,6 @@ prepare-sdl2:
 		SDL2-2.0.12

 prepare-adb:
-	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r30.0.0-windows.zip \
-		854305f9a702f5ea2c3de73edde402bd26afa0ee944c9b0c4380420f5a862e0d \
+	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r29.0.5-windows.zip \
+		2df06160056ec9a84c7334af2a1e42740befbb1a2e34370e7af544a2cc78152c \
 		platform-tools
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -6,8 +6,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 16
-        versionName "1.14"
+        versionCode 15
+        versionName "1.13"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -12,7 +12,7 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.14
+SCRCPY_VERSION_NAME=1.13

 PLATFORM=${ANDROID_PLATFORM:-29}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}
--- a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
@@ -1,112 +0,0 @@
-package com.genymobile.scrcpy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CodecOption {
-    private String key;
-    private Object value;
-
-    public CodecOption(String key, Object value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public static List<CodecOption> parse(String codecOptions) {
-        if ("-".equals(codecOptions)) {
-            return null;
-        }
-
-        List<CodecOption> result = new ArrayList<>();
-
-        boolean escape = false;
-        StringBuilder buf = new StringBuilder();
-
-        for (char c : codecOptions.toCharArray()) {
-            switch (c) {
-                case '\\':
-                    if (escape) {
-                        buf.append('\\');
-                        escape = false;
-                    } else {
-                        escape = true;
-                    }
-                    break;
-                case ',':
-                    if (escape) {
-                        buf.append(',');
-                        escape = false;
-                    } else {
-                        // This comma is a separator between codec options
-                        String codecOption = buf.toString();
-                        result.add(parseOption(codecOption));
-                        // Clear buf
-                        buf.setLength(0);
-                    }
-                    break;
-                default:
-                    buf.append(c);
-                    break;
-            }
-        }
-
-        if (buf.length() > 0) {
-            String codecOption = buf.toString();
-            result.add(parseOption(codecOption));
-        }
-
-        return result;
-    }
-
-    private static CodecOption parseOption(String option) {
-        int equalSignIndex = option.indexOf('=');
-        if (equalSignIndex == -1) {
-            throw new IllegalArgumentException("'=' expected");
-        }
-        String keyAndType = option.substring(0, equalSignIndex);
-        if (keyAndType.length() == 0) {
-            throw new IllegalArgumentException("Key may not be null");
-        }
-
-        String key;
-        String type;
-
-        int colonIndex = keyAndType.indexOf(':');
-        if (colonIndex != -1) {
-            key = keyAndType.substring(0, colonIndex);
-            type = keyAndType.substring(colonIndex + 1);
-        } else {
-            key = keyAndType;
-            type = "int"; // assume int by default
-        }
-
-        Object value;
-        String valueString = option.substring(equalSignIndex + 1);
-        switch (type) {
-            case "int":
-                value = Integer.parseInt(valueString);
-                break;
-            case "long":
-                value = Long.parseLong(valueString);
-                break;
-            case "float":
-                value = Float.parseFloat(valueString);
-                break;
-            case "string":
-                value = valueString;
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid codec option type (int, long, float, str): " + type);
-        }
-
-        return new CodecOption(key, value);
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -28,7 +28,6 @@ public final class ControlMessage {
    private Position position;
    private int hScroll;
    private int vScroll;
-    private boolean pressCopyOrPaste;

    private ControlMessage() {
    }
@@ -69,18 +68,10 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createGetClipboard(boolean copy) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_GET_CLIPBOARD;
-        msg.pressCopyOrPaste = copy;
-        return msg;
-    }
-
-    public static ControlMessage createSetClipboard(String text, boolean paste) {
+    public static ControlMessage createSetClipboard(String text) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_SET_CLIPBOARD;
        msg.text = text;
-        msg.pressCopyOrPaste = paste;
        return msg;
    }

@@ -143,8 +134,4 @@ public final class ControlMessage {
    public int getVScroll() {
        return vScroll;
    }
-
-    public boolean getPressCopyOrPaste() {
-        return pressCopyOrPaste;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -12,13 +12,10 @@ public class ControlMessageReader {
    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 GET_CLIPBOARD_PAYLOAD_LENGTH = 1;
-    static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 1;

-    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 = 4093;
    public static final int INJECT_TEXT_MAX_LENGTH = 300;
-
-    private static final int RAW_BUFFER_SIZE = 4096;
+    private static final int RAW_BUFFER_SIZE = 1024;

    private final byte[] rawBuffer = new byte[RAW_BUFFER_SIZE];
    private final ByteBuffer buffer = ByteBuffer.wrap(rawBuffer);
@@ -68,9 +65,6 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                msg = parseInjectScrollEvent();
                break;
-            case ControlMessage.TYPE_GET_CLIPBOARD:
-                msg = parseGetClipboard();
-                break;
            case ControlMessage.TYPE_SET_CLIPBOARD:
                msg = parseSetClipboard();
                break;
@@ -80,6 +74,7 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
+            case ControlMessage.TYPE_GET_CLIPBOARD:
            case ControlMessage.TYPE_ROTATE_DEVICE:
                msg = ControlMessage.createEmpty(type);
                break;
@@ -151,24 +146,12 @@ public class ControlMessageReader {
        return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll);
    }

-    private ControlMessage parseGetClipboard() {
-        if (buffer.remaining() < GET_CLIPBOARD_PAYLOAD_LENGTH) {
-            return null;
-        }
-        boolean copy = buffer.get() != 0;
-        return ControlMessage.createGetClipboard(copy);
-    }
-
    private ControlMessage parseSetClipboard() {
-        if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
-            return null;
-        }
-        boolean parse = buffer.get() != 0;
        String text = parseString();
        if (text == null) {
            return null;
        }
-        return ControlMessage.createSetClipboard(text, parse);
+        return ControlMessage.createSetClipboard(text);
    }

    private ControlMessage parseSetScreenPowerMode() {
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -1,8 +1,10 @@
 package com.genymobile.scrcpy;

-import android.os.Build;
+import com.genymobile.scrcpy.wrappers.InputManager;
+
 import android.os.SystemClock;
 import android.view.InputDevice;
+import android.view.InputEvent;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -48,7 +50,7 @@ public class Controller {
    public void control() throws IOException {
        // on start, power on the device
        if (!device.isScreenOn()) {
-            device.injectKeycode(KeyEvent.KEYCODE_POWER);
+            injectKeycode(KeyEvent.KEYCODE_POWER);

            // dirty hack
            // After POWER is injected, the device is powered on asynchronously.
@@ -104,18 +106,15 @@ public class Controller {
                device.collapsePanels();
                break;
            case ControlMessage.TYPE_GET_CLIPBOARD:
-                getClipboard(msg.getPressCopyOrPaste());
+                String clipboardText = device.getClipboardText();
+                sender.pushClipboardText(clipboardText);
                break;
            case ControlMessage.TYPE_SET_CLIPBOARD:
-                setClipboard(msg.getText(), msg.getPressCopyOrPaste());
+                device.setClipboardText(msg.getText());
                break;
            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                if (device.supportsInputEvents()) {
-                    int mode = msg.getAction();
-                    boolean setPowerModeOk = device.setScreenPowerMode(mode);
-                    if (setPowerModeOk) {
-                        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
-                    }
+                    device.setScreenPowerMode(msg.getAction());
                }
                break;
            case ControlMessage.TYPE_ROTATE_DEVICE:
@@ -127,7 +126,7 @@ public class Controller {
    }

    private boolean injectKeycode(int action, int keycode, int metaState) {
-        return device.injectKeyEvent(action, keycode, 0, metaState);
+        return injectKeyEvent(action, keycode, 0, metaState);
    }

    private boolean injectChar(char c) {
@@ -138,7 +137,7 @@ public class Controller {
            return false;
        }
        for (KeyEvent event : events) {
-            if (!device.injectEvent(event)) {
+            if (!injectEvent(event)) {
                return false;
            }
        }
@@ -194,7 +193,7 @@ public class Controller {
        MotionEvent event = MotionEvent
                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
                        InputDevice.SOURCE_TOUCHSCREEN, 0);
-        return device.injectEvent(event);
+        return injectEvent(event);
    }

    private boolean injectScroll(Position position, int hScroll, int vScroll) {
@@ -217,42 +216,26 @@ public class Controller {
        MotionEvent event = MotionEvent
                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
                        InputDevice.SOURCE_TOUCHSCREEN, 0);
-        return device.injectEvent(event);
+        return injectEvent(event);
+    }
+
+    private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
+        long now = SystemClock.uptimeMillis();
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
+                InputDevice.SOURCE_KEYBOARD);
+        return injectEvent(event);
+    }
+
+    private boolean injectKeycode(int keyCode) {
+        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
+    }
+
+    private boolean injectEvent(InputEvent event) {
+        return device.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
    }

    private boolean pressBackOrTurnScreenOn() {
        int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
-        return device.injectKeycode(keycode);
-    }
-
-    private boolean getClipboard(boolean copy) {
-        // On Android >= 7, also press the COPY key if requested
-        if (copy && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
-            // If there is something to copy, the clipboard will be automatically sent to the computer clipboard via the ClipboardListener
-            return device.injectKeycode(KeyEvent.KEYCODE_COPY);
-        }
-
-        // We can't press COPY, so only synchronize the current clipboard
-        String clipboardText = device.getClipboardText();
-        if (clipboardText != null) {
-            sender.pushClipboardText(clipboardText);
-            return true;
-        }
-
-        return false;
-    }
-
-    private boolean setClipboard(String text, boolean paste) {
-        boolean ok = device.setClipboardText(text);
-        if (ok) {
-            Ln.i("Device clipboard set");
-        }
-
-        // On Android >= 7, also press the PASTE key if requested
-        if (paste && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
-            device.injectKeycode(KeyEvent.KEYCODE_PASTE);
-        }
-
-        return ok;
+        return injectKeycode(keycode);
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -10,14 +10,8 @@ import android.content.IOnPrimaryClipChangedListener;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
-import android.os.SystemClock;
 import android.view.IRotationWatcher;
-import android.view.InputDevice;
 import android.view.InputEvent;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-
-import java.util.concurrent.atomic.AtomicBoolean;

 public final class Device {

@@ -37,7 +31,6 @@ public final class Device {
    private ScreenInfo screenInfo;
    private RotationListener rotationListener;
    private ClipboardListener clipboardListener;
-    private final AtomicBoolean isSettingClipboard = new AtomicBoolean();

    /**
     * Logical display identifier
@@ -83,10 +76,6 @@ public final class Device {
            serviceManager.getClipboardManager().addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
                @Override
                public void dispatchPrimaryClipChanged() {
-                    if (isSettingClipboard.get()) {
-                        // This is a notification for the change we are currently applying, ignore it
-                        return;
-                    }
                    synchronized (Device.this) {
                        if (clipboardListener != null) {
                            String text = getClipboardText();
@@ -151,7 +140,7 @@ public final class Device {
        return supportsInputEvents;
    }

-    public boolean injectEvent(InputEvent inputEvent, int mode) {
+    public boolean injectInputEvent(InputEvent inputEvent, int mode) {
        if (!supportsInputEvents()) {
            throw new AssertionError("Could not inject input event if !supportsInputEvents()");
        }
@@ -163,21 +152,6 @@ public final class Device {
        return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
    }

-    public boolean injectEvent(InputEvent event) {
-        return injectEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
-    }
-
-    public boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
-        long now = SystemClock.uptimeMillis();
-        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                InputDevice.SOURCE_KEYBOARD);
-        return injectEvent(event);
-    }
-
-    public boolean injectKeycode(int keyCode) {
-        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
-    }
-
    public boolean isScreenOn() {
        return serviceManager.getPowerManager().isScreenOn();
    }
@@ -206,23 +180,26 @@ public final class Device {
        return s.toString();
    }

-    public boolean setClipboardText(String text) {
-        isSettingClipboard.set(true);
+    public void setClipboardText(String text) {
        boolean ok = serviceManager.getClipboardManager().setText(text);
-        isSettingClipboard.set(false);
-        return ok;
+        if (ok) {
+            Ln.i("Device clipboard set");
+        }
    }

    /**
     * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
     */
-    public boolean setScreenPowerMode(int mode) {
+    public void setScreenPowerMode(int mode) {
        IBinder d = SurfaceControl.getBuiltInDisplay();
        if (d == null) {
            Ln.e("Could not get built-in display");
-            return false;
+            return;
+        }
+        boolean ok = SurfaceControl.setDisplayPowerMode(d, mode);
+        if (ok) {
+            Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
        }
-        return SurfaceControl.setDisplayPowerMode(d, mode);
    }

    /**
--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Ln.java
@@ -15,25 +15,14 @@ public final class Ln {
        DEBUG, INFO, WARN, ERROR
    }

-    private static Level threshold = Level.INFO;
+    private static final Level THRESHOLD = BuildConfig.DEBUG ? Level.DEBUG : Level.INFO;

    private Ln() {
        // not instantiable
    }

-    /**
-     * Initialize the log level.
-     * <p>
-     * Must be called before starting any new thread.
-     *
-     * @param level the log level
-     */
-    public static void initLogLevel(Level level) {
-        threshold = level;
-    }
-
    public static boolean isEnabled(Level level) {
-        return level.ordinal() >= threshold.ordinal();
+        return level.ordinal() >= THRESHOLD.ordinal();
    }

    public static void d(String message) {
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -3,7 +3,6 @@ package com.genymobile.scrcpy;
 import android.graphics.Rect;

 public class Options {
-    private Ln.Level logLevel;
    private int maxSize;
    private int bitRate;
    private int maxFps;
@@ -15,15 +14,6 @@ public class Options {
    private int displayId;
    private boolean showTouches;
    private boolean stayAwake;
-    private String codecOptions;
-
-    public Ln.Level getLogLevel() {
-        return logLevel;
-    }
-
-    public void setLogLevel(Ln.Level logLevel) {
-        this.logLevel = logLevel;
-    }

    public int getMaxSize() {
        return maxSize;
@@ -112,12 +102,4 @@ public class Options {
    public void setStayAwake(boolean stayAwake) {
        this.stayAwake = stayAwake;
    }
-
-    public String getCodecOptions() {
-        return codecOptions;
-    }
-
-    public void setCodecOptions(String codecOptions) {
-        this.codecOptions = codecOptions;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -12,7 +12,6 @@ import android.view.Surface;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

 public class ScreenEncoder implements Device.RotationListener {
@@ -26,17 +25,15 @@ public class ScreenEncoder implements Device.RotationListener {
    private final AtomicBoolean rotationChanged = new AtomicBoolean();
    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);

-    private List<CodecOption> codecOptions;
    private int bitRate;
    private int maxFps;
    private boolean sendFrameMeta;
    private long ptsOrigin;

-    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, List<CodecOption> codecOptions) {
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps) {
        this.sendFrameMeta = sendFrameMeta;
        this.bitRate = bitRate;
        this.maxFps = maxFps;
-        this.codecOptions = codecOptions;
    }

    @Override
@@ -64,7 +61,7 @@ public class ScreenEncoder implements Device.RotationListener {
    }

    private void internalStreamScreen(Device device, FileDescriptor fd) throws IOException {
-        MediaFormat format = createFormat(bitRate, maxFps, codecOptions);
+        MediaFormat format = createFormat(bitRate, maxFps);
        device.setRotationListener(this);
        boolean alive;
        try {
@@ -154,24 +151,7 @@ public class ScreenEncoder implements Device.RotationListener {
        return MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_VIDEO_AVC);
    }

-    private static void setCodecOption(MediaFormat format, CodecOption codecOption) {
-        String key = codecOption.getKey();
-        Object value = codecOption.getValue();
-
-        if (value instanceof Integer) {
-            format.setInteger(key, (Integer) value);
-        } else if (value instanceof Long) {
-            format.setLong(key, (Long) value);
-        } else if (value instanceof Float) {
-            format.setFloat(key, (Float) value);
-        } else if (value instanceof String) {
-            format.setString(key, (String) value);
-        }
-
-        Ln.d("Codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
-    }
-
-    private static MediaFormat createFormat(int bitRate, int maxFps, List<CodecOption> codecOptions) {
+    private static MediaFormat createFormat(int bitRate, int maxFps) {
        MediaFormat format = new MediaFormat();
        format.setString(MediaFormat.KEY_MIME, MediaFormat.MIMETYPE_VIDEO_AVC);
        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
@@ -187,13 +167,6 @@ public class ScreenEncoder implements Device.RotationListener {
            // <https://github.com/Genymobile/scrcpy/issues/488#issuecomment-567321437>
            format.setFloat(KEY_MAX_FPS_TO_ENCODER, maxFps);
        }
-
-        if (codecOptions != null) {
-            for (CodecOption option : codecOptions) {
-                setCodecOption(format, option);
-            }
-        }
-
        return format;
    }

--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -8,8 +8,6 @@ import android.os.BatteryManager;
 import android.os.Build;

 import java.io.IOException;
-import java.util.List;
-import java.util.Locale;

 public final class Server {

@@ -21,7 +19,6 @@ public final class Server {
    private static void scrcpy(Options options) throws IOException {
        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
        final Device device = new Device(options);
-        List<CodecOption> codecOptions = CodecOption.parse(options.getCodecOptions());

        boolean mustDisableShowTouchesOnCleanUp = false;
        int restoreStayOn = -1;
@@ -52,9 +49,8 @@ public final class Server {
        CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn);

        boolean tunnelForward = options.isTunnelForward();
-
        try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
-            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(), codecOptions);
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps());

            if (options.getControl()) {
                final Controller controller = new Controller(device, connection);
@@ -120,53 +116,47 @@ public final class Server {
                    "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
        }

-        final int expectedParameters = 14;
+        final int expectedParameters = 12;
        if (args.length != expectedParameters) {
            throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
        }

        Options options = new Options();

-        Ln.Level level = Ln.Level.valueOf(args[1].toUpperCase(Locale.ENGLISH));
-        options.setLogLevel(level);
-
-        int maxSize = Integer.parseInt(args[2]) & ~7; // multiple of 8
+        int maxSize = Integer.parseInt(args[1]) & ~7; // multiple of 8
        options.setMaxSize(maxSize);

-        int bitRate = Integer.parseInt(args[3]);
+        int bitRate = Integer.parseInt(args[2]);
        options.setBitRate(bitRate);

-        int maxFps = Integer.parseInt(args[4]);
+        int maxFps = Integer.parseInt(args[3]);
        options.setMaxFps(maxFps);

-        int lockedVideoOrientation = Integer.parseInt(args[5]);
+        int lockedVideoOrientation = Integer.parseInt(args[4]);
        options.setLockedVideoOrientation(lockedVideoOrientation);

        // use "adb forward" instead of "adb tunnel"? (so the server must listen)
-        boolean tunnelForward = Boolean.parseBoolean(args[6]);
+        boolean tunnelForward = Boolean.parseBoolean(args[5]);
        options.setTunnelForward(tunnelForward);

-        Rect crop = parseCrop(args[7]);
+        Rect crop = parseCrop(args[6]);
        options.setCrop(crop);

-        boolean sendFrameMeta = Boolean.parseBoolean(args[8]);
+        boolean sendFrameMeta = Boolean.parseBoolean(args[7]);
        options.setSendFrameMeta(sendFrameMeta);

-        boolean control = Boolean.parseBoolean(args[9]);
+        boolean control = Boolean.parseBoolean(args[8]);
        options.setControl(control);

-        int displayId = Integer.parseInt(args[10]);
+        int displayId = Integer.parseInt(args[9]);
        options.setDisplayId(displayId);

-        boolean showTouches = Boolean.parseBoolean(args[11]);
+        boolean showTouches = Boolean.parseBoolean(args[10]);
        options.setShowTouches(showTouches);

-        boolean stayAwake = Boolean.parseBoolean(args[12]);
+        boolean stayAwake = Boolean.parseBoolean(args[11]);
        options.setStayAwake(stayAwake);

-        String codecOptions = args[13];
-        options.setCodecOptions(codecOptions);
-
        return options;
    }

@@ -219,9 +209,6 @@ public final class Server {
        });

        Options options = createOptions(args);
-
-        Ln.initLogLevel(options.getLogLevel());
-
        scrcpy(options);
    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
@@ -1,114 +0,0 @@
-package com.genymobile.scrcpy;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.List;
-
-public class CodecOptionsTest {
-
-    @Test
-    public void testIntegerImplicit() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key=5");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertEquals(5, option.getValue());
-    }
-
-    @Test
-    public void testInteger() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key:int=5");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Integer);
-        Assert.assertEquals(5, option.getValue());
-    }
-
-    @Test
-    public void testLong() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key:long=5");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Long);
-        Assert.assertEquals(5L, option.getValue());
-    }
-
-    @Test
-    public void testFloat() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key:float=4.5");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Float);
-        Assert.assertEquals(4.5f, option.getValue());
-    }
-
-    @Test
-    public void testString() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key:string=some_value");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof String);
-        Assert.assertEquals("some_value", option.getValue());
-    }
-
-    @Test
-    public void testStringEscaped() {
-        List<CodecOption> codecOptions = CodecOption.parse("some_key:string=warning\\,this_is_not=a_new_key");
-
-        Assert.assertEquals(1, codecOptions.size());
-
-        CodecOption option = codecOptions.get(0);
-        Assert.assertEquals("some_key", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof String);
-        Assert.assertEquals("warning,this_is_not=a_new_key", option.getValue());
-    }
-
-    @Test
-    public void testList() {
-        List<CodecOption> codecOptions = CodecOption.parse("a=1,b:int=2,c:long=3,d:float=4.5,e:string=a\\,b=c");
-
-        Assert.assertEquals(5, codecOptions.size());
-
-        CodecOption option;
-
-        option = codecOptions.get(0);
-        Assert.assertEquals("a", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Integer);
-        Assert.assertEquals(1, option.getValue());
-
-        option = codecOptions.get(1);
-        Assert.assertEquals("b", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Integer);
-        Assert.assertEquals(2, option.getValue());
-
-        option = codecOptions.get(2);
-        Assert.assertEquals("c", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Long);
-        Assert.assertEquals(3L, option.getValue());
-
-        option = codecOptions.get(3);
-        Assert.assertEquals("d", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof Float);
-        Assert.assertEquals(4.5f, option.getValue());
-
-        option = codecOptions.get(4);
-        Assert.assertEquals("e", option.getKey());
-        Assert.assertTrue(option.getValue() instanceof String);
-        Assert.assertEquals("a,b=c", option.getValue());
-    }
-}
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -200,7 +200,6 @@ public class ControlMessageReaderTest {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_GET_CLIPBOARD);
-        dos.writeByte(1); // copy

        byte[] packet = bos.toByteArray();

@@ -208,7 +207,6 @@ public class ControlMessageReaderTest {
        ControlMessage event = reader.next();

        Assert.assertEquals(ControlMessage.TYPE_GET_CLIPBOARD, event.getType());
-        Assert.assertTrue(event.getPressCopyOrPaste());
    }

    @Test
@@ -218,7 +216,6 @@ public class ControlMessageReaderTest {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
-        dos.writeByte(1); // paste
        byte[] text = "testé".getBytes(StandardCharsets.UTF_8);
        dos.writeShort(text.length);
        dos.write(text);
@@ -230,33 +227,6 @@ public class ControlMessageReaderTest {

        Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
        Assert.assertEquals("testé", event.getText());
-        Assert.assertTrue(event.getPressCopyOrPaste());
-    }
-
-    @Test
-    public void testParseBigSetClipboardEvent() throws IOException {
-        ControlMessageReader reader = new ControlMessageReader();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
-
-        byte[] rawText = new byte[ControlMessageReader.CLIPBOARD_TEXT_MAX_LENGTH];
-        dos.writeByte(1); // paste
-        Arrays.fill(rawText, (byte) 'a');
-        String text = new String(rawText, 0, rawText.length);
-
-        dos.writeShort(rawText.length);
-        dos.write(rawText);
-
-        byte[] packet = bos.toByteArray();
-
-        reader.readFrom(new ByteArrayInputStream(packet));
-        ControlMessage event = reader.next();
-
-        Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
-        Assert.assertEquals(text, event.getText());
-        Assert.assertTrue(event.getPressCopyOrPaste());
    }

    @Test