diff --git a/README.md b/README.md index 7aa17668..2f1d4f5d 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/app/scrcpy.1 b/app/scrcpy.1 index 53dbb377..a63a44aa 100644 --- a/app/scrcpy.1 +++ b/app/scrcpy.1 @@ -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 diff --git a/app/src/cli.c b/app/src/cli.c index 2f4b2cf3..a13d8a44 100644 --- a/app/src/cli.c +++ b/app/src/cli.c @@ -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" diff --git a/app/src/input_manager.c b/app/src/input_manager.c index d1c12a11..59734c64 100644 --- a/app/src/input_manager.c +++ b/app/src/input_manager.c @@ -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); } }