Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Never forward capture keys

Browse source 
In relative mode, Alt and Super are "capture keys". Never forward them
to the input manager, to avoid inconsistencies between UP and DOWN
events.
This commit is contained in:
Romain Vimont 2022-01-23 15:12:03 +01:00
parent 8c7f0ed5ea
commit 17c97820b2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/screen.c
View file

@ -824,14 +824,13 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
if (sc_screen_is_mouse_capture_key(key)) { if (sc_screen_is_mouse_capture_key(key)) {
if (!screen->mouse_capture_key_pressed) { if (!screen->mouse_capture_key_pressed) {
screen->mouse_capture_key_pressed = key; screen->mouse_capture_key_pressed = key;
return;
} else { } else {
// Another mouse capture key has been pressed, cancel // Another mouse capture key has been pressed, cancel
// mouse (un)capture // mouse (un)capture
screen->mouse_capture_key_pressed = 0; screen->mouse_capture_key_pressed = 0;
// Do not return, the event must be forwarded to the
// input manager
} }
// Mouse capture keys are never forwarded to the device
return;
} }
} }
break; break;
@ -840,14 +839,16 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
SDL_Keycode key = event->key.keysym.sym; SDL_Keycode key = event->key.keysym.sym;
SDL_Keycode cap = screen->mouse_capture_key_pressed; SDL_Keycode cap = screen->mouse_capture_key_pressed;
screen->mouse_capture_key_pressed = 0; screen->mouse_capture_key_pressed = 0;
if (sc_screen_is_mouse_capture_key(key)) {
if (key == cap) { if (key == cap) {
// A mouse capture key has been pressed then released: // A mouse capture key has been pressed then released:
// toggle the capture mouse mode // toggle the capture mouse mode
sc_screen_capture_mouse(screen, !screen->mouse_captured); sc_screen_capture_mouse(screen,
!screen->mouse_captured);
}
// Mouse capture keys are never forwarded to the device
return; return;
} }
// Do not return, the event must be forwarded to the input
// manager
} }
break; break;
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL: