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

win_opengl: Optimize message handling by replacing SDL_PollEvents with basic win32 message pump.

Browse Source
This commit is contained in:
ts-korhonen
2021-04-19 01:05:53 +03:00
parent 7ffc6d72c3
commit 58d2f6e3ff
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/win/win_opengl.c
View File

@@ -171,28 +171,21 @@ static void set_parent_binding(int enable)
} }
/** /**
* @brief Windows message handler for SDL Windows. * @brief Windows message handler for our window.
* @param userdata winmessage_data
* @param hWnd
* @param message * @param message
* @param wParam * @param wParam
* @param lParam * @param lParam
* @param fullscreen
*/ */
static void winmessage_hook(void* userdata, void* hWnd, unsigned int message, Uint64 wParam, Sint64 lParam) static void handle_window_messages(UINT message, WPARAM wParam, LPARAM lParam, int fullscreen)
{ {
winmessage_data* msg_data = (winmessage_data*)userdata;
/* Process only our window */
if (msg_data->window != hWnd || parent == NULL)
return;
switch (message) switch (message)
{ {
case WM_LBUTTONUP: case WM_LBUTTONUP:
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
case WM_MBUTTONUP: case WM_MBUTTONUP:
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
if (!*msg_data->fullscreen) if (!fullscreen)
{ {
/* Mouse events that enter and exit capture. */ /* Mouse events that enter and exit capture. */
PostMessage(parent, message, wParam, lParam); PostMessage(parent, message, wParam, lParam);
@@ -202,13 +195,13 @@ static void winmessage_hook(void* userdata, void* hWnd, unsigned int message, Ui
case WM_KEYUP: case WM_KEYUP:
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_SYSKEYUP: case WM_SYSKEYUP:
if (*msg_data->fullscreen) if (fullscreen)
{ {
PostMessage(parent, message, wParam, lParam); PostMessage(parent, message, wParam, lParam);
} }
break; break;
case WM_INPUT: case WM_INPUT:
if (*msg_data->fullscreen) if (fullscreen)
{ {
/* Raw input handler from win_ui.c : input_proc */ /* Raw input handler from win_ui.c : input_proc */
@@ -383,8 +376,6 @@ static void opengl_main(void* param)
/* Pass window handle and full screen mode to windows message hook */ /* Pass window handle and full screen mode to windows message hook */
winmessage_data msg_data = (winmessage_data){ window_hwnd, &fullscreen }; 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);
@@ -423,10 +414,15 @@ static void opengl_main(void* param)
} }
} }
SDL_Event event; /* Handle window messages */
MSG msg;
/* Handle SDL_Window events */ if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
while (SDL_PollEvent(&event)) { /* No need for actual handlers, but message queue must be processed. */ } {
if (msg.hwnd == window_hwnd)
handle_window_messages(msg.message, msg.wParam, msg.lParam, fullscreen);
TranslateMessage(&msg);
DispatchMessage(&msg);
}
/* Keep cursor hidden in full screen and mouse capture */ /* Keep cursor hidden in full screen and mouse capture */
int show_cursor = !(fullscreen || !!mouse_capture); int show_cursor = !(fullscreen || !!mouse_capture);