From 7ad47dfaab57a7e6c7462d7e6a2798a5f122ebaf Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 17 Jul 2020 00:00:42 +0200
Subject: [PATCH] Swap paste shortcuts

For consistency with MOD+c and MOD+x, use MOD+v to inject PASTE.

Use Mod+Shift+v to inject clipboard content as a sequence of text
events.
---
 README.md               | 4 ++--
 app/scrcpy.1            | 4 ++--
 app/src/cli.c           | 6 +++---
 app/src/input_manager.c | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 96d3926b1a..c20be5083f 100644
--- a/README.md
+++ b/README.md
@@ -610,8 +610,8 @@ _[Super] is typically the "Windows" or "Cmd" key._
  | Collapse notification panel                 | `MOD`+`Shift`+`n`
  | Copy to clipboard³                          | `MOD`+`c`
  | Cut to clipboard³                           | `MOD`+`x`
- | Paste computer clipboard to device          | `MOD`+`v`
- | Copy computer clipboard to device and paste | `MOD`+`Shift`+`v`
+ | Synchronize clipboards and paste³           | `MOD`+`v`
+ | Inject computer clipboard text              | `MOD`+`Shift`+`v`
  | Enable/disable FPS counter (on stdout)      | `MOD`+`i`
 
 _¹Double-click on black borders to remove them._  
diff --git a/app/scrcpy.1 b/app/scrcpy.1
index 9193171e48..728d14fe0b 100644
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -302,11 +302,11 @@ Cut to clipboard (inject CUT keycode, Android >= 7 only)
 
 .TP
 .B MOD+v
-Paste computer clipboard to device
+Copy computer clipboard to device, then paste (inject PASTE keycode, Android >= 7 only)
 
 .TP
 .B MOD+Shift+v
-Copy computer clipboard to device (and paste if the device runs Android >= 7)
+Inject computer clipboard text as a sequence of key events
 
 .TP
 .B MOD+i
diff --git a/app/src/cli.c b/app/src/cli.c
index ff810aedd1..b75ab41a44 100644
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -267,11 +267,11 @@ scrcpy_print_usage(const char *arg0) {
         "        Cut to clipboard (inject CUT keycode, Android >= 7 only)\n"
         "\n"
         "    MOD+v\n"
-        "        Paste computer clipboard to device\n"
+        "        Copy computer clipboard to device, then paste (inject PASTE\n"
+        "        keycode, Android >= 7 only)\n"
         "\n"
         "    MOD+Shift+v\n"
-        "        Copy computer clipboard to device (and paste if the device\n"
-        "        runs Android >= 7)\n"
+        "        Inject computer clipboard text as a sequence of key events\n"
         "\n"
         "    MOD+i\n"
         "        Enable/disable FPS counter (print frames/second in logs)\n"
diff --git a/app/src/input_manager.c b/app/src/input_manager.c
index 75808f7562..ec1d5a4efc 100644
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -405,11 +405,11 @@ input_manager_process_key(struct input_manager *im,
             case SDLK_v:
                 if (control && !repeat && down) {
                     if (shift) {
-                        // store the text in the device clipboard and paste
-                        set_device_clipboard(controller, true);
-                    } else {
                         // inject the text as input events
                         clipboard_paste(controller);
+                    } else {
+                        // store the text in the device clipboard and paste
+                        set_device_clipboard(controller, true);
                     }
                 }
                 return;