Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 05:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
peter 2013-10-28 20:09:41 +00:00
parent 0200b85f24
commit ffdbdcee58
1 changed files with 50 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/cocoa_joystick.m
View File

@ -52,7 +52,7 @@ typedef struct
} _GLFWjoyelement; } _GLFWjoyelement;
static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) static void copyToCFArray(const void *value, void *context)
{ {
CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); CFArrayAppendValue( ( CFMutableArrayRef ) context, value );
} }
@ -206,30 +206,23 @@ static void pollJoystickEvents(void)
} }
} }
static CFMutableDictionaryRef creates_osx_device_match(int usage) static CFMutableDictionaryRef createDevMatchDictionary(int page, int usage)
{ {
CFMutableDictionaryRef result = CFDictionaryCreateMutable( NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks ); CFMutableDictionaryRef resultRef = CFDictionaryCreateMutable( NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks );
CFNumberRef pageRef = CFNumberCreate( NULL, kCFNumberIntType, &page);
CFNumberRef usageRef = CFNumberCreate( NULL, kCFNumberIntType, &usage);
if ( !result ) if ( resultRef && pageRef && usageRef)
{
CFDictionarySetValue( resultRef, CFSTR( kIOHIDDeviceUsagePageKey ), pageRef );
CFDictionarySetValue( resultRef, CFSTR( kIOHIDPrimaryUsageKey ), usageRef );
CFRelease( pageRef );
CFRelease( usageRef );
return resultRef;
}
else
return NULL; return NULL;
int page = kHIDPage_GenericDesktop;
CFNumberRef pageCFNumberRef = CFNumberCreate( NULL, kCFNumberIntType, &page);
if ( !pageCFNumberRef )
return NULL;
CFDictionarySetValue( result, CFSTR( kIOHIDDeviceUsagePageKey ), pageCFNumberRef );
CFRelease( pageCFNumberRef );
CFNumberRef usageCFNumberRef = CFNumberCreate( NULL, kCFNumberIntType, &usage);
if ( !usageCFNumberRef )
return NULL;
CFDictionarySetValue( result, CFSTR( kIOHIDDeviceUsageKey ), usageCFNumberRef );
CFRelease( usageCFNumberRef );
return result;
} }
@ -248,85 +241,58 @@ void _glfwInitJoysticks(void)
if ( kIOReturnSuccess != tIOReturn ) if ( kIOReturnSuccess != tIOReturn )
return; return;
CFMutableArrayRef matching = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); CFMutableDictionaryRef joystickMatchRef = createDevMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);
CFMutableDictionaryRef gamepadMatchRef = createDevMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);
CFMutableDictionaryRef multiAxisMatchRef = createDevMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController);
CFArrayRef matchArrayRef = NULL;
if(multiAxisMatchRef && gamepadMatchRef && multiAxisMatchRef)
{ {
CFMutableDictionaryRef result = creates_osx_device_match(kHIDUsage_GD_Joystick); CFMutableDictionaryRef matchArray[] = { joystickMatchRef, gamepadMatchRef, multiAxisMatchRef };
if (result) matchArrayRef = CFArrayCreate(kCFAllocatorDefault,(const void **)matchArray, 3, &kCFTypeArrayCallBacks);
{ CFRelease(joystickMatchRef);CFRelease(gamepadMatchRef);CFRelease(multiAxisMatchRef);
CFArrayAppendValue( matching, result );
CFRelease(result);
result = creates_osx_device_match(kHIDUsage_GD_GamePad);
}
if (result)
{
CFArrayAppendValue( matching, result );
CFRelease(result);
result = creates_osx_device_match(kHIDUsage_GD_MultiAxisController);
}
if (result)
{
CFArrayAppendValue( matching, result );
CFRelease(result);
}
} }
IOHIDManagerSetDeviceMatchingMultiple( _glfw.ns.ioHIDManagerRef, matching); if(!matchArrayRef)
CFRelease(matching);
CFSetRef devset = IOHIDManagerCopyDevices( _glfw.ns.ioHIDManagerRef );
if(!devset)
return; return;
CFMutableArrayRef devarray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); IOHIDManagerSetDeviceMatchingMultiple( _glfw.ns.ioHIDManagerRef, matchArrayRef);
CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, devarray); CFRelease(matchArrayRef);
CFRelease( devset); CFSetRef deviceSet = IOHIDManagerCopyDevices( _glfw.ns.ioHIDManagerRef );
CFIndex idx,countDevices = CFArrayGetCount(devarray); if(!deviceSet)
return;
for (idx = 0; idx < countDevices; idx++) CFMutableArrayRef deviceArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
CFSetApplyFunction(deviceSet, copyToCFArray, deviceArray);
CFRelease( deviceSet);
CFIndex idx;
for (idx = 0; idx < CFArrayGetCount(deviceArray); idx++)
{ {
IOHIDDeviceRef tDevice = (IOHIDDeviceRef) CFArrayGetValueAtIndex(devarray, idx); IOHIDDeviceRef dev = (IOHIDDeviceRef) CFArrayGetValueAtIndex(deviceArray, idx);
CFArrayRef elementCFArrayRef = IOHIDDeviceCopyMatchingElements(tDevice, NULL, 0); CFArrayRef elementArray = IOHIDDeviceCopyMatchingElements(dev, NULL, 0);
if (!elementCFArrayRef) if (!elementArray)
continue; continue;
CFTypeRef valueRef = IOHIDDeviceGetProperty(tDevice, CFSTR( kIOHIDPrimaryUsageKey ));
if (!valueRef)
{
CFRelease(elementCFArrayRef);
continue;
}
long primaryUsage;
CFNumberGetValue(valueRef, kCFNumberLongType, &primaryUsage);
CFRelease(valueRef);
if ((primaryUsage != kHIDUsage_GD_Joystick &&
primaryUsage != kHIDUsage_GD_GamePad &&
primaryUsage != kHIDUsage_GD_MultiAxisController))
{
// This device is not relevant to GLFW
CFRelease(elementCFArrayRef);
continue;
}
_GLFWjoy* joystick = _glfw.ns.joysticks + joy; _GLFWjoy* joystick = _glfw.ns.joysticks + joy;
joystick->present = GL_TRUE; joystick->present = GL_TRUE;
CFStringRef strRef = IOHIDDeviceGetProperty(tDevice, CFSTR( kIOHIDProductKey )); CFStringRef strRef = IOHIDDeviceGetProperty(dev, CFSTR( kIOHIDProductKey ));
CFStringGetCString(strRef, joystick->name, sizeof(joystick->name), kCFStringEncodingUTF8); CFStringGetCString(strRef, joystick->name, sizeof(joystick->name), kCFStringEncodingUTF8);
CFRelease(strRef); CFRelease(strRef);
joystick->device = tDevice; joystick->device = dev;
joystick->axisElements = CFArrayCreateMutable(NULL, 0, NULL); joystick->axisElements = CFArrayCreateMutable(NULL, 0, NULL);
joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL); joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL);
joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL); joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL);
CFIndex eleidx, elecnt = CFArrayGetCount(elementCFArrayRef); CFIndex eleidx, elecnt = CFArrayGetCount(elementArray);
for (eleidx=0; eleidx<elecnt; eleidx++) for (eleidx=0; eleidx<elecnt; eleidx++)
{ {
IOHIDElementRef tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(elementCFArrayRef, eleidx); IOHIDElementRef elementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(elementArray, eleidx);
int elementType = IOHIDElementGetType(tIOHIDElementRef); int elementType = IOHIDElementGetType(elementRef);
int usagePage = IOHIDElementGetUsagePage(tIOHIDElementRef); int usagePage = IOHIDElementGetUsagePage(elementRef);
int usage = IOHIDElementGetUsage(tIOHIDElementRef); int usage = IOHIDElementGetUsage(elementRef);
if ((elementType != kIOHIDElementTypeInput_Axis) && if ((elementType != kIOHIDElementTypeInput_Axis) &&
(elementType != kIOHIDElementTypeInput_Button) && (elementType != kIOHIDElementTypeInput_Button) &&
@ -372,14 +338,14 @@ void _glfwInitJoysticks(void)
CFArrayAppendValue(elementsArray, control); CFArrayAppendValue(elementsArray, control);
control->elementRef = tIOHIDElementRef; control->elementRef = elementRef;
CFRetain(control->elementRef); CFRetain(control->elementRef);
control->max = control->maxReport = IOHIDElementGetLogicalMax(tIOHIDElementRef); control->max = control->maxReport = IOHIDElementGetLogicalMax(elementRef);
control->min = control->minReport = IOHIDElementGetLogicalMin(tIOHIDElementRef); control->min = control->minReport = IOHIDElementGetLogicalMin(elementRef);
} }
CFRelease(elementCFArrayRef); CFRelease(elementArray);
joystick->axes = calloc(CFArrayGetCount(joystick->axisElements), joystick->axes = calloc(CFArrayGetCount(joystick->axisElements),
sizeof(float)); sizeof(float));
@ -391,7 +357,7 @@ void _glfwInitJoysticks(void)
break; break;
} }
CFRelease(devarray); CFRelease(deviceArray);
IOHIDManagerRegisterDeviceRemovalCallback(_glfw.ns.ioHIDManagerRef, &removalCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(_glfw.ns.ioHIDManagerRef, &removalCallback, NULL);