mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 18:35:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

keyboard fixes v2

Browse Source
This commit is contained in:
Nick 2017-08-22 12:26:44 -04:00
parent 0df4f7db4f
commit 3cddb62aea
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
View File

@ -167,13 +167,12 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS
std::string name = GetDeviceRefName(inIOHIDDeviceRef); std::string name = GetDeviceRefName(inIOHIDDeviceRef);
// Add a device if it's of a type we want // Add a device if it's of a type we want
if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick))
{ {
g_controller_interface.AddDevice(std::make_shared<Joystick>(inIOHIDDeviceRef, name));
} }
else else
{ {
g_controller_interface.AddDevice(std::make_shared<Joystick>(inIOHIDDeviceRef, name));
} }
NOTICE_LOG(SERIALINTERFACE, "Added device: %s", name.c_str()); NOTICE_LOG(SERIALINTERFACE, "Added device: %s", name.c_str());

2
Source/Core/InputCommon/InputConfig.cpp
View File

@ -136,7 +136,7 @@ bool InputConfig::IsControllerControlledByGamepadDevice(int index) const
const auto& controller = m_controllers.at(index).get()->default_device; const auto& controller = m_controllers.at(index).get()->default_device;
// Filter out anything which obviously not a gamepad // Filter out anything which obviously not a gamepad
return !((controller.source == "Quartz") // OSX Quartz Keyboard/Mouse return !((controller.source == "Quartz") // OSX Quartz Keyboard/Mouse
|| (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse || (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse
|| (controller.source == "Android" && || (controller.source == "Android" &&
controller.name == "Touchscreen") // Android Touchscreen controller.name == "Touchscreen") // Android Touchscreen