diff options
| author | Michael Maltese <michael.joseph.maltese@gmail.com> | 2016-08-08 09:38:22 -0700 |
|---|---|---|
| committer | Michael Maltese <michael.joseph.maltese@gmail.com> | 2016-08-08 09:38:22 -0700 |
| commit | 3dc8136e1445244d8c7181d0bbb65e223728dd70 (patch) | |
| tree | dd63e024a5db39b2cfacc9d756f89099c3c153fb /Source/Core/InputCommon/InputConfig.cpp | |
| parent | 1ab99ee22c1b6ae1b6d71aef717f277f39045067 (diff) | |
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 |