From c31c32f9215f28b27d478798f6b58523cfe04fa5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 3 Feb 2019 20:15:33 +0530 Subject: [PATCH] Cocoa: Add missing IOHID page and usages From upstream: https://github.com/glfw/glfw/commit/51ca41dd9fdf98bc9d38810f84ad4cb218ecd88a --- glfw/cocoa_joystick.m | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/glfw/cocoa_joystick.m b/glfw/cocoa_joystick.m index 0831809f8..b7586056b 100644 --- a/glfw/cocoa_joystick.m +++ b/glfw/cocoa_joystick.m @@ -220,9 +220,18 @@ static void matchCallback(void* context, case kHIDUsage_GD_Hatswitch: target = hats; break; + case kHIDUsage_GD_DPadUp: + case kHIDUsage_GD_DPadRight: + case kHIDUsage_GD_DPadDown: + case kHIDUsage_GD_DPadLeft: + case kHIDUsage_GD_SystemMainMenu: + case kHIDUsage_GD_Select: + case kHIDUsage_GD_Start: + target = buttons; + break; } } - else if (page == kHIDPage_Button) + else if (page == kHIDPage_Button || page == kHIDPage_Consumer) target = buttons; if (target) @@ -459,4 +468,3 @@ void _glfwPlatformUpdateGamepadGUID(char* guid) original, original + 16); } } -