Reformulate seamless paste documentation

This commit is contained in:
Romain Vimont 2020-05-29 22:25:12 +02:00
parent 51d969b20c
commit 31cee2c49f
4 changed files with 32 additions and 30 deletions

View File

@ -562,33 +562,34 @@ Also see [issue #14].
_`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`+`x` \| _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`
| Copy device clipboard to computer | `Meta`+`c`
| Paste computer clipboard to device | `Meta`+`v`
| Copy computer clipboard to device and paste | `Meta`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `Meta`+`i`
| 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`+`x` \| _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`
| Copy device clipboard to computer | `Meta`+`c`
| Paste computer clipboard to device | `Meta`+`v`
| Copy computer clipboard to device, then press PASTE³ | `Meta`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `Meta`+`i`
_¹Double-click on black borders to remove them._
_²Right-click turns the screen on if it was off, presses BACK otherwise._
_²Right-click turns the screen on if it was off, presses BACK otherwise._
_³Only if the device runs Android >= 7._
## Custom paths

View File

@ -285,7 +285,7 @@ Paste computer clipboard to device
.TP
.B Meta+Shift+v
Copy computer clipboard to device (and paste if the device runs Android >= 7)
Copy computer clipboard to device, then press PASTE (Android >= 7)
.TP
.B Meta+i

View File

@ -251,8 +251,8 @@ scrcpy_print_usage(const char *arg0) {
" Paste computer clipboard to device\n"
"\n"
" " MOD "+Shift+v\n"
" Copy computer clipboard to device (and paste if the device\n"
" runs Android >= 7)\n"
" Copy computer clipboard to device, then press PASTE (Android\n"
" >= 7)\n"
"\n"
" " MOD "+i\n"
" Enable/disable FPS counter (print frames/second in logs)\n"

View File

@ -347,10 +347,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
// Store the text in the device clipboard, then press
// PASTE
set_device_clipboard(controller, true);
} else {
// inject the text as input events
// Inject the text as input events
clipboard_paste(controller);
}
}