izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8473 from jordan-woyak/evdev-combine

Browse Source 
ControllerInterface: Combine evdev devices with the same unique ID.
This commit is contained in:
JMC47
2020-01-13 18:30:29 -05:00
committed by GitHub
parent da59f97278 e2d5c92c76
commit d5dcd91c94
2 changed files with 293 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
+279 -125
View File
File diff suppressed because it is too large Load Diff
Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
+14 -6
View File
@@ -76,18 +76,26 @@ public:
void UpdateInput() override;
bool IsValid() const override;
evdevDevice(const std::string& devnode);
~evdevDevice();
// Return true if node was "interesting".
bool AddNode(std::string devnode, int fd, libevdev* dev);
const char* GetUniqueID() const;
std::string GetName() const override { return m_name; }
std::string GetSource() const override { return "evdev"; }
bool IsInteresting() const { return m_interesting; }
private:
const std::string m_devfile;
int m_fd;
libevdev* m_dev;
std::string m_name;
bool m_interesting = false;
struct Node
{
std::string devnode;
int fd;
libevdev* device;
};
std::vector<Node> m_nodes;
};
} // namespace ciface::evdev