From fb4efa013e25bb807a2849c99057c0faef98d1f0 Mon Sep 17 00:00:00 2001 From: whitesnakeftw Date: Wed, 4 Mar 2026 03:16:27 +0100 Subject: [PATCH] update docs, move info --- app/scrcpy.1 | 12 ++++++------ app/src/cli.c | 8 ++++---- app/src/input_manager.c | 30 +++++++++++++++--------------- app/src/options.h | 2 +- doc/mouse.md | 1 + doc/shortcuts.md | 3 ++- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/app/scrcpy.1 b/app/scrcpy.1 index 54c78182..164c9b00 100644 --- a/app/scrcpy.1 +++ b/app/scrcpy.1 @@ -322,8 +322,8 @@ Each character must be one of the following: - 'b': trigger shortcut BACK (or turn screen on if off) - 'h': trigger shortcut HOME - 's': trigger shortcut APP_SWITCH - - 'i': trigger shortcut INFO - 'n': trigger shortcut "expand notification panel" + - 'i': trigger shortcut INFO Default is 'bhsn:++++' for SDK mouse, and '++++:bhsn' for AOA and UHID. @@ -732,10 +732,6 @@ Click on BACK .B MOD+s Click on APP_SWITCH -.TP -.B MOD+i -Click on INFO - .TP .B MOD+m Click on MENU @@ -752,6 +748,10 @@ Click on VOLUME_DOWN .B MOD+p Click on POWER (turn screen on/off) +.TP +.B MOD+i +Click on INFO + .TP .B Right\-click (when screen is off) Turn screen on @@ -797,7 +797,7 @@ Inject computer clipboard text as a sequence of key events Open keyboard settings on the device (for HID keyboard only) .TP -.B MOD+i +.B MOD+q Enable/disable FPS counter (print frames/second in logs) .TP diff --git a/app/src/cli.c b/app/src/cli.c index 8cc7bc6f..bf31a98c 100644 --- a/app/src/cli.c +++ b/app/src/cli.c @@ -603,8 +603,8 @@ static const struct sc_option options[] = { " 'b': trigger shortcut BACK (or turn screen on if off)\n" " 'h': trigger shortcut HOME\n" " 's': trigger shortcut APP_SWITCH\n" - " 'i': trigger shortcut INFO\n" " 'n': trigger shortcut \"expand notification panel\"\n" + " 'i': trigger shortcut INFO\n" "Default is 'bhsn:++++' for SDK mouse, and '++++:bhsn' for AOA " "and UHID.", }, @@ -786,7 +786,7 @@ static const struct sc_option options[] = { .longopt_id = OPT_PRINT_FPS, .longopt = "print-fps", .text = "Start FPS counter, to print framerate logs to the console. " - "It can be started or stopped at any time with MOD+i.", + "It can be started or stopped at any time with MOD+q.", }, { .longopt_id = OPT_PUSH_TARGET, @@ -1189,7 +1189,7 @@ static const struct sc_shortcut shortcuts[] = { .text = "Open keyboard settings on the device (for HID keyboard only)", }, { - .shortcuts = { "MOD+i" }, + .shortcuts = { "MOD+q" }, .text = "Enable/disable FPS counter (print frames/second in logs)", }, { @@ -2341,7 +2341,7 @@ parse_mouse_bindings(const char *s, struct sc_mouse_bindings *mb) { // either "xxxx" or "xxxx:xxxx" if (len != 4 && (len != 9 || s[4] != ':')) { LOGE("Invalid mouse bindings: '%s' (expected 'xxxx' or 'xxxx:xxxx', " - "with each 'x' being in {'+', '-', 'b', 'h', 's', 'n'})", s); + "with each 'x' being in {'+', '-', 'b', 'h', 's', 'n', 'i'})", s); return false; } diff --git a/app/src/input_manager.c b/app/src/input_manager.c index 50f7f558..1228a51b 100644 --- a/app/src/input_manager.c +++ b/app/src/input_manager.c @@ -83,11 +83,6 @@ action_app_switch(struct sc_input_manager *im, enum sc_action action) { send_keycode(im, AKEYCODE_APP_SWITCH, action, "APP_SWITCH"); } -static inline void -action_info(struct sc_input_manager *im, enum sc_action action) { - send_keycode(im, AKEYCODE_INFO, action, "INFO"); -} - static inline void action_power(struct sc_input_manager *im, enum sc_action action) { send_keycode(im, AKEYCODE_POWER, action, "POWER"); @@ -108,6 +103,11 @@ action_menu(struct sc_input_manager *im, enum sc_action action) { send_keycode(im, AKEYCODE_MENU, action, "MENU"); } +static inline void +action_info(struct sc_input_manager *im, enum sc_action action) { + send_keycode(im, AKEYCODE_INFO, action, "INFO"); +} + // turn the screen on if it was off, press BACK otherwise // If the screen is off, it is turned on only on ACTION_DOWN static void @@ -422,11 +422,6 @@ sc_input_manager_process_key(struct sc_input_manager *im, if (im->kp && !shift && !repeat && !paused) { action_app_switch(im, action); } - case SDLK_i: - if (im->kp && !shift && !repeat && !paused) { - action_info(im, action); - } - return; case SDLK_m: if (im->kp && !shift && !repeat && !paused) { action_menu(im, action); @@ -437,6 +432,11 @@ sc_input_manager_process_key(struct sc_input_manager *im, action_power(im, action); } return; + case SDLK_i: + if (im->kp && !shift && !repeat && !paused) { + action_info(im, action); + } + return; case SDLK_o: if (control && !repeat && down && !paused) { bool on = shift; @@ -776,11 +776,6 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im, action_app_switch(im, action); } return; - case SC_MOUSE_BINDING_INFO: - if (im->kp) { - action_info(im, action); - } - return; case SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL: if (down) { if (event->clicks < 2) { @@ -790,6 +785,11 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im, } } return; + case SC_MOUSE_BINDING_INFO: + if (im->kp) { + action_info(im, action); + } + return; default: assert(binding == SC_MOUSE_BINDING_CLICK); break; diff --git a/app/src/options.h b/app/src/options.h index be6cab95..5f24d414 100644 --- a/app/src/options.h +++ b/app/src/options.h @@ -182,8 +182,8 @@ enum sc_mouse_binding { SC_MOUSE_BINDING_BACK, SC_MOUSE_BINDING_HOME, SC_MOUSE_BINDING_APP_SWITCH, - SC_MOUSE_BINDING_INFO, SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL, + SC_MOUSE_BINDING_INFO, }; struct sc_mouse_binding_set { diff --git a/doc/mouse.md b/doc/mouse.md index 0bea4aea..b2e3ed5a 100644 --- a/doc/mouse.md +++ b/doc/mouse.md @@ -125,6 +125,7 @@ Each character must be one of the following: - `h`: trigger shortcut `HOME` - `s`: trigger shortcut `APP_SWITCH` - `n`: trigger shortcut "expand notification panel" + - `i`: trigger shortcut `INFO` For example: diff --git a/doc/shortcuts.md b/doc/shortcuts.md index d22eb473..f6cd3de5 100644 --- a/doc/shortcuts.md +++ b/doc/shortcuts.md @@ -40,6 +40,7 @@ _[Super] is typically the Windows or Cmd key._ | Click on `VOLUME_UP` | MOD+↑ _(up)_ | Click on `VOLUME_DOWN` | MOD+↓ _(down)_ | Click on `POWER` | MOD+p + | Click on `INFO` | MOD+i | Power on | _Right-click²_ | Turn device screen off (keep mirroring) | MOD+o | Turn device screen on | MOD+Shift+o @@ -52,7 +53,7 @@ _[Super] is typically the Windows or Cmd key._ | Synchronize clipboards and paste⁵ | MOD+v | Inject computer clipboard text | MOD+Shift+v | Open keyboard settings (HID keyboard only) | MOD+k - | Enable/disable FPS counter (on stdout) | MOD+i + | Enable/disable FPS counter (on stdout) | MOD+q | Pinch-to-zoom/rotate | Ctrl+_click-and-move_ | Tilt vertically (slide with 2 fingers) | Shift+_click-and-move_ | Tilt horizontally (slide with 2 fingers) | Ctrl+Shift+_click-and-move_