moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 15:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create the window after starting streaming to avoid a mouse capture bug in SDL on Windows

Browse Source
This commit is contained in:
Cameron Gutman 2018-07-20 19:55:07 -07:00
parent 20288210be
commit 64a839c2f9
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/streaming/session.cpp
View File

@ -106,12 +106,9 @@ int Session::drSetup(int videoFormat, int width, int height, int frameRate, void
s_ActiveSession->m_ActiveVideoHeight = height; s_ActiveSession->m_ActiveVideoHeight = height;
s_ActiveSession->m_ActiveVideoFrameRate = frameRate; s_ActiveSession->m_ActiveVideoFrameRate = frameRate;
if (!chooseDecoder(s_ActiveSession->m_Preferences.videoDecoderSelection, // Defer decoder setup until we've started streaming so we
s_ActiveSession->m_Window, // don't have to hide and show the SDL window (which seems to
videoFormat, width, height, frameRate, // cause pointer hiding to break on Windows).
s_ActiveSession->m_VideoDecoder)) {
return -1;
}
return 0; return 0;
} }
@ -518,40 +515,6 @@ void Session::exec()
return; return;
} }
int flags = SDL_WINDOW_HIDDEN;
int x, y, width, height;
if (m_Preferences.fullScreen) {
flags |= SDL_WINDOW_FULLSCREEN;
}
getWindowDimensions(m_Preferences.fullScreen,
x, y, width, height);
m_Window = SDL_CreateWindow("Moonlight",
x,
y,
width,
height,
flags);
if (!m_Window) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"SDL_CreateWindow() failed: %s",
SDL_GetError());
s_ActiveSessionSemaphore.release();
SDL_QuitSubSystem(SDL_INIT_VIDEO);
return;
}
// For non-full screen windows, call getWindowDimensions()
// again after creating a window to allow it to account
// for window chrome size.
if (!m_Preferences.fullScreen) {
getWindowDimensions(false, x, y, width, height);
SDL_SetWindowPosition(m_Window, x, y);
SDL_SetWindowSize(m_Window, width, height);
}
QByteArray hostnameStr = m_Computer->activeAddress.toLatin1(); QByteArray hostnameStr = m_Computer->activeAddress.toLatin1();
QByteArray siAppVersion = m_Computer->appVersion.toLatin1(); QByteArray siAppVersion = m_Computer->appVersion.toLatin1();
@ -583,8 +546,35 @@ void Session::exec()
emit connectionStarted(); emit connectionStarted();
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents); QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
// Show the streaming window int x, y, width, height;
SDL_ShowWindow(m_Window); getWindowDimensions(m_Preferences.fullScreen,
x, y, width, height);
m_Window = SDL_CreateWindow("Moonlight",
x,
y,
width,
height,
m_Preferences.fullScreen ?
SDL_WINDOW_FULLSCREEN : 0);
if (!m_Window) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"SDL_CreateWindow() failed: %s",
SDL_GetError());
s_ActiveSessionSemaphore.release();
SDL_QuitSubSystem(SDL_INIT_VIDEO);
return;
}
// For non-full screen windows, call getWindowDimensions()
// again after creating a window to allow it to account
// for window chrome size.
if (!m_Preferences.fullScreen) {
getWindowDimensions(false, x, y, width, height);
SDL_SetWindowPosition(m_Window, x, y);
SDL_SetWindowSize(m_Window, width, height);
}
// Capture the mouse // Capture the mouse
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);
@ -630,11 +620,12 @@ void Session::exec()
} }
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
if (event.window.event != SDL_WINDOWEVENT_RESIZED) { // We want to recreate the decoder for resizes (full-screen toggles) and the initial shown event
if (event.window.event != SDL_WINDOWEVENT_RESIZED && event.window.event != SDL_WINDOWEVENT_SHOWN) {
break; break;
} }
// Fall through to recreate decoder on resize (full-screen toggle) // Fall through
case SDL_RENDER_DEVICE_RESET: case SDL_RENDER_DEVICE_RESET:
case SDL_RENDER_TARGETS_RESET: case SDL_RENDER_TARGETS_RESET:
SDL_AtomicLock(&m_DecoderLock); SDL_AtomicLock(&m_DecoderLock);