From cee9360e4b5d6e31407c3cfe30438b1f8b6e7a10 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Aug 2025 12:53:09 -0500 Subject: ControllerInterface/SDL: Remove manual window message pumping on Windows. The mentioned SDL hotplug issue seems to have been fixed. --- .../InputCommon/ControllerInterface/SDL/SDL.cpp | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index f684d94570..da6e829bd1 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -174,34 +174,11 @@ InputBackend::InputBackend(ControllerInterface* controller_interface) } } -#ifdef _WIN32 - // This is a hack to workaround SDL_hidapi using window messages to detect device - // removal/arrival, yet no part of SDL pumps messages for it. It can hopefully be removed in the - // future when SDL fixes the issue. Note this is a separate issue from SDL_HINT_JOYSTICK_THREAD. - // Also note that SDL_WaitEvent may block while device detection window messages get queued up, - // causing some noticible stutter. This is just another reason it should be fixed properly by - // SDL... - const auto window_handle = - FindWindowEx(HWND_MESSAGE, nullptr, TEXT("SDL_HIDAPI_DEVICE_DETECTION"), nullptr); -#endif - SDL_Event e; while (SDL_WaitEvent(&e)) { if (!HandleEventAndContinue(e)) return; - -#ifdef _WIN32 - MSG msg; - while (window_handle && PeekMessage(&msg, window_handle, 0, 0, PM_NOREMOVE)) - { - if (GetMessageA(&msg, window_handle, 0, 0) != 0) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } -#endif } }); -- cgit v1.2.3