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

win_opengl: more fullscreen input routing

Browse Source
This commit is contained in:
ts-korhonen
2021-04-12 22:21:28 +03:00
parent 522490f913
commit dfd21b25af
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/win/win_opengl.c
View File

@@ -249,8 +249,18 @@ static void winmessage_hook(void* userdata, void* hWnd, unsigned int message, Ui
{ {
case WM_LBUTTONUP: case WM_LBUTTONUP:
case WM_MBUTTONUP: case WM_MBUTTONUP:
/* Mouse events that enter and exit capture. */ if (!*msg_data->fullscreen)
PostMessage(parent, message, wParam, lParam); {
/* Mouse events that enter and exit capture. */
PostMessage(parent, message, wParam, lParam);
}
break;
case WM_KEYDOWN:
case WM_KEYUP:
case WM_SYSKEYDOWN:
case WM_SYSKEYUP:
if (*msg_data->fullscreen)
PostMessage(parent, message, wParam, lParam);
break; break;
case WM_INPUT: case WM_INPUT:
if (*msg_data->fullscreen) if (*msg_data->fullscreen)
@@ -396,8 +406,10 @@ static void opengl_main()
/* Handle SDL_Window events */ /* Handle SDL_Window events */
while (SDL_PollEvent(&event)) { /* No need for actual handlers, but message queue must be processed. */ } while (SDL_PollEvent(&event)) { /* No need for actual handlers, but message queue must be processed. */ }
if (!fullscreen && SDL_ShowCursor(-1) == !!mouse_capture) /* Keep cursor hidden in full screen and mouse capture */
SDL_ShowCursor(!mouse_capture); int show_cursor = !(fullscreen || !!mouse_capture);
if (SDL_ShowCursor(-1) != show_cursor)
SDL_ShowCursor(show_cursor);
/* Wait for synchronized events for 1ms before going back to window events */ /* Wait for synchronized events for 1ms before going back to window events */
wait_result = WaitForMultipleObjects(sizeof(sync_objects) / sizeof(HANDLE), sync_objects.asArray, FALSE, 1); wait_result = WaitForMultipleObjects(sizeof(sync_objects) / sizeof(HANDLE), sync_objects.asArray, FALSE, 1);
@@ -434,8 +446,6 @@ static void opengl_main()
if (fullscreen) if (fullscreen)
SDL_RaiseWindow(window); SDL_RaiseWindow(window);
SDL_ShowCursor(!fullscreen);
} }
if (fullscreen) if (fullscreen)