Skip to content

Commit

Permalink
Replace Ctrl by Meta as shortcut modifier
Browse files Browse the repository at this point in the history 
This paves the way to forward Ctrl to the device.
  • Loading branch information
@rom1v
rom1v committed May 29, 2020
1 parent e4efd75 commit f650b01
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 105 deletions.
50 changes: 26 additions & 24 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,30 +560,32 @@ Also see [issue #14].

## Shortcuts

| Action | Shortcut | Shortcut (macOS)
| ------------------------------------------- |:----------------------------- |:-----------------------------
| Switch fullscreen mode | `Ctrl`+`f` | `Cmd`+`f`
| Rotate display left | `Ctrl`+`←` _(left)_ | `Cmd`+`←` _(left)_
| Rotate display right | `Ctrl`+`→` _(right)_ | `Cmd`+`→` _(right)_
| 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¹_
| Click on `HOME` | `Ctrl`+`h` \| _Middle-click_ | `Ctrl`+`h` \| _Middle-click_
| Click on `BACK` | `Ctrl`+`b` \| _Right-click²_ | `Cmd`+`b` \| _Right-click²_
| Click on `APP_SWITCH` | `Ctrl`+`s` | `Cmd`+`s`
| Click on `MENU` | `Ctrl`+`m` | `Ctrl`+`m`
| Click on `VOLUME_UP` | `Ctrl`+`↑` _(up)_ | `Cmd`+`↑` _(up)_
| Click on `VOLUME_DOWN` | `Ctrl`+`↓` _(down)_ | `Cmd`+`↓` _(down)_
| Click on `POWER` | `Ctrl`+`p` | `Cmd`+`p`
| Power on | _Right-click²_ | _Right-click²_
| Turn device screen off (keep mirroring) | `Ctrl`+`o` | `Cmd`+`o`
| Turn device screen on | `Ctrl`+`Shift`+`o` | `Cmd`+`Shift`+`o`
| Rotate device screen | `Ctrl`+`r` | `Cmd`+`r`
| Expand notification panel | `Ctrl`+`n` | `Cmd`+`n`
| Collapse notification panel | `Ctrl`+`Shift`+`n` | `Cmd`+`Shift`+`n`
| Copy device clipboard to computer | `Ctrl`+`c` | `Cmd`+`c`
| Paste computer clipboard to device | `Ctrl`+`v` | `Cmd`+`v`
| Copy computer clipboard to device and paste | `Ctrl`+`Shift`+`v` | `Cmd`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `Ctrl`+`i` | `Cmd`+`i`
_`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`

_¹Double-click on black borders to remove them._
_²Right-click turns the screen on if it was off, presses BACK otherwise._
Expand Down
42 changes: 21 additions & 21 deletions app/scrcpy.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,91 +204,91 @@ Default is 0 (automatic).\n
.SH SHORTCUTS

.TP
.B Ctrl+f
.B Meta+f
Switch fullscreen mode

.TP
.B Ctrl+Left
.B Meta+Left
Rotate display left

.TP
.B Ctrl+Right
.B Meta+Right
Rotate display right

.TP
.B Ctrl+g
.B Meta+g
Resize window to 1:1 (pixel\-perfect)

.TP
.B Ctrl+x, Double\-click on black borders
.B Meta+x, Double\-click on black borders
Resize window to remove black borders

.TP
.B Ctrl+h, Home, Middle\-click
.B Meta+h, Home, Middle\-click
Click on HOME

.TP
.B Ctrl+b, Ctrl+Backspace, Right\-click (when screen is on)
.B Meta+b, Meta+Backspace, Right\-click (when screen is on)
Click on BACK

.TP
.B Ctrl+s
.B Meta+s
Click on APP_SWITCH

.TP
.B Ctrl+m
.B Meta+m
Click on MENU

.TP
.B Ctrl+Up
.B Meta+Up
Click on VOLUME_UP

.TP
.B Ctrl+Down
.B Meta+Down
Click on VOLUME_DOWN

.TP
.B Ctrl+p
.B Meta+p
Click on POWER (turn screen on/off)

.TP
.B Right\-click (when screen is off)
Turn screen on

.TP
.B Ctrl+o
.B Meta+o
Turn device screen off (keep mirroring)

.TP
.B Ctrl+Shift+o
.B Meta+Shift+o
Turn device screen on

.TP
.B Ctrl+r
.B Meta+r
Rotate device screen

.TP
.B Ctrl+n
.B Meta+n
Expand notification panel

.TP
.B Ctrl+Shift+n
.B Meta+Shift+n
Collapse notification panel

.TP
.B Ctrl+c
.B Meta+c
Copy device clipboard to computer

.TP
.B Ctrl+v
.B Meta+v
Paste computer clipboard to device

.TP
.B Ctrl+Shift+v
.B Meta+Shift+v
Copy computer clipboard to device (and paste if the device runs Android >= 7)

.TP
.B Ctrl+i
.B Meta+i
Enable/disable FPS counter (print frames/second in logs)

.TP
Expand Down
45 changes: 23 additions & 22 deletions app/src/cli.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
void
scrcpy_print_usage(const char *arg0) {
#ifdef __APPLE__
# define CTRL_OR_CMD "Cmd"
# define MOD "Cmd"
#else
# define CTRL_OR_CMD "Ctrl"
# define MOD "Meta"
#endif
fprintf(stderr,
"Usage: %s [options]\n"
Expand Down Expand Up @@ -186,75 +186,75 @@ scrcpy_print_usage(const char *arg0) {
"\n"
"Shortcuts:\n"
"\n"
" " CTRL_OR_CMD "+f\n"
" " MOD "+f\n"
" Switch fullscreen mode\n"
"\n"
" " CTRL_OR_CMD "+Left\n"
" " MOD "+Left\n"
" Rotate display left\n"
"\n"
" " CTRL_OR_CMD "+Right\n"
" " MOD "+Right\n"
" Rotate display right\n"
"\n"
" " CTRL_OR_CMD "+g\n"
" " MOD "+g\n"
" Resize window to 1:1 (pixel-perfect)\n"
"\n"
" " CTRL_OR_CMD "+x\n"
" " MOD "+x\n"
" Double-click on black borders\n"
" Resize window to remove black borders\n"
"\n"
" Ctrl+h\n"
" Middle-click\n"
" Click on HOME\n"
"\n"
" " CTRL_OR_CMD "+b\n"
" " CTRL_OR_CMD "+Backspace\n"
" " MOD "+b\n"
" " MOD "+Backspace\n"
" Right-click (when screen is on)\n"
" Click on BACK\n"
"\n"
" " CTRL_OR_CMD "+s\n"
" " MOD "+s\n"
" Click on APP_SWITCH\n"
"\n"
" Ctrl+m\n"
" Click on MENU\n"
"\n"
" " CTRL_OR_CMD "+Up\n"
" " MOD "+Up\n"
" Click on VOLUME_UP\n"
"\n"
" " CTRL_OR_CMD "+Down\n"
" " MOD "+Down\n"
" Click on VOLUME_DOWN\n"
"\n"
" " CTRL_OR_CMD "+p\n"
" " MOD "+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"
" " MOD "+o\n"
" Turn device screen off (keep mirroring)\n"
"\n"
" " CTRL_OR_CMD "+Shift+o\n"
" " MOD "+Shift+o\n"
" Turn device screen on\n"
"\n"
" " CTRL_OR_CMD "+r\n"
" " MOD "+r\n"
" Rotate device screen\n"
"\n"
" " CTRL_OR_CMD "+n\n"
" " MOD "+n\n"
" Expand notification panel\n"
"\n"
" " CTRL_OR_CMD "+Shift+n\n"
" " MOD "+Shift+n\n"
" Collapse notification panel\n"
"\n"
" " CTRL_OR_CMD "+c\n"
" " MOD "+c\n"
" Copy device clipboard to computer\n"
"\n"
" " CTRL_OR_CMD "+v\n"
" " MOD "+v\n"
" Paste computer clipboard to device\n"
"\n"
" " CTRL_OR_CMD "+Shift+v\n"
" " MOD "+Shift+v\n"
" Copy computer clipboard to device (and paste if the device\n"
" runs Android >= 7)\n"
"\n"
" " CTRL_OR_CMD "+i\n"
" " MOD "+i\n"
" Enable/disable FPS counter (print frames/second in logs)\n"
"\n"
" Drag & drop APK file\n"
Expand All @@ -265,6 +265,7 @@ scrcpy_print_usage(const char *arg0) {
DEFAULT_LOCK_VIDEO_ORIENTATION, DEFAULT_LOCK_VIDEO_ORIENTATION >= 0 ? "" : " (unlocked)",
DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
#undef MOD
}

static bool
Expand Down
Loading

0 comments on commit f650b01

Please sign in to comment.