mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-10 06:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: move raw mouse register logic to own function

Browse Source
This commit is contained in:
Megamouse 2024-05-21 23:04:48 +02:00
parent 3dfbd14de2
commit b56f9490f5
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpcs3/Input/raw_mouse_handler.cpp
View File

@ -284,8 +284,20 @@ void raw_mouse_handler::Init(const u32 max_connect)
} }
#ifdef _WIN32 #ifdef _WIN32
if (max_connect && !m_raw_mice.empty()) register_raw_input_devices();
#endif
type = mouse_handler::raw;
}
#ifdef _WIN32
void raw_mouse_handler::register_raw_input_devices()
{ {
if (m_registered_raw_input_devices || !m_info.max_connect || m_raw_mice.empty())
{
return;
}
// Initialize and center all mice // Initialize and center all mice
for (auto& [handle, mouse] : m_raw_mice) for (auto& [handle, mouse] : m_raw_mice)
{ {
@ -303,16 +315,17 @@ void raw_mouse_handler::Init(const u32 max_connect)
.dwFlags = 0, .dwFlags = 0,
.hwndTarget = mouse.window_handle() .hwndTarget = mouse.window_handle()
}); });
if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE))) 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}); input_log.error("raw_mouse_handler: RegisterRawInputDevices failed: %s", fmt::win_error{GetLastError(), nullptr});
return;
} }
m_registered_raw_input_devices = true;
} }
#endif #endif
type = mouse_handler::raw;
}
void raw_mouse_handler::enumerate_devices(u32 max_connect) void raw_mouse_handler::enumerate_devices(u32 max_connect)
{ {
input_log.notice("raw_mouse_handler: enumerating devices (max_connect=%d)", max_connect); input_log.notice("raw_mouse_handler: enumerating devices (max_connect=%d)", max_connect);

5
rpcs3/Input/raw_mouse_handler.h
View File

@ -89,6 +89,11 @@ public:
private: private:
void enumerate_devices(u32 max_connect); void enumerate_devices(u32 max_connect);
#ifdef _WIN32
void register_raw_input_devices();
bool m_registered_raw_input_devices = false;
#endif
bool m_ignore_config = false; bool m_ignore_config = false;
std::map<void*, raw_mouse> m_raw_mice; std::map<void*, raw_mouse> m_raw_mice;
std::function<void(const std::string&, s32, bool)> m_mouse_press_callback; std::function<void(const std::string&, s32, bool)> m_mouse_press_callback;