asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25259 from marcelofg55/captured_alt_f4

Browse source 
Fix ALT+F4 being ignored with MOUSE_MODE_CAPTURED on Windows
This commit is contained in:
Rémi Verschelde 2019-01-23 15:41:31 +01:00 committed by GitHub
commit 2c9536b655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
platform/windows/os_windows.cpp
View file

@ -805,6 +805,13 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
gr_mem = alt_mem; gr_mem = alt_mem;
} }
if (mouse_mode == MOUSE_MODE_CAPTURED) {
// When SetCapture is used, ALT+F4 hotkey is ignored by Windows, so handle it ourselves
if (wParam == VK_F4 && alt_mem && (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN)) {
if (main_loop)
main_loop->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
}
}
/* /*
if (wParam==VK_WIN) TODO wtf is this? if (wParam==VK_WIN) TODO wtf is this?
meta_mem=uMsg==WM_KEYDOWN; meta_mem=uMsg==WM_KEYDOWN;