jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix keyboard grab on X11

Browse source 
Fixes #584
This commit is contained in:
Cameron Gutman 2021-04-30 18:17:15 -05:00
commit b50e5ed7e6
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/streaming/input/input.cpp
View file

@ -372,11 +372,18 @@ void SdlInputHandler::updateKeyboardGrabState()
// Ungrab if it's fullscreen only and we left fullscreen // Ungrab if it's fullscreen only and we left fullscreen
shouldGrab = false; shouldGrab = false;
} }
#ifdef Q_OS_DARWIN
else if (!(windowFlags & SDL_WINDOW_INPUT_FOCUS)) { else if (!(windowFlags & SDL_WINDOW_INPUT_FOCUS)) {
// Ungrab if we lose input focus (SDL will do this internally, but // Ungrab if we lose input focus on macOS. SDL will handle
// not for macOS where SDL is not handling the grab logic). // this internally for platforms where we use the SDL
// SDL_SetWindowKeyboardGrab() API exclusively.
//
// NB: On X11, we may not have input focus at the time of
// the initial keyboard grab update, so we must not enable
// this codepath on Linux.
shouldGrab = false; shouldGrab = false;
} }
#endif
// Don't close the window on Alt+F4 when keyboard grab is enabled // Don't close the window on Alt+F4 when keyboard grab is enabled
SDL_SetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, shouldGrab ? "1" : "0"); SDL_SetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, shouldGrab ? "1" : "0");