summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2020-09-26 00:36:16 -0400
committerGitHub <noreply@github.com>2020-09-26 00:36:16 -0400
commitc64d41d3e783441e4f0b34d4b70cc754ca610b15 (patch)
tree99fc4c788520c1ca60fa0e58412ae1ef7353dbb3 /Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
parent57f14b260bf043b6c261ca284b6c45fa3a7932de (diff)
parent431eb4d60d8a413ad9a4a72b1305f8090410a741 (diff)
Merge pull request #8428 from jordan-woyak/better-hotkeys
InputCommon: Add hotkey support to input expressions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 1e617d6c24..5aca9f5280 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -87,6 +87,11 @@ KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device,
for (u8 i = 0; i < sizeof(named_keys) / sizeof(*named_keys); ++i)
AddInput(new Key(i, m_state_in.keyboard[named_keys[i].code]));
+ // Add combined left/right modifiers with consistent naming across platforms.
+ AddCombinedInput("Alt", {"LMENU", "RMENU"});
+ AddCombinedInput("Shift", {"LSHIFT", "RSHIFT"});
+ AddCombinedInput("Ctrl", {"LCONTROL", "RCONTROL"});
+
// MOUSE
DIDEVCAPS mouse_caps = {};
mouse_caps.dwSize = sizeof(mouse_caps);