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.
This commit is contained in:
Romain Vimont 2020-07-17 00:00:42 +02:00
parent 56a115b5c5
commit 7ad47dfaab
4 changed files with 10 additions and 10 deletions

View file

@ -610,8 +610,8 @@ _[Super] is typically the "Windows" or "Cmd" key._
| Collapse notification panel | `MOD`+`Shift`+`n` | Collapse notification panel | `MOD`+`Shift`+`n`
| Copy to clipboard³ | `MOD`+`c` | Copy to clipboard³ | `MOD`+`c`
| Cut to clipboard³ | `MOD`+`x` | Cut to clipboard³ | `MOD`+`x`
| Paste computer clipboard to device | `MOD`+`v` | Synchronize clipboards and paste³ | `MOD`+`v`
| Copy computer clipboard to device and paste | `MOD`+`Shift`+`v` | Inject computer clipboard text | `MOD`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `MOD`+`i` | Enable/disable FPS counter (on stdout) | `MOD`+`i`
_¹Double-click on black borders to remove them._ _¹Double-click on black borders to remove them._

View file

@ -302,11 +302,11 @@ Cut to clipboard (inject CUT keycode, Android >= 7 only)
.TP .TP
.B MOD+v .B MOD+v
Paste computer clipboard to device Copy computer clipboard to device, then paste (inject PASTE keycode, Android >= 7 only)
.TP .TP
.B MOD+Shift+v .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 .TP
.B MOD+i .B MOD+i

View file

@ -267,11 +267,11 @@ scrcpy_print_usage(const char *arg0) {
" Cut to clipboard (inject CUT keycode, Android >= 7 only)\n" " Cut to clipboard (inject CUT keycode, Android >= 7 only)\n"
"\n" "\n"
" MOD+v\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" "\n"
" MOD+Shift+v\n" " MOD+Shift+v\n"
" Copy computer clipboard to device (and paste if the device\n" " Inject computer clipboard text as a sequence of key events\n"
" runs Android >= 7)\n"
"\n" "\n"
" MOD+i\n" " MOD+i\n"
" Enable/disable FPS counter (print frames/second in logs)\n" " Enable/disable FPS counter (print frames/second in logs)\n"

View file

@ -405,11 +405,11 @@ input_manager_process_key(struct input_manager *im,
case SDLK_v: case SDLK_v:
if (control && !repeat && down) { if (control && !repeat && down) {
if (shift) { if (shift) {
// store the text in the device clipboard and paste
set_device_clipboard(controller, true);
} else {
// inject the text as input events // inject the text as input events
clipboard_paste(controller); clipboard_paste(controller);
} else {
// store the text in the device clipboard and paste
set_device_clipboard(controller, true);
} }
} }
return; return;