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

fix evdev device list

Browse source
This commit is contained in:
Megamouse 2018-01-27 15:13:39 +01:00
parent d14c8a03b3
commit eba2216c4a
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
rpcs3/evdev_joystick_handler.cpp
View file

@ -113,6 +113,20 @@ bool evdev_joystick_handler::Init()
return true; return true;
} }
std::string evdev_joystick_handler::get_device_name(const libevdev* dev)
{
std::string name = libevdev_get_name(dev);
const auto unique = libevdev_get_uniq(dev);
if (name == "" && unique != nullptr)
name = unique;
if (name == "")
name = "Unknown Device";
return name;
}
bool evdev_joystick_handler::update_device(EvdevDevice& device) bool evdev_joystick_handler::update_device(EvdevDevice& device)
{ {
std::shared_ptr<Pad> pad = device.pad; std::shared_ptr<Pad> pad = device.pad;
@ -153,7 +167,7 @@ bool evdev_joystick_handler::update_device(EvdevDevice& device)
return false; return false;
} }
LOG_NOTICE(GENERAL, "Opened joystick: '%s' at %s (fd %d)", libevdev_get_name(dev), path, fd); LOG_NOTICE(GENERAL, "Opened joystick: '%s' at %s (fd %d)", get_device_name(dev), path, fd);
return true; return true;
} }
@ -571,6 +585,8 @@ int evdev_joystick_handler::GetButtonInfo(const input_event& evt, const EvdevDev
std::vector<std::string> evdev_joystick_handler::ListDevices() std::vector<std::string> evdev_joystick_handler::ListDevices()
{ {
Init(); Init();
std::unordered_map<std::string, u32> unique_names;
std::vector<std::string> evdev_joystick_list; std::vector<std::string> evdev_joystick_list;
fs::dir devdir{"/dev/input/"}; fs::dir devdir{"/dev/input/"};
fs::dir_entry et; fs::dir_entry et;
@ -597,7 +613,14 @@ std::vector<std::string> evdev_joystick_handler::ListDevices()
libevdev_has_event_code(dev, EV_ABS, ABS_Y)) libevdev_has_event_code(dev, EV_ABS, ABS_Y))
{ {
// It's a joystick. // It's a joystick.
evdev_joystick_list.push_back(et.name + ": " + libevdev_get_name(dev)); std::string name = get_device_name(dev);
if (unique_names.find(name) == unique_names.end())
unique_names.emplace(name, 1);
else
name = fmt::format("%d. %s", ++unique_names[name], name);
evdev_joystick_list.push_back(name);
} }
libevdev_free(dev); libevdev_free(dev);
close(fd); close(fd);
@ -612,6 +635,7 @@ int evdev_joystick_handler::add_device(const std::string& device, bool in_settin
return m_pad_index; return m_pad_index;
// Now we need to find the device with the same name, and make sure not to grab any duplicates. // Now we need to find the device with the same name, and make sure not to grab any duplicates.
std::unordered_map<std::string, u32> unique_names;
fs::dir devdir{ "/dev/input/" }; fs::dir devdir{ "/dev/input/" };
fs::dir_entry et; fs::dir_entry et;
while (devdir.read(et)) while (devdir.read(et))
@ -632,7 +656,14 @@ int evdev_joystick_handler::add_device(const std::string& device, bool in_settin
close(fd); close(fd);
continue; continue;
} }
const std::string name = et.name + ": " + libevdev_get_name(dev);
std::string name = get_device_name(dev);
if (unique_names.find(name) == unique_names.end())
unique_names.emplace(name, 1);
else
name = fmt::format("%d. %s", ++unique_names[name], name);
if (libevdev_has_event_type(dev, EV_KEY) && if (libevdev_has_event_type(dev, EV_KEY) &&
libevdev_has_event_code(dev, EV_ABS, ABS_X) && libevdev_has_event_code(dev, EV_ABS, ABS_X) &&
libevdev_has_event_code(dev, EV_ABS, ABS_Y) && libevdev_has_event_code(dev, EV_ABS, ABS_Y) &&

1
rpcs3/evdev_joystick_handler.h
View file

@ -341,6 +341,7 @@ public:
private: private:
void TranslateButtonPress(u64 keyCode, bool& pressed, u16& value, bool ignore_threshold = false) override; void TranslateButtonPress(u64 keyCode, bool& pressed, u16& value, bool ignore_threshold = false) override;
EvdevDevice* get_device(const std::string& device); EvdevDevice* get_device(const std::string& device);
std::string get_device_name(const libevdev* dev);
bool update_device(EvdevDevice& device); bool update_device(EvdevDevice& device);
void update_devs(); void update_devs();
int add_device(const std::string& device, bool in_settings = false); int add_device(const std::string& device, bool in_settings = false);