Make message buffer static

Now that the message max size is 256k, do not put the buffer on the
stack.

README.md

@@ -354,7 +354,7 @@ scrcpy --fullscreen
 scrcpy -f  # short version
 ```
 
-Fullscreen can then be toggled dynamically with `Ctrl`+`f`.
+Fullscreen can then be toggled dynamically with `RCtrl`+`f`.
 
 #### Rotation
 
@@ -370,18 +370,18 @@ Possibles values are:
  - `2`: 180 degrees
  - `3`: 90 degrees clockwise
 
-The rotation can also be changed dynamically with `Ctrl`+`←` _(left)_ and
+The rotation can also be changed dynamically with `RCtrl`+`←` _(left)_ and
-`Ctrl`+`→` _(right)_.
+`RCtrl`+`→` _(right)_.
 
 Note that _scrcpy_ manages 3 different rotations:
- - `Ctrl`+`r` requests the device to switch between portrait and landscape (the
+ - `RCtrl`+`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 `Ctrl`+`←`/`Ctrl`+`→`) rotates only the window content. This
+ - `--rotation` (or `RCtrl`+`←`/`RCtrl`+`→`) rotates only the window content.
-   affects only the display, not the recording.
+   This affects only the display, not the recording.
 
 
 ### Other mirroring options
@@ -437,9 +437,9 @@ scrcpy --turn-screen-off
 scrcpy -S
 ```
 
-Or by pressing `Ctrl`+`o` at any time.
+Or by pressing `RCtrl`+`o` at any time.
 
-To turn it back on, press `Ctrl`+`Shift`+`o` (or `POWER`, `Ctrl`+`p`).
+To turn it back on, press `RCtrl`+`Shift`+`o` (or `POWER`, `RCtrl`+`p`).
 
 It can be useful to also prevent the device to sleep:
 
@@ -479,39 +479,26 @@ 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 `Ctrl`+`r` to switch between portrait and landscape modes.
+Press `RCtrl`+`r` to switch between portrait and landscape modes.
 
 Note that it rotates only if the application in foreground supports the
 requested orientation.
 
 #### Copy-paste
 
-It is possible to synchronize clipboards between the computer and the device, in
+Any time the Android clipboard changes, it is automatically synchronized to the
-both directions:
+computer clipboard.
 
- - `Ctrl`+`c` copies the device clipboard to the computer clipboard;
+`Ctrl`+`c` (copy), `Ctrl`+`x` (cut) and `LCtrl`+`v` (paste) work as you expect.
- - `Ctrl`+`Shift`+`v` copies the computer clipboard to the device clipboard (and
+
-   pastes if the device runs Android >= 7);
+In addition, `RCtrl`+`v` allows to inject the computer clipboard content as a
- - `Ctrl`+`v` _pastes_ the computer clipboard as a sequence of text events (but
+sequence of text event. Even if it can break non-ASCII content, this is
-   breaks non-ASCII characters).
+sometimes necessary when pasting directly is not possible.
 
-Moreover, any time the Android clipboard changes, it is automatically
-synchronized to the computer clipboard.
 
 #### Text injection preference
 
@@ -571,30 +558,34 @@ Also see [issue #14].
 
 ## Shortcuts
 
- | Action                                      |   Shortcut                    |   Shortcut (macOS)
+`RCtrl` is the right `Ctrl` key (the left `Ctrl` key is forwarded to the
- | ------------------------------------------- |:----------------------------- |:-----------------------------
+device).
- | Switch fullscreen mode                      | `Ctrl`+`f`                    | `Cmd`+`f`
+
- | Rotate display left                         | `Ctrl`+`←` _(left)_           | `Cmd`+`←` _(left)_
+On macOS, `Cmd` also works (for shortcuts which are not already captured by the
- | Rotate display right                        | `Ctrl`+`→` _(right)_          | `Cmd`+`→` _(right)_
+system).
- | 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¹_
+ | Action                                      |   Shortcut
- | Click on `HOME`                             | `Ctrl`+`h` \| _Middle-click_  | `Ctrl`+`h` \| _Middle-click_
+ | ------------------------------------------- |:-----------------------------
- | Click on `BACK`                             | `Ctrl`+`b` \| _Right-click²_  | `Cmd`+`b`  \| _Right-click²_
+ | Switch fullscreen mode                      | `RCtrl`+`f`
- | Click on `APP_SWITCH`                       | `Ctrl`+`s`                    | `Cmd`+`s`
+ | Rotate display left                         | `RCtrl`+`←`
- | Click on `MENU`                             | `Ctrl`+`m`                    | `Ctrl`+`m`
+ | Rotate display right                        | `RCtrl`+`→`
- | Click on `VOLUME_UP`                        | `Ctrl`+`↑` _(up)_             | `Cmd`+`↑` _(up)_
+ | Resize window to 1:1 (pixel-perfect)        | `RCtrl`+`g`
- | Click on `VOLUME_DOWN`                      | `Ctrl`+`↓` _(down)_           | `Cmd`+`↓` _(down)_
+ | Resize window to remove black borders       | `RCtrl`+`w` \| _Double-click¹_
- | Click on `POWER`                            | `Ctrl`+`p`                    | `Cmd`+`p`
+ | Click on `HOME`                             | `RCtrl`+`h` \| _Middle-click_
- | Power on                                    | _Right-click²_                | _Right-click²_
+ | Click on `BACK`                             | `RCtrl`+`b` \| _Right-click²_
- | Turn device screen off (keep mirroring)     | `Ctrl`+`o`                    | `Cmd`+`o`
+ | Click on `APP_SWITCH`                       | `RCtrl`+`s`
- | Turn device screen on                       | `Ctrl`+`Shift`+`o`            | `Cmd`+`Shift`+`o`
+ | Click on `MENU`                             | `RCtrl`+`m`
- | Rotate device screen                        | `Ctrl`+`r`                    | `Cmd`+`r`
+ | Click on `VOLUME_UP`                        | `RCtrl`+`↑` _(up)_
- | Expand notification panel                   | `Ctrl`+`n`                    | `Cmd`+`n`
+ | Click on `VOLUME_DOWN`                      | `RCtrl`+`↓` _(down)_
- | Collapse notification panel                 | `Ctrl`+`Shift`+`n`            | `Cmd`+`Shift`+`n`
+ | Click on `POWER`                            | `RCtrl`+`p`
- | Copy device clipboard to computer           | `Ctrl`+`c`                    | `Cmd`+`c`
+ | Power on                                    | _Right-click²_
- | Paste computer clipboard to device          | `Ctrl`+`v`                    | `Cmd`+`v`
+ | Turn device screen off (keep mirroring)     | `RCtrl`+`o`
- | Copy computer clipboard to device and paste | `Ctrl`+`Shift`+`v`            | `Cmd`+`Shift`+`v`
+ | Turn device screen on                       | `RCtrl`+`Shift`+`o`
- | Enable/disable FPS counter (on stdout)      | `Ctrl`+`i`                    | `Cmd`+`i`
+ | Rotate device screen                        | `RCtrl`+`r`
+ | Expand notification panel                   | `RCtrl`+`n`
+ | Collapse notification panel                 | `RCtrl`+`Shift`+`n`
+ | Inject computer clipboard text              | `RCtrl`+`v`
+ | Enable/disable FPS counter (on stdout)      | `RCtrl`+`i`
 
 _¹Double-click on black borders to remove them._  
 _²Right-click turns the screen on if it was off, presses BACK otherwise._

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.
@@ -207,52 +203,54 @@ Default is 0 (automatic).\n
 
 .SH SHORTCUTS
 
+RCtrl is the right Ctrl key (the left Ctrl key is forwarded to the device).
+
 .TP
-.B Ctrl+f
+.B RCtrl+f
 Switch fullscreen mode
 
 .TP
-.B Ctrl+Left
+.B RCtrl+Left
 Rotate display left
 
 .TP
-.B Ctrl+Right
+.B RCtrl+Right
 Rotate display right
 
 .TP
-.B Ctrl+g
+.B RCtrl+g
 Resize window to 1:1 (pixel\-perfect)
 
 .TP
-.B Ctrl+x, Double\-click on black borders
+.B RCtrl+w, Double\-click on black borders
 Resize window to remove black borders
 
 .TP
-.B Ctrl+h, Home, Middle\-click
+.B RCtrl+h, Home, Middle\-click
 Click on HOME
 
 .TP
-.B Ctrl+b, Ctrl+Backspace, Right\-click (when screen is on)
+.B RCtrl+b, RCtrl+Backspace, Right\-click (when screen is on)
 Click on BACK
 
 .TP
-.B Ctrl+s
+.B RCtrl+s
 Click on APP_SWITCH
 
 .TP
-.B Ctrl+m
+.B RCtrl+m
 Click on MENU
 
 .TP
-.B Ctrl+Up
+.B RCtrl+Up
 Click on VOLUME_UP
 
 .TP
-.B Ctrl+Down
+.B RCtrl+Down
 Click on VOLUME_DOWN
 
 .TP
-.B Ctrl+p
+.B RCtrl+p
 Click on POWER (turn screen on/off)
 
 .TP
@@ -260,39 +258,31 @@ Click on POWER (turn screen on/off)
 Turn screen on
 
 .TP
-.B Ctrl+o
+.B RCtrl+o
 Turn device screen off (keep mirroring)
 
 .TP
-.B Ctrl+Shift+o
+.B RCtrl+Shift+o
 Turn device screen on
 
 .TP
-.B Ctrl+r
+.B RCtrl+r
 Rotate device screen
 
 .TP
-.B Ctrl+n
+.B RCtrl+n
 Expand notification panel
 
 .TP
-.B Ctrl+Shift+n
+.B RCtrl+Shift+n
 Collapse notification panel
 
 .TP
-.B Ctrl+c
+.B RCtrl+v
-Copy device clipboard to computer
+Inject computer clipboard text
 
 .TP
-.B Ctrl+v
+.B RCtrl+i
-Paste computer clipboard to device
-
-.TP
-.B Ctrl+Shift+v
-Copy computer clipboard to device (and paste if the device runs Android >= 7)
-
-.TP
-.B Ctrl+i
 Enable/disable FPS counter (print frames/second in logs)
 
 .TP

app/src/cli.c

@@ -12,11 +12,6 @@
 
 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"
@@ -45,9 +40,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"
@@ -189,75 +181,71 @@ scrcpy_print_usage(const char *arg0) {
         "\n"
         "Shortcuts:\n"
         "\n"
-        "    " CTRL_OR_CMD "+f\n"
+        "    RCtrl is the right Ctrl key (the left Ctrl key is forwarded to\n"
+        "    the device.\n"
+        "\n"
+        "    RCtrl+f\n"
         "        Switch fullscreen mode\n"
         "\n"
-        "    " CTRL_OR_CMD "+Left\n"
+        "    RCtrl+Left\n"
         "        Rotate display left\n"
         "\n"
-        "    " CTRL_OR_CMD "+Right\n"
+        "    RCtrl+Right\n"
         "        Rotate display right\n"
         "\n"
-        "    " CTRL_OR_CMD "+g\n"
+        "    RCtrl+g\n"
         "        Resize window to 1:1 (pixel-perfect)\n"
         "\n"
-        "    " CTRL_OR_CMD "+x\n"
+        "    RCtrl+w\n"
         "    Double-click on black borders\n"
         "        Resize window to remove black borders\n"
         "\n"
-        "    Ctrl+h\n"
+        "    RCtrl+h\n"
         "    Middle-click\n"
         "        Click on HOME\n"
         "\n"
-        "    " CTRL_OR_CMD "+b\n"
+        "    RCtrl+b\n"
-        "    " CTRL_OR_CMD "+Backspace\n"
+        "    RCtrl+Backspace\n"
         "    Right-click (when screen is on)\n"
         "        Click on BACK\n"
         "\n"
-        "    " CTRL_OR_CMD "+s\n"
+        "    RCtrl+s\n"
         "        Click on APP_SWITCH\n"
         "\n"
-        "    Ctrl+m\n"
+        "    RCtrl+m\n"
         "        Click on MENU\n"
         "\n"
-        "    " CTRL_OR_CMD "+Up\n"
+        "    RCtrl+Up\n"
         "        Click on VOLUME_UP\n"
         "\n"
-        "    " CTRL_OR_CMD "+Down\n"
+        "    RCtrl+Down\n"
         "        Click on VOLUME_DOWN\n"
         "\n"
-        "    " CTRL_OR_CMD "+p\n"
+        "    RCtrl+p\n"
         "        Click on POWER (turn screen on/off)\n"
         "\n"
         "    Right-click (when screen is off)\n"
         "        Power on\n"
         "\n"
-        "    " CTRL_OR_CMD "+o\n"
+        "    RCtrl+o\n"
         "        Turn device screen off (keep mirroring)\n"
         "\n"
-        "    " CTRL_OR_CMD "+Shift+o\n"
+        "    RCtrl+Shift+o\n"
         "        Turn device screen on\n"
         "\n"
-        "    " CTRL_OR_CMD "+r\n"
+        "    RCtrl+r\n"
         "        Rotate device screen\n"
         "\n"
-        "    " CTRL_OR_CMD "+n\n"
+        "    RCtrl+n\n"
         "        Expand notification panel\n"
         "\n"
-        "    " CTRL_OR_CMD "+Shift+n\n"
+        "    RCtrl+Shift+n\n"
         "        Collapse notification panel\n"
         "\n"
-        "    " CTRL_OR_CMD "+c\n"
+        "    RCtrl+v\n"
-        "        Copy device clipboard to computer\n"
+        "        Inject computer clipboard text\n"
         "\n"
-        "    " CTRL_OR_CMD "+v\n"
+        "    RCtrl+i\n"
-        "        Paste computer clipboard to device\n"
-        "\n"
-        "    " CTRL_OR_CMD "+Shift+v\n"
-        "        Copy computer clipboard to device (and paste if the device\n"
-        "        runs Android >= 7)\n"
-        "\n"
-        "    " CTRL_OR_CMD "+i\n"
         "        Enable/disable FPS counter (print frames/second in logs)\n"
         "\n"
         "    Drag & drop APK file\n"
@@ -529,7 +517,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
 
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -538,8 +525,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},
@@ -722,9 +707,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;
             default:
                 // getopt prints the error message on stderr
                 return false;

app/src/control_msg.c

@@ -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,
@@ -68,11 +67,10 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
                              (uint32_t) msg->inject_scroll_event.vscroll);
             return 21;
         case CONTROL_MSG_TYPE_SET_CLIPBOARD: {
-            buf[1] = !!msg->set_clipboard.paste;
             size_t len = write_string(msg->set_clipboard.text,
                                       CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH,
-                                      &buf[2]);
+                                      &buf[1]);
-            return 2 + len;
+            return 1 + len;
         }
         case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
             buf[1] = msg->set_screen_power_mode.mode;

app/src/control_msg.h

@@ -13,8 +13,8 @@
 #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
+// type: 1 byte; length: 4 bytes
-#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 6)
+#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 5)
 
 #define POINTER_ID_MOUSE UINT64_C(-1);
 
@@ -44,7 +44,6 @@ struct control_msg {
         struct {
             enum android_keyevent_action action;
             enum android_keycode keycode;
-            uint32_t repeat;
             enum android_metastate metastate;
         } inject_keycode;
         struct {
@@ -64,7 +63,6 @@ struct control_msg {
         } inject_scroll_event;
         struct {
             char *text; // owned, to be freed by SDL_free()
-            bool paste;
         } set_clipboard;
         struct {
             enum screen_power_mode mode;

app/src/event_converter.c

@@ -92,6 +92,9 @@ 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_LSHIFT,       AKEYCODE_SHIFT_LEFT);
+        MAP(SDLK_RSHIFT,       AKEYCODE_SHIFT_RIGHT);
     }
 
     if (!(mod & (KMOD_NUM | KMOD_SHIFT))) {
@@ -111,7 +114,7 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
         }
     }
 
-    if (prefer_text) {
+    if (prefer_text && !(mod & KMOD_LCTRL)) {
         // do not forward alpha and space key events
         return false;
     }

app/src/input_manager.c

@@ -102,17 +102,7 @@ collapse_notification_panel(struct controller *controller) {
 }
 
 static void
-request_device_clipboard(struct controller *controller) {
+set_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();
     if (!text) {
         LOGW("Could not get clipboard text: %s", SDL_GetError());
@@ -127,7 +117,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);
@@ -234,7 +223,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)) {
@@ -247,12 +236,30 @@ 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;
 }
 
+static void
+inject_as_ctrl(struct input_manager *im, const SDL_KeyboardEvent *event) {
+    struct control_msg msg;
+
+    if (!convert_input_key(event, &msg, false)) {
+        return;
+    }
+
+    // Disable RCtrl and Meta
+    msg.inject_keycode.metastate &=
+        ~(AMETA_CTRL_RIGHT_ON | AMETA_META_LEFT_ON | AMETA_META_RIGHT_ON);
+    // Enable LCtrl
+    msg.inject_keycode.metastate |= AMETA_CTRL_LEFT_ON;
+
+    if (!controller_push_msg(im->controller, &msg)) {
+        LOGW("Could not request 'inject keycode'");
+    }
+}
+
 void
 input_manager_process_key(struct input_manager *im,
                           const SDL_KeyboardEvent *event,
@@ -260,69 +267,69 @@ input_manager_process_key(struct input_manager *im,
     // control: indicates the state of the command-line option --no-control
     // ctrl: the Ctrl key
 
-    bool ctrl = event->keysym.mod & (KMOD_LCTRL | KMOD_RCTRL);
+    bool lctrl = event->keysym.mod & KMOD_LCTRL;
+    bool rctrl = event->keysym.mod & 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
+    bool shortcut_key = rctrl;
 #ifdef __APPLE__
-    bool cmd = !ctrl && meta;
+    shortcut_key |= meta;
 #else
     if (meta) {
-        // no shortcuts involve Meta on platforms other than macOS, and it must
+        // No shortcut involve Meta, and it is not forwarded to the device
-        // 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
+        // No shortcuts involve Alt, and it is not forwarded to the device
         return;
     }
 
     struct controller *controller = im->controller;
 
-    // capture all Ctrl events
+    SDL_Keycode keycode = event->keysym.sym;
-    if (ctrl || cmd) {
+    bool down = event->type == SDL_KEYDOWN;
-        SDL_Keycode keycode = event->keysym.sym;
+
-        bool down = event->type == SDL_KEYDOWN;
+    // Capture all RCtrl events
+    if (shortcut_key) {
         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:
                 // 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) {
+                if (control && !shift && !repeat) {
                     action_home(controller, action);
                 }
                 return;
             case SDLK_b: // fall-through
             case SDLK_BACKSPACE:
-                if (control && cmd && !shift && !repeat) {
+                if (control && !shift && !repeat) {
                     action_back(controller, action);
                 }
                 return;
             case SDLK_s:
-                if (control && cmd && !shift && !repeat) {
+                if (control && !shift && !repeat) {
                     action_app_switch(controller, action);
                 }
                 return;
             case SDLK_m:
                 // 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) {
+                if (control && !shift && !repeat) {
                     action_menu(controller, action);
                 }
                 return;
             case SDLK_p:
-                if (control && cmd && !shift && !repeat) {
+                if (control && !shift && !repeat) {
                     action_power(controller, action);
                 }
                 return;
             case SDLK_o:
-                if (control && cmd && !repeat && down) {
+                if (control && !repeat && down) {
                     enum screen_power_mode mode = shift
                                                 ? SCREEN_POWER_MODE_NORMAL
                                                 : SCREEN_POWER_MODE_OFF;
@@ -330,67 +337,57 @@ input_manager_process_key(struct input_manager *im,
                 }
                 return;
             case SDLK_DOWN:
-                if (control && cmd && !shift) {
+                if (control && !shift) {
                     // forward repeated events
                     action_volume_down(controller, action);
                 }
                 return;
             case SDLK_UP:
-                if (control && cmd && !shift) {
+                if (control && !shift) {
                     // forward repeated events
                     action_volume_up(controller, action);
                 }
                 return;
             case SDLK_LEFT:
-                if (cmd && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                     rotate_client_left(im->screen);
                 }
                 return;
             case SDLK_RIGHT:
-                if (cmd && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                     rotate_client_right(im->screen);
                 }
                 return;
-            case SDLK_c:
-                if (control && cmd && !shift && !repeat && down) {
-                    request_device_clipboard(controller);
-                }
-                return;
             case SDLK_v:
-                if (control && cmd && !repeat && down) {
+                if (control && !shift && !repeat && down) {
-                    if (shift) {
+                    // Inject the text as input events
-                        // store the text in the device clipboard and paste
+                    clipboard_paste(controller);
-                        set_device_clipboard(controller, true);
-                    } else {
-                        // inject the text as input events
-                        clipboard_paste(controller);
-                    }
                 }
                 return;
             case SDLK_f:
-                if (!shift && cmd && !repeat && down) {
+                if (!shift && !repeat && down) {
                     screen_switch_fullscreen(im->screen);
                 }
                 return;
-            case SDLK_x:
+            case SDLK_w:
-                if (!shift && cmd && !repeat && down) {
+                if (!shift && !repeat && down) {
                     screen_resize_to_fit(im->screen);
                 }
                 return;
             case SDLK_g:
-                if (!shift && cmd && !repeat && down) {
+                if (!shift && !repeat && down) {
                     screen_resize_to_pixel_perfect(im->screen);
                 }
                 return;
             case SDLK_i:
-                if (!shift && cmd && !repeat && down) {
+                if (!shift && !repeat && down) {
                     struct fps_counter *fps_counter =
                         im->video_buffer->fps_counter;
                     switch_fps_counter_state(fps_counter);
                 }
                 return;
             case SDLK_n:
-                if (control && cmd && !repeat && down) {
+                if (control && !repeat && down) {
                     if (shift) {
                         collapse_notification_panel(controller);
                     } else {
@@ -399,10 +396,19 @@ input_manager_process_key(struct input_manager *im,
                 }
                 return;
             case SDLK_r:
-                if (control && cmd && !shift && !repeat && down) {
+                if (control && !shift && !repeat && down) {
                     rotate_device(controller);
                 }
                 return;
+            case SDLK_c:
+            case SDLK_x:
+                if (control && !shift) {
+                    // For convenience, forward shortcut_key+c and
+                    // shortcut_key+x as Ctrl+c and Ctrl+x (typically "copy" and
+                    // "cut", but not always) to the device
+                    inject_as_ctrl(im, event);
+                }
+                return;
         }
 
         return;
@@ -412,14 +418,14 @@ input_manager_process_key(struct input_manager *im,
         return;
     }
 
-    if (event->repeat) {
+    if (lctrl && !shift && keycode == SDLK_v && down) {
-        ++im->repeat;
+        // Synchronize the computer clipboard to the device clipboard before
-    } else {
+        // sending Ctrl+V, to allow seamless copy-paste.
-        im->repeat = 0;
+        set_device_clipboard(controller);
     }
 
     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'");
         }

app/src/input_manager.h

@@ -14,11 +14,6 @@ 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;
 };
 

app/src/scrcpy.c

@@ -46,7 +46,6 @@ static struct input_manager input_manager = {
     .controller = &controller,
     .video_buffer = &video_buffer,
     .screen = &screen,
-    .repeat = 0,
     .prefer_text = false, // initialized later
 };
 
@@ -64,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());
@@ -114,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;
 }
@@ -328,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;
     }
 

app/src/scrcpy.h

@@ -43,7 +43,6 @@ struct scrcpy_options {
     bool mipmaps;
     bool stay_awake;
     bool force_adb_forward;
-    bool disable_screensaver;
 };
 
 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -82,7 +81,6 @@ struct scrcpy_options {
     .mipmaps = true, \
     .stay_awake = false, \
     .force_adb_forward = false, \
-    .disable_screensaver = false, \
 }
 
 bool

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];
     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)));
@@ -205,18 +203,16 @@ static void test_serialize_set_clipboard(void) {
     struct control_msg msg = {
         .type = CONTROL_MSG_TYPE_SET_CLIPBOARD,
         .set_clipboard = {
-            .paste = true,
             .text = "hello, world!",
         },
     };
 
     unsigned char buf[CONTROL_MSG_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 19);
+    assert(size == 18);
 
     const unsigned char expected[] = {
         CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        1, // paste
         0x00, 0x00, 0x00, 0x0d, // text length
         'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
     };

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

@@ -17,8 +17,6 @@ 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_*
@@ -30,18 +28,15 @@ public final class ControlMessage {
     private Position position;
     private int hScroll;
     private int vScroll;
-    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;
     }
@@ -73,13 +68,10 @@ public final class ControlMessage {
         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;
-        if (paste) {
-            msg.flags = FLAGS_PASTE;
-        }
         return msg;
     }
 
@@ -142,12 +134,4 @@ public final class ControlMessage {
     public int getVScroll() {
         return vScroll;
     }
-
-    public int getFlags() {
-        return flags;
-    }
-
-    public int getRepeat() {
-        return repeat;
-    }
 }

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

@@ -8,15 +8,14 @@ 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 = MESSAGE_MAX_SIZE - 6; // type: 1 byte; paste flag: 1 byte; length: 4 bytes
+    public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 5; // type: 1 byte; length: 4 bytes
     public static final int INJECT_TEXT_MAX_LENGTH = 300;
 
     private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
@@ -98,9 +97,8 @@ 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() {
@@ -151,15 +149,11 @@ public class ControlMessageReader {
     }
 
     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() {

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

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy;
 
-import android.os.Build;
 import android.os.SystemClock;
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
@@ -74,7 +73,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,8 +109,7 @@ public class Controller {
                 }
                 break;
             case ControlMessage.TYPE_SET_CLIPBOARD:
-                boolean paste = (msg.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
+                setClipboard(msg.getText());
-                setClipboard(msg.getText(), paste);
                 break;
             case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                 if (device.supportsInputEvents()) {
@@ -130,8 +128,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) {
@@ -229,17 +227,13 @@ public class Controller {
         return device.injectKeycode(keycode);
     }
 
-    private boolean setClipboard(String text, boolean paste) {
+    private boolean setClipboard(String text) {
         boolean ok = device.setClipboardText(text);
         if (ok) {
             Ln.i("Device clipboard set");
+            return true;
         }
 
-        // On Android >= 7, also press the PASTE key if requested
+        return false;
-        if (paste && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
-            device.injectKeycode(KeyEvent.KEYCODE_PASTE);
-        }
-
-        return ok;
     }
 }

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

@@ -207,6 +207,14 @@ public final class Device {
     }
 
     public boolean setClipboardText(String text) {
+        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 = serviceManager.getClipboardManager().setText(text);
         isSettingClipboard.set(false);

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());
     }
 
@@ -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.writeInt(text.length);
         dos.write(text);
@@ -230,9 +227,6 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals("testé", event.getText());
-
-        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
-        Assert.assertTrue(parse);
     }
 
     @Test
@@ -244,7 +238,6 @@ public class ControlMessageReaderTest {
         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);
 
@@ -258,9 +251,6 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals(text, event.getText());
-
-        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
-        Assert.assertTrue(parse);
     }
 
     @Test
@@ -310,13 +300,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();
@@ -326,14 +314,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());
     }
 
@@ -347,7 +333,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);
@@ -360,7 +345,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();
@@ -368,7 +352,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));
@@ -378,7 +361,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());
     }
 }