moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 10:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass through focus-gain clicks to the host in absolute mouse mode

Browse Source
This commit is contained in:
Cameron Gutman
2020-05-06 18:58:43 -07:00
parent 97c15c7876
commit 05e82c24f8
3 changed files with 96 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/streaming/input/input.cpp
View File

@@ -19,6 +19,8 @@ SdlInputHandler::SdlInputHandler(StreamingPreferences& prefs, NvComputer*, int s
m_StreamHeight(streamHeight),
m_AbsoluteMouseMode(prefs.absoluteMouseMode),
m_AbsoluteTouchMode(prefs.absoluteTouchMode),
m_PendingFocusGain(false),
m_PendingFocusButtonUp(0),
m_LeftButtonReleaseTimer(0),
m_RightButtonReleaseTimer(0),
m_DragTimer(0),
@@ -203,12 +205,44 @@ void SdlInputHandler::notifyFocusGained()
#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN)
int mouseX, mouseY;
Uint32 mouseState = SDL_GetGlobalMouseState(&mouseX, &mouseY);
if (mouseState & SDL_BUTTON(SDL_BUTTON_LEFT)) {
if (mouseState != 0) {
int x, y, width, height;
SDL_GetWindowPosition(m_Window, &x, &y);
SDL_GetWindowSize(m_Window, &width, &height);
if (mouseX > x && mouseX < x+width && mouseY > y && mouseY < y+height) {
setCaptureActive(true);
if (m_AbsoluteMouseMode) {
// We won't receive mouse events until the mouse gesture ends after gaining
// focus. To allow users to click directly into the unfocused window, we'll
// emulate mouse events using SDL_GetGlobalMouseState().
m_PendingFocusGain = true;
if (mouseState & SDL_BUTTON_LMASK) {
m_PendingFocusButtonUp = SDL_BUTTON_LEFT;
}
else if (mouseState & SDL_BUTTON_RMASK) {
m_PendingFocusButtonUp = SDL_BUTTON_RIGHT;
}
else if (mouseState & SDL_BUTTON_MMASK) {
m_PendingFocusButtonUp = SDL_BUTTON_MIDDLE;
}
else if (mouseState & SDL_BUTTON_X1MASK) {
m_PendingFocusButtonUp = SDL_BUTTON_X1;
}
else if (mouseState & SDL_BUTTON_X2MASK) {
m_PendingFocusButtonUp = SDL_BUTTON_X2;
}
else {
SDL_assert(false);
m_PendingFocusGain = false;
}
// Update the mouse position then send the button down event
sendSyntheticMouseState(SDL_MOUSEMOTION, 0);
sendSyntheticMouseState(SDL_MOUSEBUTTONDOWN, m_PendingFocusButtonUp);
}
else if (mouseState & SDL_BUTTON_LMASK) {
setCaptureActive(true);
}
}
}
#endif