diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2016-10-03 03:13:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 03:13:58 -0700 |
| commit | 2747fd3a0d38821105ae124933070f9b83a41d15 (patch) | |
| tree | ff3b22a2ae13eba09836035bb865513bb0fc74ac /Source/Core/InputCommon/InputConfig.cpp | |
| parent | 5045fc869cfbcbee8e7e069cf24cb23e2b3fef13 (diff) | |
| parent | 0f5951e324f2685e25f04c353d14b348fc6ba6f6 (diff) | |
Merge pull request #4102 from ligfx/quartz_input
Add Quartz/CoreGraphics controller interface for default k&m events
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index e1869ca465..9df0b71e62 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -126,7 +126,8 @@ bool InputConfig::IsControllerControlledByGamepadDevice(int index) const const auto& controller = m_controllers.at(index).get()->default_device; // Filter out anything which obviously not a gamepad - return !((controller.source == "Keyboard") // OSX Keyboard/Mouse + return !((controller.source == "Keyboard") // OSX IOKit Keyboard/Mouse + || (controller.source == "Quartz") // OSX Quartz Keyboard/Mouse || (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse || (controller.source == "Android" && controller.name == "Touchscreen") // Android Touchscreen |