Commit c542de92135a79f25648e75b1c2ab0fd581e29c0
2021-10-05T14:08:36
React to WM_NCACTIVATE instead of WM_SETFOCUS or WM_ACTIVATE for focus changes See https://github.com/libsdl-org/SDL/pull/4293 and https://github.com/libsdl-org/SDL/issues/4450 for details
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 77398c9..0b4a16d 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -369,6 +369,54 @@ WIN_CheckAsyncMouseRelease(SDL_WindowData *data)
data->mouse_button_flags = 0;
}
+static void
+WIN_UpdateFocus(SDL_Window *window)
+{
+ SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+ HWND hwnd = data->hwnd;
+
+ if (GetForegroundWindow() == hwnd) {
+ POINT cursorPos;
+
+ if (SDL_GetKeyboardFocus() != window) {
+ SDL_SetKeyboardFocus(window);
+ }
+
+ GetCursorPos(&cursorPos);
+ ScreenToClient(hwnd, &cursorPos);
+ SDL_SendMouseMotion(window, 0, 0, cursorPos.x, cursorPos.y);
+
+ WIN_CheckAsyncMouseRelease(data);
+ WIN_UpdateClipCursor(window);
+
+ /*
+ * FIXME: Update keyboard state
+ */
+ WIN_CheckClipboardUpdate(data->videodata);
+
+ SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0);
+ SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0);
+ SDL_ToggleModState(KMOD_SCROLL, (GetKeyState(VK_SCROLL) & 0x0001) != 0);
+
+ } else {
+ RECT rect;
+
+ data->in_window_deactivation = SDL_TRUE;
+
+ if (SDL_GetKeyboardFocus() == window) {
+ SDL_SetKeyboardFocus(NULL);
+ WIN_ResetDeadKeys();
+ }
+
+ if (GetClipCursor(&rect) && SDL_memcmp(&rect, &data->cursor_clipped_rect, sizeof(rect)) == 0) {
+ ClipCursor(NULL);
+ SDL_zero(data->cursor_clipped_rect);
+ }
+
+ data->in_window_deactivation = SDL_FALSE;
+ }
+}
+
static BOOL
WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text)
{
@@ -658,6 +706,11 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
/* Don't immediately clip the cursor in case we're clicking minimize/maximize buttons */
data->skip_update_clipcursor = SDL_TRUE;
+
+ /* Update the focus here, since it's possible to get WM_ACTIVATE and WM_SETFOCUS without
+ actually being the foreground window, but this appears to get called in all cases where
+ the global foreground window changes to and from this window. */
+ WIN_UpdateFocus(data->window);
}
break;
@@ -687,55 +740,8 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
- }
- }
- returnCode = 0;
- break;
- case WM_SETFOCUS:
- {
- POINT cursorPos;
-
- if (SDL_GetKeyboardFocus() != data->window) {
- SDL_SetKeyboardFocus(data->window);
}
-
- GetCursorPos(&cursorPos);
- ScreenToClient(hwnd, &cursorPos);
- SDL_SendMouseMotion(data->window, 0, 0, cursorPos.x, cursorPos.y);
-
- WIN_CheckAsyncMouseRelease(data);
- WIN_UpdateClipCursor(data->window);
-
- /*
- * FIXME: Update keyboard state
- */
- WIN_CheckClipboardUpdate(data->videodata);
-
- SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0);
- SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0);
- SDL_ToggleModState(KMOD_SCROLL, (GetKeyState(VK_SCROLL) & 0x0001) != 0);
- }
- returnCode = 0;
- break;
-
- case WM_KILLFOCUS:
- {
- RECT rect;
-
- data->in_window_deactivation = SDL_TRUE;
-
- if (SDL_GetKeyboardFocus() == data->window) {
- SDL_SetKeyboardFocus(NULL);
- WIN_ResetDeadKeys();
- }
-
- if (GetClipCursor(&rect) && SDL_memcmp(&rect, &data->cursor_clipped_rect, sizeof(rect)) == 0) {
- ClipCursor(NULL);
- SDL_zero(data->cursor_clipped_rect);
- }
-
- data->in_window_deactivation = SDL_FALSE;
}
returnCode = 0;
break;