Display and control your Android device
Use Ctrl for all shortcuts
Romain Vimont63cb93d7d7d9
diff --git a/README.md b/README.mdindex 2c01a01e..3cb9021c 100644--- a/README.md+++ b/README.md@@ -571,30 +571,30 @@ 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`+ | Action | Shortcut+ | ------------------------------------------- |:-----------------------------+ | Switch fullscreen mode | `Ctrl`+`f`+ | Rotate display left | `Ctrl`+`←` _(left)_+ | Rotate display right | `Ctrl`+`→` _(right)_+ | Resize window to 1:1 (pixel-perfect) | `Ctrl`+`g`+ | Resize window to remove black borders | `Ctrl`+`x` \| _Double-click¹_+ | Click on `HOME` | `Ctrl`+`h` \| _Middle-click_+ | Click on `BACK` | `Ctrl`+`b` \| _Right-click²_+ | Click on `APP_SWITCH` | `Ctrl`+`s`+ | Click on `MENU` | `Ctrl`+`m`+ | Click on `VOLUME_UP` | `Ctrl`+`↑` _(up)_+ | Click on `VOLUME_DOWN` | `Ctrl`+`↓` _(down)_+ | Click on `POWER` | `Ctrl`+`p`+ | Power on | _Right-click²_+ | Turn device screen off (keep mirroring) | `Ctrl`+`o`+ | Turn device screen on | `Ctrl`+`Shift`+`o`+ | Rotate device screen | `Ctrl`+`r`+ | Expand notification panel | `Ctrl`+`n`+ | Collapse notification panel | `Ctrl`+`Shift`+`n`+ | Copy device clipboard to computer | `Ctrl`+`c`+ | Paste computer clipboard to device | `Ctrl`+`v`+ | Copy computer clipboard to device and paste | `Ctrl`+`Shift`+`v`+ | Enable/disable FPS counter (on stdout) | `Ctrl`+`i`_¹Double-click on black borders to remove them.__²Right-click turns the screen on if it was off, presses BACK otherwise._diff --git a/app/src/cli.c b/app/src/cli.cindex 9e07e912..4b65c98f 100644--- a/app/src/cli.c+++ b/app/src/cli.c@@ -13,11 +13,6 @@voidscrcpy_print_usage(const char *arg0) {-#ifdef __APPLE__-# define CTRL_OR_CMD "Cmd"-#else-# define CTRL_OR_CMD "Ctrl"-#endiffprintf(stderr,"Usage: %s [options]\n""\n"@@ -190,19 +185,19 @@ scrcpy_print_usage(const char *arg0) {"\n""Shortcuts:\n""\n"- " " CTRL_OR_CMD "+f\n"+ " Ctrl+f\n"" Switch fullscreen mode\n""\n"- " " CTRL_OR_CMD "+Left\n"+ " Ctrl+Left\n"" Rotate display left\n""\n"- " " CTRL_OR_CMD "+Right\n"+ " Ctrl+Right\n"" Rotate display right\n""\n"- " " CTRL_OR_CMD "+g\n"+ " Ctrl+g\n"" Resize window to 1:1 (pixel-perfect)\n""\n"- " " CTRL_OR_CMD "+x\n"+ " Ctrl+x\n"" Double-click on black borders\n"" Resize window to remove black borders\n""\n"@@ -210,55 +205,55 @@ scrcpy_print_usage(const char *arg0) {" Middle-click\n"" Click on HOME\n""\n"- " " CTRL_OR_CMD "+b\n"- " " CTRL_OR_CMD "+Backspace\n"+ " Ctrl+b\n"+ " Ctrl+Backspace\n"" Right-click (when screen is on)\n"" Click on BACK\n""\n"- " " CTRL_OR_CMD "+s\n"+ " Ctrl+s\n"" Click on APP_SWITCH\n""\n"" Ctrl+m\n"" Click on MENU\n""\n"- " " CTRL_OR_CMD "+Up\n"+ " Ctrl+Up\n"" Click on VOLUME_UP\n""\n"- " " CTRL_OR_CMD "+Down\n"+ " Ctrl+Down\n"" Click on VOLUME_DOWN\n""\n"- " " CTRL_OR_CMD "+p\n"+ " Ctrl+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"+ " Ctrl+o\n"" Turn device screen off (keep mirroring)\n""\n"- " " CTRL_OR_CMD "+Shift+o\n"+ " Ctrl+Shift+o\n"" Turn device screen on\n""\n"- " " CTRL_OR_CMD "+r\n"+ " Ctrl+r\n"" Rotate device screen\n""\n"- " " CTRL_OR_CMD "+n\n"+ " Ctrl+n\n"" Expand notification panel\n""\n"- " " CTRL_OR_CMD "+Shift+n\n"+ " Ctrl+Shift+n\n"" Collapse notification panel\n""\n"- " " CTRL_OR_CMD "+c\n"+ " Ctrl+c\n"" Copy device clipboard to computer\n""\n"- " " CTRL_OR_CMD "+v\n"+ " Ctrl+v\n"" Paste computer clipboard to device\n""\n"- " " CTRL_OR_CMD "+Shift+v\n"+ " Ctrl+Shift+v\n"" Copy computer clipboard to device (and paste if the device\n"" runs Android >= 7)\n""\n"- " " CTRL_OR_CMD "+i\n"+ " Ctrl+i\n"" Enable/disable FPS counter (print frames/second in logs)\n""\n"" Drag & drop APK file\n"diff --git a/app/src/input_manager.c b/app/src/input_manager.cindex 465ba6e6..e16dee52 100644--- a/app/src/input_manager.c+++ b/app/src/input_manager.c@@ -264,27 +264,16 @@ input_manager_process_key(struct input_manager *im,bool alt = event->keysym.mod & (KMOD_LALT | KMOD_RALT);bool meta = event->keysym.mod & (KMOD_LGUI | KMOD_RGUI);- // use Cmd on macOS, Ctrl on other platforms-#ifdef __APPLE__- bool cmd = !ctrl && meta;-#else- if (meta) {- // no shortcuts involve Meta on platforms other than macOS, and it must- // not be forwarded to the device- return;- }- bool cmd = ctrl; // && !meta, already guaranteed-#endif-- if (alt) {- // no shortcuts involve Alt, and it must not be forwarded to the device+ if (alt || meta) {+ // no shortcuts involve Alt or Meta, and they must not be forwarded to+ // the devicereturn;}struct controller *controller = im->controller;// capture all Ctrl events- if (ctrl || cmd) {+ if (ctrl) {SDL_Keycode keycode = event->keysym.sym;bool down = event->type == SDL_KEYDOWN;int action = down ? ACTION_DOWN : ACTION_UP;@@ -292,37 +281,33 @@ input_manager_process_key(struct input_manager *im,bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT);switch (keycode) {case SDLK_h:- // Ctrl+h on all platform, since Cmd+h is already captured by- // the system on macOS to hide the window- if (control && ctrl && !meta && !shift && !repeat) {+ if (control && ctrl && !shift && !repeat) {action_home(controller, action);}return;case SDLK_b: // fall-throughcase SDLK_BACKSPACE:- if (control && cmd && !shift && !repeat) {+ if (control && ctrl && !shift && !repeat) {action_back(controller, action);}return;case SDLK_s:- if (control && cmd && !shift && !repeat) {+ if (control && ctrl && !shift && !repeat) {action_app_switch(controller, action);}return;case SDLK_m:- // Ctrl+m on all platform, since Cmd+m is already captured by- // the system on macOS to minimize the window- if (control && ctrl && !meta && !shift && !repeat) {+ if (control && ctrl && !shift && !repeat) {action_menu(controller, action);}return;case SDLK_p:- if (control && cmd && !shift && !repeat) {+ if (control && ctrl && !shift && !repeat) {action_power(controller, action);}return;case SDLK_o:- if (control && cmd && !repeat && down) {+ if (control && ctrl && !repeat && down) {enum screen_power_mode mode = shift? SCREEN_POWER_MODE_NORMAL: SCREEN_POWER_MODE_OFF;@@ -330,34 +315,34 @@ input_manager_process_key(struct input_manager *im,}return;case SDLK_DOWN:- if (control && cmd && !shift) {+ if (control && ctrl && !shift) {// forward repeated eventsaction_volume_down(controller, action);}return;case SDLK_UP:- if (control && cmd && !shift) {+ if (control && ctrl && !shift) {// forward repeated eventsaction_volume_up(controller, action);}return;case SDLK_LEFT:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {rotate_client_left(im->screen);}return;case SDLK_RIGHT:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {rotate_client_right(im->screen);}return;case SDLK_c:- if (control && cmd && !shift && !repeat && down) {+ if (control && ctrl && !shift && !repeat && down) {request_device_clipboard(controller);}return;case SDLK_v:- if (control && cmd && !repeat && down) {+ if (control && ctrl && !repeat && down) {if (shift) {// store the text in the device clipboard and pasteset_device_clipboard(controller, true);@@ -368,29 +353,29 @@ input_manager_process_key(struct input_manager *im,}return;case SDLK_f:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {screen_switch_fullscreen(im->screen);}return;case SDLK_x:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {screen_resize_to_fit(im->screen);}return;case SDLK_g:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {screen_resize_to_pixel_perfect(im->screen);}return;case SDLK_i:- if (cmd && !shift && !repeat && down) {+ if (ctrl && !shift && !repeat && down) {struct fps_counter *fps_counter =im->video_buffer->fps_counter;switch_fps_counter_state(fps_counter);}return;case SDLK_n:- if (control && cmd && !repeat && down) {+ if (control && ctrl && !repeat && down) {if (shift) {collapse_notification_panel(controller);} else {@@ -399,7 +384,7 @@ input_manager_process_key(struct input_manager *im,}return;case SDLK_r:- if (control && cmd && !shift && !repeat && down) {+ if (control && ctrl && !shift && !repeat && down) {rotate_device(controller);}return;