|
@@ -308,21 +308,23 @@ static void WIN_UpdateFocus(SDL_Window *window, bool expect_focus)
|
|
|
if (has_focus) {
|
|
|
POINT cursorPos;
|
|
|
|
|
|
- bool swapButtons = GetSystemMetrics(SM_SWAPBUTTON) != 0;
|
|
|
- if (GetAsyncKeyState(VK_LBUTTON)) {
|
|
|
- data->focus_click_pending |= !swapButtons ? SDL_BUTTON_LMASK : SDL_BUTTON_RMASK;
|
|
|
- }
|
|
|
- if (GetAsyncKeyState(VK_RBUTTON)) {
|
|
|
- data->focus_click_pending |= !swapButtons ? SDL_BUTTON_RMASK : SDL_BUTTON_LMASK;
|
|
|
- }
|
|
|
- if (GetAsyncKeyState(VK_MBUTTON)) {
|
|
|
- data->focus_click_pending |= SDL_BUTTON_MMASK;
|
|
|
- }
|
|
|
- if (GetAsyncKeyState(VK_XBUTTON1)) {
|
|
|
- data->focus_click_pending |= SDL_BUTTON_X1MASK;
|
|
|
- }
|
|
|
- if (GetAsyncKeyState(VK_XBUTTON2)) {
|
|
|
- data->focus_click_pending |= SDL_BUTTON_X2MASK;
|
|
|
+ if (!(window->flags & SDL_WINDOW_MOUSE_CAPTURE)) {
|
|
|
+ bool swapButtons = GetSystemMetrics(SM_SWAPBUTTON) != 0;
|
|
|
+ if (GetAsyncKeyState(VK_LBUTTON)) {
|
|
|
+ data->focus_click_pending |= !swapButtons ? SDL_BUTTON_LMASK : SDL_BUTTON_RMASK;
|
|
|
+ }
|
|
|
+ if (GetAsyncKeyState(VK_RBUTTON)) {
|
|
|
+ data->focus_click_pending |= !swapButtons ? SDL_BUTTON_RMASK : SDL_BUTTON_LMASK;
|
|
|
+ }
|
|
|
+ if (GetAsyncKeyState(VK_MBUTTON)) {
|
|
|
+ data->focus_click_pending |= SDL_BUTTON_MMASK;
|
|
|
+ }
|
|
|
+ if (GetAsyncKeyState(VK_XBUTTON1)) {
|
|
|
+ data->focus_click_pending |= SDL_BUTTON_X1MASK;
|
|
|
+ }
|
|
|
+ if (GetAsyncKeyState(VK_XBUTTON2)) {
|
|
|
+ data->focus_click_pending |= SDL_BUTTON_X2MASK;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
SDL_SetKeyboardFocus(data->keyboard_focus ? data->keyboard_focus : window);
|