diff options
| author | JMC47 <JMC4789@gmail.com> | 2020-09-26 00:36:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 00:36:16 -0400 |
| commit | c64d41d3e783441e4f0b34d4b70cc754ca610b15 (patch) | |
| tree | 99fc4c788520c1ca60fa0e58412ae1ef7353dbb3 /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | |
| parent | 57f14b260bf043b6c261ca284b6c45fa3a7932de (diff) | |
| parent | 431eb4d60d8a413ad9a4a72b1305f8090410a741 (diff) | |
Merge pull request #8428 from jordan-woyak/better-hotkeys
InputCommon: Add hotkey support to input expressions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index d049f22c8c..9ec1c2be35 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -172,6 +172,11 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar delete temp_key; } + // Add combined left/right modifiers with consistent naming across platforms. + AddCombinedInput("Alt", {"Alt_L", "Alt_R"}); + AddCombinedInput("Shift", {"Shift_L", "Shift_R"}); + AddCombinedInput("Ctrl", {"Control_L", "Control_R"}); + // Mouse Buttons for (int i = 0; i < 32; i++) AddInput(new Button(i, &m_state.buttons)); |