80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

win_opengl: Fix unfocused full screen causing bell sound on input.

Browse Source
This commit is contained in:
ts-korhonen
2021-04-13 01:25:42 +03:00
parent fc00dfd417
commit 22f91f639a
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/win/win_opengl.c
View File

@@ -62,12 +62,12 @@ static thread_t* thread = NULL;
static SDL_Window* window = NULL; static SDL_Window* window = NULL;
/** /**
* @brief Window info to modify window style. * @brief SDL window handle
*/ */
static SDL_SysWMinfo wmi = {}; static HWND window_hwnd = NULL;
/** /**
* @brief Parent window (hwndRender from win_ui) * @brief Parent window handle (hwndRender from win_ui)
*/ */
static HWND parent = NULL; static HWND parent = NULL;
@@ -206,11 +206,8 @@ static GLuint load_shaders()
*/ */
static void set_parent_binding(int enable) static void set_parent_binding(int enable)
{ {
if (wmi.subsystem != SDL_SYSWM_WINDOWS) long style = GetWindowLong(window_hwnd, GWL_STYLE);
return; long ex_style = GetWindowLong(window_hwnd, GWL_EXSTYLE);
long style = GetWindowLong(wmi.info.win.window, GWL_STYLE);
long ex_style = GetWindowLong(wmi.info.win.window, GWL_EXSTYLE);
if (enable) if (enable)
{ {
@@ -223,10 +220,10 @@ static void set_parent_binding(int enable)
ex_style &= ~WS_EX_NOACTIVATE; ex_style &= ~WS_EX_NOACTIVATE;
} }
SetWindowLong(wmi.info.win.window, GWL_STYLE, style); SetWindowLong(window_hwnd, GWL_STYLE, style);
SetWindowLong(wmi.info.win.window, GWL_EXSTYLE, ex_style); SetWindowLong(window_hwnd, GWL_EXSTYLE, ex_style);
SetParent(wmi.info.win.window, enable ? parent : NULL); SetParent(window_hwnd, enable ? parent : NULL);
} }
/** /**
@@ -260,7 +257,9 @@ static void winmessage_hook(void* userdata, void* hWnd, unsigned int message, Ui
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_SYSKEYUP: case WM_SYSKEYUP:
if (*msg_data->fullscreen) if (*msg_data->fullscreen)
{
PostMessage(parent, message, wParam, lParam); PostMessage(parent, message, wParam, lParam);
}
break; break;
case WM_INPUT: case WM_INPUT:
if (*msg_data->fullscreen) if (*msg_data->fullscreen)
@@ -369,14 +368,17 @@ static void opengl_main()
/* Keeps track of full screen, but only changed in this thread. */ /* Keeps track of full screen, but only changed in this thread. */
int fullscreen = resize_info.fullscreen; int fullscreen = resize_info.fullscreen;
SDL_SysWMinfo wmi;
SDL_VERSION(&wmi.version); SDL_VERSION(&wmi.version);
SDL_GetWindowWMInfo(window, &wmi); SDL_GetWindowWMInfo(window, &wmi);
/* Pass window handle and full screen mode to windows message hook */
winmessage_data msg_data = (winmessage_data){ wmi.info.win.window, &fullscreen };
if (wmi.subsystem == SDL_SYSWM_WINDOWS) if (wmi.subsystem == SDL_SYSWM_WINDOWS)
SDL_SetWindowsMessageHook(winmessage_hook, &msg_data); window_hwnd = wmi.info.win.window;
/* Pass window handle and full screen mode to windows message hook */
winmessage_data msg_data = (winmessage_data){ window_hwnd, &fullscreen };
SDL_SetWindowsMessageHook(winmessage_hook, &msg_data);
if (!fullscreen) if (!fullscreen)
set_parent_binding(1); set_parent_binding(1);
@@ -445,7 +447,10 @@ static void opengl_main()
SDL_SetWindowFullscreen(window, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); SDL_SetWindowFullscreen(window, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
if (fullscreen) if (fullscreen)
SDL_RaiseWindow(window); {
SetForegroundWindow(window_hwnd);
SetFocus(window_hwnd);
}
} }
if (fullscreen) if (fullscreen)
@@ -461,7 +466,7 @@ static void opengl_main()
SDL_SetWindowSize(window, resize_info.width, resize_info.height); SDL_SetWindowSize(window, resize_info.width, resize_info.height);
/* SWP_NOZORDER is needed for child window and SDL doesn't enable it. */ /* SWP_NOZORDER is needed for child window and SDL doesn't enable it. */
SetWindowPos(wmi.info.win.window, parent, 0, 0, resize_info.width, resize_info.height, SWP_NOZORDER | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOACTIVATE); SetWindowPos(window_hwnd, parent, 0, 0, resize_info.width, resize_info.height, SWP_NOZORDER | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOACTIVATE);
glViewport(0, 0, resize_info.width, resize_info.height); glViewport(0, 0, resize_info.width, resize_info.height);
} }
@@ -483,7 +488,7 @@ static void opengl_main()
static void opengl_blit(int x, int y, int y1, int y2, int w, int h) static void opengl_blit(int x, int y, int y1, int y2, int w, int h)
{ {
if (y1 == y2 || h <= 0 || render_buffer == NULL) if (y1 == y2 || h <= 0 || render_buffer == NULL || thread == NULL)
{ {
video_blit_complete(); video_blit_complete();
return; return;