archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Input: handle MMJOY reconnection (pad still needs to be online on start)

Browse source
This commit is contained in:
Unknown 2017-12-01 10:18:11 +01:00 • committed by Ani
parent 2ec4f66427
commit 8f314c5101
2 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

51
rpcs3/mm_joystick_handler.cpp
View file

@ -85,25 +85,11 @@ bool mm_joystick_handler::Init()
for (u32 i = 0; i < supportedJoysticks; i++) for (u32 i = 0; i < supportedJoysticks; i++)
{ {
JOYINFOEX js_info; MMJOYDevice dev;
JOYCAPS js_caps;
js_info.dwSize = sizeof(js_info);
js_info.dwFlags = JOY_RETURNALL;
joyGetDevCaps(i, &js_caps, sizeof(js_caps));
if (joyGetPosEx(i, &js_info) != JOYERR_NOERROR) if (GetMMJOYDevice(i, dev) == false)
continue; continue;
char drv[32];
wcstombs(drv, js_caps.szPname, 31);
LOG_NOTICE(GENERAL, "Joystick nr.%d found. Driver: %s", i, drv);
MMJOYDevice dev;
dev.device_id = i;
dev.device_name = fmt::format("Joystick #%d", i);
dev.device_info = js_info;
dev.device_caps = js_caps;
m_devices.emplace(i, dev); m_devices.emplace(i, dev);
} }
@ -128,13 +114,12 @@ std::vector<std::string> mm_joystick_handler::ListDevices()
bool mm_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) bool mm_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device)
{ {
if (!Init()) return false; if (!Init())
return false;
int id = GetIDByName(device); int id = GetIDByName(device);
if (id < 0) if (id < 0)
{
return false; return false;
}
std::shared_ptr<MMJOYDevice> joy_device = std::make_shared<MMJOYDevice>(m_devices.at(id)); std::shared_ptr<MMJOYDevice> joy_device = std::make_shared<MMJOYDevice>(m_devices.at(id));
@ -216,7 +201,11 @@ void mm_joystick_handler::ThreadProc()
case JOYERR_NOERROR: case JOYERR_NOERROR:
++online; ++online;
if (last_connection_status[i] == false) if (last_connection_status[i] == false)
{
if (GetMMJOYDevice(dev->device_id, *dev) == false)
continue;
pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES; pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
}
last_connection_status[i] = true; last_connection_status[i] = true;
pad->m_port_status |= CELL_PAD_STATUS_CONNECTED; pad->m_port_status |= CELL_PAD_STATUS_CONNECTED;
@ -543,4 +532,28 @@ int mm_joystick_handler::GetIDByName(const std::string& name)
return -1; return -1;
} }
bool mm_joystick_handler::GetMMJOYDevice(int index, MMJOYDevice& dev)
{
JOYINFOEX js_info;
JOYCAPS js_caps;
js_info.dwSize = sizeof(js_info);
js_info.dwFlags = JOY_RETURNALL;
joyGetDevCaps(index, &js_caps, sizeof(js_caps));
if (joyGetPosEx(index, &js_info) != JOYERR_NOERROR)
return false;
char drv[32];
wcstombs(drv, js_caps.szPname, 31);
LOG_NOTICE(GENERAL, "Joystick nr.%d found. Driver: %s", index, drv);
dev.device_id = index;
dev.device_name = fmt::format("Joystick #%d", index);
dev.device_info = js_info;
dev.device_caps = js_caps;
return true;
}
#endif #endif

1
rpcs3/mm_joystick_handler.h
View file

@ -109,6 +109,7 @@ private:
void TranslateButtonPress(u64 keyCode, bool& pressed, u16& val, bool ignore_threshold = false) override; void TranslateButtonPress(u64 keyCode, bool& pressed, u16& val, bool ignore_threshold = false) override;
std::unordered_map<u64, u16> GetButtonValues(const JOYINFOEX& js_info, const JOYCAPS& js_caps); std::unordered_map<u64, u16> GetButtonValues(const JOYINFOEX& js_info, const JOYCAPS& js_caps);
int GetIDByName(const std::string& name); int GetIDByName(const std::string& name);
bool GetMMJOYDevice(int index, MMJOYDevice& dev);
bool is_init = false; bool is_init = false;
u32 supportedJoysticks = 0; u32 supportedJoysticks = 0;