diff options
author | Kevin Hartman <kevin@hart.mn> | 2014-09-08 21:46:02 -0700 |
---|---|---|
committer | Kevin Hartman <kevin@hart.mn> | 2014-09-12 01:15:14 -0700 |
commit | 02fd19b2f60f4db8a683734e4300d7498c861309 (patch) | |
tree | c9c95671835d73b5ca7e52029de5bb27832e11a3 /src/common/key_map.h | |
parent | 4a94ec934ab1a2216f94e3fcc46f5dde1d6e2f02 (diff) |
Added support for multiple input device types for KeyMap and connected Qt.
Diffstat (limited to 'src/common/key_map.h')
-rw-r--r-- | src/common/key_map.h | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/src/common/key_map.h b/src/common/key_map.h index 7e94df61..b5acfbab 100644 --- a/src/common/key_map.h +++ b/src/common/key_map.h @@ -1,4 +1,4 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. @@ -8,28 +8,38 @@ namespace KeyMap { -class CitraKey { -public: - CitraKey() : keyCode(0) {} - CitraKey(int code) : keyCode(code) {} - - int keyCode; - - bool operator < (const CitraKey &other) const { - return keyCode < other.keyCode; +/** + * Represents a key for a specific host device. + */ +struct HostDeviceKey { + int key_code; + int device_id; ///< Uniquely identifies a host device + + bool operator < (const HostDeviceKey &other) const { + if (device_id == other.device_id) { + return key_code < other.key_code; + } + return device_id < other.device_id; } - bool operator == (const CitraKey &other) const { - return keyCode == other.keyCode; + bool operator == (const HostDeviceKey &other) const { + return device_id == other.device_id && key_code == other.key_code; } }; -struct DefaultKeyMapping { - KeyMap::CitraKey key; - HID_User::PADState state; -}; +/** + * Generates a new device id, which uniquely identifies a host device within KeyMap. + */ +int NewDeviceId(); + +/** + * Maps a device-specific key to a PadState. + */ +void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState); -void SetKeyMapping(CitraKey key, HID_User::PADState padState); -HID_User::PADState Get3DSKey(CitraKey key); +/** + * Gets the PadState that's mapped to the provided device-specific key. + */ +HID_User::PadState GetPadKey(HostDeviceKey key); } |