ControllerInterface/SDL: Remove manual window message pumping on Windows.
The mentioned SDL hotplug issue seems to have been fixed.
This commit is contained in:
@@ -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;
|
SDL_Event e;
|
||||||
while (SDL_WaitEvent(&e))
|
while (SDL_WaitEvent(&e))
|
||||||
{
|
{
|
||||||
if (!HandleEventAndContinue(e))
|
if (!HandleEventAndContinue(e))
|
||||||
return;
|
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
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user