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

Capture all Ctrl events

Browse source 
For consistency, capture all Ctrl events (not only those we react to).
This commit is contained in:
Romain Vimont 2018-01-24 09:53:09 +01:00
parent 2c35220618
commit ab2c3de9f5
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/scrcpy.c
View file

@ -261,18 +261,22 @@ static void handle_key(const SDL_KeyboardEvent *event) {
SDL_bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT); SDL_bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT);
SDL_bool repeat = event->repeat; SDL_bool repeat = event->repeat;
// Capture Ctrl+x: optimal size // capture all Ctrl events
if (keycode == SDLK_x && !repeat && ctrl && !shift) { if (ctrl) {
if (event->type == SDL_KEYDOWN) { // only consider keydown events, and ignore repeated events
struct size optimal_size = get_optimal_window_size(window, frame_size); if (repeat || event->type != SDL_KEYDOWN) {
SDL_SetWindowSize(window, optimal_size.width, optimal_size.height);
}
return; return;
} }
// Capture Ctrl+f: switch fullscreen // Ctrl+x: optimal size
if (keycode == SDLK_f && !repeat && ctrl && !shift) { if (keycode == SDLK_x && !shift) {
if (event->type == SDL_KEYDOWN) { struct size optimal_size = get_optimal_window_size(window, frame_size);
SDL_SetWindowSize(window, optimal_size.width, optimal_size.height);
return;
}
// Ctrl+f: switch fullscreen
if (keycode == SDLK_f && !shift) {
Uint32 new_mode = fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP; Uint32 new_mode = fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
if (!SDL_SetWindowFullscreen(window, new_mode)) { if (!SDL_SetWindowFullscreen(window, new_mode)) {
fullscreen = !fullscreen; fullscreen = !fullscreen;
@ -280,7 +284,9 @@ static void handle_key(const SDL_KeyboardEvent *event) {
} else { } else {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not switch fullscreen mode: %s", SDL_GetError()); SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Could not switch fullscreen mode: %s", SDL_GetError());
} }
return;
} }
return; return;
} }