starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

InputSource: Remove before calling OnInputDeviceDisconnected()

Browse Source 
Fixes background polling interval not decreasing after last device
disconnects.
This commit is contained in:
Stenzek
2025-12-25 13:51:27 +10:00
parent 3253cc5bed
commit 31764738c6
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/dinput_source.cpp
View File

@@ -168,9 +168,9 @@ void DInputSource::Shutdown()
while (!m_controllers.empty())
{
const u32 index = static_cast<u32>(m_controllers.size() - 1);
InputManager::OnInputDeviceDisconnected(MakeGenericControllerDeviceKey(InputSourceType::DInput, index),
GetDeviceIdentifier(static_cast<u32>(m_controllers.size() - 1)));
m_controllers.pop_back();
InputManager::OnInputDeviceDisconnected(MakeGenericControllerDeviceKey(InputSourceType::DInput, index),
GetDeviceIdentifier(index));
}
}
@@ -272,14 +272,10 @@ void DInputSource::PollEvents()
if (hr != DI_OK)
{
InputManager::OnInputDeviceDisconnected(InputBindingKey{{.source_type = InputSourceType::DInput,
.source_index = static_cast<u32>(i),
.source_subtype = InputSubclass::None,
.modifier = InputModifier::None,
.invert = 0,
.data = 0}},
GetDeviceIdentifier(static_cast<u32>(i)));
m_controllers.erase(m_controllers.begin() + i);
InputManager::OnInputDeviceDisconnected(
MakeGenericControllerDeviceKey(InputSourceType::DInput, static_cast<u32>(i)),
GetDeviceIdentifier(static_cast<u32>(i)));
continue;
}
}

9
src/util/win32_raw_input_source.cpp
View File

@@ -291,11 +291,12 @@ bool Win32RawInputSource::ReloadDevices()
{
DEV_LOG("Detected raw input device {} removal", i);
ms = {};
InputManager::OnInputDeviceDisconnected(
MakeGenericControllerDeviceKey(InputSourceType::Pointer, static_cast<u32>(i)),
InputManager::GetPointerDeviceName(static_cast<u32>(i)));
ms = {};
any_changed = true;
}
}
@@ -343,12 +344,14 @@ void Win32RawInputSource::CloseDevices()
if (m_mice.empty())
return;
for (u32 i = 0; i < static_cast<u32>(m_mice.size()); i++)
m_mice.clear();
const u32 num_mice = static_cast<u32>(m_mice.size());
for (u32 i = 0; i < num_mice; i++)
{
InputManager::OnInputDeviceDisconnected(MakeGenericControllerDeviceKey(InputSourceType::Pointer, i),
InputManager::GetPointerDeviceName(i));
}
m_mice.clear();
}
void Win32RawInputSource::EnsureRawInputRegistered()

21
src/util/xinput_source.cpp
View File

@@ -238,13 +238,23 @@ InputManager::DeviceList XInputSource::EnumerateDevices()
if (!m_controllers[i].connected)
continue;
ret.emplace_back(MakeGenericControllerDeviceKey(InputSourceType::XInput, i), fmt::format("XInput-{}", i),
fmt::format("XInput Controller {}", i));
ret.emplace_back(MakeGenericControllerDeviceKey(InputSourceType::XInput, i), GetDeviceIdentifier(i),
GetDeviceName(i));
}
return ret;
}
std::string XInputSource::GetDeviceIdentifier(u32 index)
{
return fmt::format("XInput-{}", index);
}
std::string XInputSource::GetDeviceName(u32 index)
{
return fmt::format("XInput Controller {}", index);
}
bool XInputSource::ContainsDevice(std::string_view device) const
{
return device.starts_with("XInput-");
@@ -458,16 +468,17 @@ void XInputSource::HandleControllerConnection(u32 index, const XINPUT_STATE& sta
cd.last_state = state;
InputManager::OnInputDeviceConnected(MakeGenericControllerDeviceKey(InputSourceType::XInput, index),
fmt::format("XInput-{}", index), fmt::format("XInput Controller {}", index));
GetDeviceIdentifier(index), GetDeviceName(index));
}
void XInputSource::HandleControllerDisconnection(u32 index)
{
INFO_LOG("XInput controller {} disconnected.", index);
InputManager::OnInputDeviceDisconnected(MakeGenericControllerDeviceKey(InputSourceType::XInput, index),
fmt::format("XInput-{}", index));
m_controllers[index] = {};
InputManager::OnInputDeviceDisconnected(MakeGenericControllerDeviceKey(InputSourceType::XInput, index),
GetDeviceIdentifier(index));
}
void XInputSource::CheckForStateChanges(u32 index, const XINPUT_STATE& new_state)

3
src/util/xinput_source.h
View File

@@ -75,6 +75,9 @@ private:
void HandleControllerConnection(u32 index, const XINPUT_STATE& state);
void HandleControllerDisconnection(u32 index);
static std::string GetDeviceIdentifier(u32 index);
static std::string GetDeviceName(u32 index);
ControllerDataArray m_controllers;
HMODULE m_xinput_module{};