mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-28 21:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 62affaa01b into f01231dff8

Browse source
This commit is contained in:
Benjamin Attabra 2025-06-29 08:35:22 +00:00 • committed by GitHub
commit 95adab45b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/input_manager.c
View file

@ -386,8 +386,11 @@ sc_input_manager_process_key(struct sc_input_manager *im,
// The second condition is necessary to ignore the release of the modifier // The second condition is necessary to ignore the release of the modifier
// key (because in this case mod is 0). // key (because in this case mod is 0).
uint16_t mods = im->sdl_shortcut_mods; uint16_t mods = im->sdl_shortcut_mods;
bool is_shortcut = sc_shortcut_mods_is_shortcut_mod(mods, mod) bool is_shortcut_modifier_pressed =
|| sc_shortcut_mods_is_shortcut_key(mods, sdl_keycode); sc_shortcut_mods_is_shortcut_mod(mods, mod);
bool is_key_a_shortcut_modifier =
sc_shortcut_mods_is_shortcut_key(mods, sdl_keycode);
bool is_shortcut = is_shortcut_modifier_pressed || is_key_a_shortcut_modifier;
if (down && !repeat) { if (down && !repeat) {
if (sdl_keycode == im->last_keycode && mod == im->last_mod) { if (sdl_keycode == im->last_keycode && mod == im->last_mod) {
@ -399,6 +402,17 @@ sc_input_manager_process_key(struct sc_input_manager *im,
} }
} }
// Handle F11 for fullscreen (no modifiers needed)
if (sdl_keycode == SDLK_F11 && video && !repeat && down) {
// Ensure no other modifiers like Shift, Ctrl, Alt, GUI are pressed with F11
// (KMOD_NUM, KMOD_CAPS, KMOD_MODE, KMOD_SCROLL are generally ok)
uint16_t problematic_mods = KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_GUI;
if (!(mod & problematic_mods)) {
sc_screen_toggle_fullscreen(im->screen);
return; // F11 handled, consume the event
}
}
if (is_shortcut) { if (is_shortcut) {
enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP; enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
switch (sdl_keycode) { switch (sdl_keycode) {
@ -506,6 +520,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
} }
return; return;
case SDLK_f: case SDLK_f:
// This is part of `is_shortcut`, so a modifier (Alt/Super) must be pressed.
if (video && !shift && !repeat && down) { if (video && !shift && !repeat && down) {
sc_screen_toggle_fullscreen(im->screen); sc_screen_toggle_fullscreen(im->screen);
} }