mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-03 21:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/main: Be sure to clean up window class when done.

Browse source
This commit is contained in:
Ryan Pavlik 2022-05-20 09:12:50 -05:00 committed by Jakob Bornecrantz
parent 230424eec9
commit 795db8712b
1 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/xrt/compositor/main/comp_window_mswin.c
View file

@ -35,6 +35,7 @@ struct comp_window_mswin
struct comp_target_swapchain base; struct comp_target_swapchain base;
struct os_thread_helper oth; struct os_thread_helper oth;
ATOM window_class;
HINSTANCE instance; HINSTANCE instance;
HWND window; HWND window;
@ -160,35 +161,12 @@ comp_window_mswin_flush(struct comp_target *ct)
} }
static void static void
comp_window_mswin_thread(struct comp_window_mswin *cwm) comp_window_mswin_window_loop(struct comp_window_mswin *cwm)
{ {
struct comp_target *ct = &cwm->base.base; struct comp_target *ct = &cwm->base.base;
RECT rc = {0, 0, (LONG)(ct->width), (LONG)ct->height}; RECT rc = {0, 0, (LONG)(ct->width), (LONG)ct->height};
WNDCLASSEXW wcex; COMP_INFO(ct->c, "Creating window");
U_ZERO(&wcex);
wcex.cbSize = sizeof(WNDCLASSEXW);
wcex.style = CS_HREDRAW | CS_VREDRAW;
wcex.lpfnWndProc = WndProc;
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = cwm->instance;
wcex.lpszClassName = szWindowClass;
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
//! @todo icon
#if 0
wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SAMPLEGUI));
wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_SAMPLEGUI);
wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
#endif
if (!RegisterClassExW(&wcex)) {
COMP_ERROR(ct->c, "Failed to register window class");
// parent thread will be notified (by caller) that we have exited.
return;
}
cwm->window = cwm->window =
CreateWindowExW(0, szWindowClass, L"Monado (Windowed)", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CreateWindowExW(0, szWindowClass, L"Monado (Windowed)", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, cwm->instance, NULL); rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, cwm->instance, NULL);
@ -198,19 +176,22 @@ comp_window_mswin_thread(struct comp_window_mswin *cwm)
return; return;
} }
COMP_INFO(ct->c, "Setting window properties and showing window");
SetPropW(cwm->window, szWindowData, cwm); SetPropW(cwm->window, szWindowData, cwm);
SetWindowLongPtr(cwm->window, GWLP_USERDATA, (LONG_PTR)(cwm)); SetWindowLongPtr(cwm->window, GWLP_USERDATA, (LONG_PTR)(cwm));
ShowWindow(cwm->window, SW_SHOWDEFAULT); ShowWindow(cwm->window, SW_SHOWDEFAULT);
UpdateWindow(cwm->window); UpdateWindow(cwm->window);
COMP_INFO(ct->c, "Unblocking parent thread");
// Unblock the parent thread now that we're successfully running. // Unblock the parent thread now that we're successfully running.
{ {
os_thread_helper_lock(&cwm->oth); os_thread_helper_lock(&cwm->oth);
os_thread_helper_signal_locked(&cwm->oth); os_thread_helper_signal_locked(&cwm->oth);
os_thread_helper_unlock(&cwm->oth); os_thread_helper_unlock(&cwm->oth);
} }
COMP_WARN(cwm->base.base.c, "Starting the Windows window message loop"); COMP_INFO(ct->c, "Starting the Windows window message loop");
bool done = false;
while (os_thread_helper_is_running(&cwm->oth)) { while (os_thread_helper_is_running(&cwm->oth)) {
// force handling messages. // force handling messages.
MSG msg; MSG msg;
@ -236,6 +217,42 @@ comp_window_mswin_thread(struct comp_window_mswin *cwm)
} }
} }
} }
static void
comp_window_mswin_thread(struct comp_window_mswin *cwm)
{
struct comp_target *ct = &cwm->base.base;
RECT rc = {0, 0, (LONG)(ct->width), (LONG)ct->height};
WNDCLASSEXW wcex;
U_ZERO(&wcex);
wcex.cbSize = sizeof(WNDCLASSEXW);
wcex.style = CS_HREDRAW | CS_VREDRAW;
wcex.lpfnWndProc = WndProc;
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = cwm->instance;
wcex.lpszClassName = szWindowClass;
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
//! @todo icon
#if 0
wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SAMPLEGUI));
wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_SAMPLEGUI);
wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
#endif
COMP_INFO(ct->c, "Registering window class");
ATOM window_class = RegisterClassExW(&wcex);
if (!window_class) {
COMP_ERROR(ct->c, "Failed to register window class");
// parent thread will be notified (by caller) that we have exited.
return;
}
comp_window_mswin_window_loop(cwm);
COMP_INFO(ct->c, "Unregistering window class");
UnregisterClassW((LPCWSTR)window_class, NULL);
}
static void * static void *
comp_window_mswin_thread_func(void *ptr) comp_window_mswin_thread_func(void *ptr)
@ -246,7 +263,7 @@ comp_window_mswin_thread_func(void *ptr)
comp_window_mswin_thread(cwm); comp_window_mswin_thread(cwm);
os_thread_helper_signal_stop(&cwm->oth); os_thread_helper_signal_stop(&cwm->oth);
COMP_WARN(cwm->base.base.c, "Windows window message thread now exiting."); COMP_INFO(cwm->base.base.c, "Windows window message thread now exiting.");
return NULL; return NULL;
} }