gaming/rpcs3
gaming/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3 synced 2024-07-20 06:36:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

input: only unregister devices if there is no other handler registered

Browse source 
Also center mouse if a new device was added
This commit is contained in:
Megamouse 2024-05-23 23:58:54 +02:00
parent 657acc90e4
commit 21c03b74b6
3 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
rpcs3/Input/raw_mouse_handler.cpp
View file

@ -30,6 +30,8 @@ static inline void draw_overlay_cursor(u32 index, s32 x_pos, s32 y_pos, s32 x_ma
LOG_CHANNEL(input_log, "Input");
raw_mice_config g_cfg_raw_mouse;
shared_mutex g_registered_handlers_mutex;
u32 g_registered_handlers = 0;
raw_mouse::raw_mouse(u32 index, const std::string& device_name, void* handle, raw_mouse_handler* handler)
: m_index(index), m_device_name(device_name), m_handle(handle), m_handler(handler)
@ -227,23 +229,8 @@ raw_mouse_handler::~raw_mouse_handler()
m_thread.reset();
}
if (!m_registered_raw_input_devices)
{
return;
}
#ifdef _WIN32
std::vector<RAWINPUTDEVICE> raw_input_devices;
raw_input_devices.push_back(RAWINPUTDEVICE {
.usUsagePage = HID_USAGE_PAGE_GENERIC,
.usUsage = HID_USAGE_GENERIC_MOUSE,
.dwFlags = RIDEV_REMOVE,
.hwndTarget = nullptr
});
if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
{
input_log.error("raw_mouse_handler: RegisterRawInputDevices (destructor) failed: %s", fmt::win_error{GetLastError(), nullptr});
}
unregister_raw_input_devices();
#endif
}
@ -348,6 +335,10 @@ void raw_mouse_handler::update_devices()
if (!exists)
{
// Initialize and center mouse
mouse.update_window_handle();
mouse.center_cursor();
input_log.notice("raw_mouse_handler: added new device for player %d: '%s'", i, device_name);
}
}
@ -395,13 +386,6 @@ void raw_mouse_handler::register_raw_input_devices()
return;
}
// Initialize and center all mice
for (auto& [handle, mouse] : m_raw_mice)
{
mouse.update_window_handle();
mouse.center_cursor();
}
// Get the window handle of the first mouse
raw_mouse& mouse = m_raw_mice.begin()->second;
@ -413,14 +397,50 @@ void raw_mouse_handler::register_raw_input_devices()
.hwndTarget = mouse.window_handle()
});
if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
{
input_log.error("raw_mouse_handler: RegisterRawInputDevices failed: %s", fmt::win_error{GetLastError(), nullptr});
return;
std::lock_guard lock(g_registered_handlers_mutex);
if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
{
input_log.error("raw_mouse_handler: RegisterRawInputDevices failed: %s", fmt::win_error{GetLastError(), nullptr});
return;
}
g_registered_handlers++;
}
m_registered_raw_input_devices = true;
}
void raw_mouse_handler::unregister_raw_input_devices()
{
if (!m_registered_raw_input_devices)
{
return;
}
std::lock_guard lock(g_registered_handlers_mutex);
if (!g_registered_handlers || (--g_registered_handlers > 0))
{
input_log.notice("raw_mouse_handler: Skip unregistering devices. %d other handlers are still registered.", g_registered_handlers);
return;
}
input_log.notice("raw_mouse_handler: Unregistering devices");
std::vector<RAWINPUTDEVICE> raw_input_devices;
raw_input_devices.push_back(RAWINPUTDEVICE {
.usUsagePage = HID_USAGE_PAGE_GENERIC,
.usUsage = HID_USAGE_GENERIC_MOUSE,
.dwFlags = RIDEV_REMOVE,
.hwndTarget = nullptr
});
if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
{
input_log.error("raw_mouse_handler: RegisterRawInputDevices (unregister) failed: %s", fmt::win_error{GetLastError(), nullptr});
}
}
#endif
u32 raw_mouse_handler::get_now_connect(std::set<u32>& connected_mice)

1
rpcs3/Input/raw_mouse_handler.h
View file

@ -99,6 +99,7 @@ private:
#ifdef _WIN32
void register_raw_input_devices();
void unregister_raw_input_devices();
bool m_registered_raw_input_devices = false;
#endif

2
rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp
View file

@ -174,7 +174,7 @@ void raw_mouse_settings_dialog::update_combo_box(usz player)
combo->setCurrentIndex(std::max(0, combo->findData(current_device)));
combo->blockSignals(false);
if (player == m_tab_widget->currentIndex())
if (static_cast<int>(player) == m_tab_widget->currentIndex())
{
handle_device_change(device_name);
}