Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-02 21:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge e0e6ad51d6 into 0ffe934a3e

Browse Source
This commit is contained in:
Arseny Kapoulkine 2014-05-29 09:20:02 +00:00
commit c8fad6dfa6
1 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/iokit_joystick.m
View File

@ -316,7 +316,6 @@ void _glfwInitJoysticks(void)
while ((ioHIDDeviceObject = IOIteratorNext(objectIterator))) while ((ioHIDDeviceObject = IOIteratorNext(objectIterator)))
{ {
CFMutableDictionaryRef propsRef = NULL;
CFTypeRef valueRef = NULL; CFTypeRef valueRef = NULL;
kern_return_t result; kern_return_t result;
@ -324,50 +323,41 @@ void _glfwInitJoysticks(void)
HRESULT plugInResult = S_OK; HRESULT plugInResult = S_OK;
SInt32 score = 0; SInt32 score = 0;
long usagePage, usage; long usagePage = 0;
long usage = 0;
// Check device type valueRef = IORegistryEntryCreateCFProperty(ioHIDDeviceObject,
result = IORegistryEntryCreateCFProperties(ioHIDDeviceObject, CFSTR(kIOHIDPrimaryUsagePageKey),
&propsRef, kCFAllocatorDefault, kNilOptions);
kCFAllocatorDefault,
kNilOptions);
if (result != kIOReturnSuccess)
continue;
valueRef = CFDictionaryGetValue(propsRef, CFSTR(kIOHIDPrimaryUsagePageKey));
if (valueRef) if (valueRef)
{ {
CFNumberGetValue(valueRef, kCFNumberLongType, &usagePage); CFNumberGetValue(valueRef, kCFNumberLongType, &usagePage);
if (usagePage != kHIDPage_GenericDesktop)
{
// This device is not relevant to GLFW
CFRelease(valueRef);
CFRelease(propsRef);
continue;
}
CFRelease(valueRef); CFRelease(valueRef);
} }
valueRef = CFDictionaryGetValue(propsRef, CFSTR(kIOHIDPrimaryUsageKey)); valueRef = IORegistryEntryCreateCFProperty(ioHIDDeviceObject,
CFSTR(kIOHIDPrimaryUsageKey),
kCFAllocatorDefault, kNilOptions);
if (valueRef) if (valueRef)
{ {
CFNumberGetValue(valueRef, kCFNumberLongType, &usage); CFNumberGetValue(valueRef, kCFNumberLongType, &usage);
if ((usage != kHIDUsage_GD_Joystick &&
usage != kHIDUsage_GD_GamePad &&
usage != kHIDUsage_GD_MultiAxisController))
{
// This device is not relevant to GLFW
CFRelease(valueRef);
CFRelease(propsRef);
continue;
}
CFRelease(valueRef); CFRelease(valueRef);
} }
if (usagePage != kHIDPage_GenericDesktop)
{
// This device is not relevant to GLFW
continue;
}
if ((usage != kHIDUsage_GD_Joystick &&
usage != kHIDUsage_GD_GamePad &&
usage != kHIDUsage_GD_MultiAxisController))
{
// This device is not relevant to GLFW
continue;
}
_GLFWjoystickIOKit* joystick = _glfw.iokit_js + joy; _GLFWjoystickIOKit* joystick = _glfw.iokit_js + joy;
joystick->present = GL_TRUE; joystick->present = GL_TRUE;
@ -379,8 +369,6 @@ void _glfwInitJoysticks(void)
if (kIOReturnSuccess != result) if (kIOReturnSuccess != result)
{ {
CFRelease(valueRef);
CFRelease(propsRef);
return; return;
} }
@ -391,8 +379,6 @@ void _glfwInitJoysticks(void)
if (plugInResult != S_OK) if (plugInResult != S_OK)
{ {
CFRelease(valueRef);
CFRelease(propsRef);
return; return;
} }
@ -405,7 +391,9 @@ void _glfwInitJoysticks(void)
joystick); joystick);
// Get product string // Get product string
valueRef = CFDictionaryGetValue(propsRef, CFSTR(kIOHIDProductKey)); valueRef = IORegistryEntryCreateCFProperty(ioHIDDeviceObject,
CFSTR(kIOHIDProductKey),
kCFAllocatorDefault, kNilOptions);
if (valueRef) if (valueRef)
{ {
CFStringGetCString(valueRef, CFStringGetCString(valueRef,
@ -419,7 +407,9 @@ void _glfwInitJoysticks(void)
joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL); joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL);
joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL); joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL);
valueRef = CFDictionaryGetValue(propsRef, CFSTR(kIOHIDElementKey)); valueRef = IORegistryEntryCreateCFProperty(ioHIDDeviceObject,
CFSTR(kIOHIDElementKey),
kCFAllocatorDefault, kNilOptions);
if (CFGetTypeID(valueRef) == CFArrayGetTypeID()) if (CFGetTypeID(valueRef) == CFArrayGetTypeID())
{ {
CFRange range = { 0, CFArrayGetCount(valueRef) }; CFRange range = { 0, CFArrayGetCount(valueRef) };
@ -429,7 +419,6 @@ void _glfwInitJoysticks(void)
(void*) joystick); (void*) joystick);
CFRelease(valueRef); CFRelease(valueRef);
} }
CFRelease(propsRef);
joystick->axes = calloc(CFArrayGetCount(joystick->axisElements), joystick->axes = calloc(CFArrayGetCount(joystick->axisElements),
sizeof(float)); sizeof(float));