zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 07:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed hanging on startup in native OS X backend when Xbox 360 gamepad is connected

Browse source 
Apple's HID Utilities has a issue with device elements enumeration while using unofficial drivers from here:
http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver
This commit is contained in:
alexey.lysiuk 2014-12-20 11:49:19 +02:00
parent 24f1bfae99
commit 08cd03dbb7
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/cocoa/i_joystick.cpp
View file

@ -152,23 +152,33 @@ IOKitJoystick::IOKitJoystick( IOHIDDeviceRef device )
: m_device( device ) : m_device( device )
, m_sensitivity( DEFAULT_SENSITIVITY ) , m_sensitivity( DEFAULT_SENSITIVITY )
{ {
IOHIDElementRef element = HIDGetFirstDeviceElement( device, kHIDElementTypeInput ); assert(NULL != device);
assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device));
while ( NULL != element )
CFArrayRef elements = IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone);
assert(NULL != elements);
assert(CFArrayGetTypeID() == CFGetTypeID(elements));
for (CFIndex i = 0, count = CFArrayGetCount(elements); i < count; ++i)
{ {
const IOHIDElementRef element =
static_cast<IOHIDElementRef>(const_cast<void*>(CFArrayGetValueAtIndex(elements, i)));
assert(NULL != element);
assert(IOHIDElementGetTypeID() == CFGetTypeID(element));
const uint32_t usagePage = IOHIDElementGetUsagePage( element ); const uint32_t usagePage = IOHIDElementGetUsagePage( element );
if ( kHIDPage_GenericDesktop == usagePage ) if ( kHIDPage_GenericDesktop == usagePage )
{ {
const uint32_t usage = IOHIDElementGetUsage( element ); const uint32_t usage = IOHIDElementGetUsage( element );
if ( kHIDUsage_GD_Slider == usage if ( kHIDUsage_GD_Slider == usage
|| kHIDUsage_GD_X == usage || kHIDUsage_GD_Y == usage || kHIDUsage_GD_Z == usage || kHIDUsage_GD_X == usage || kHIDUsage_GD_Y == usage || kHIDUsage_GD_Z == usage
|| kHIDUsage_GD_Rx == usage || kHIDUsage_GD_Ry == usage || kHIDUsage_GD_Rz == usage ) || kHIDUsage_GD_Rx == usage || kHIDUsage_GD_Ry == usage || kHIDUsage_GD_Rz == usage )
{ {
AxisInfo axis; AxisInfo axis;
memset( &axis, 0, sizeof( axis ) ); memset( &axis, 0, sizeof( axis ) );
if ( const CFStringRef name = IOHIDElementGetName( element ) ) if ( const CFStringRef name = IOHIDElementGetName( element ) )
{ {
CFStringGetCString( name, axis.name, sizeof( axis.name ) - 1, kCFStringEncodingUTF8 ); CFStringGetCString( name, axis.name, sizeof( axis.name ) - 1, kCFStringEncodingUTF8 );
@ -177,22 +187,22 @@ IOKitJoystick::IOKitJoystick( IOHIDDeviceRef device )
{ {
snprintf( axis.name, sizeof( axis.name ), "Axis %i", m_axes.Size() + 1 ); snprintf( axis.name, sizeof( axis.name ), "Axis %i", m_axes.Size() + 1 );
} }
axis.element = element; axis.element = element;
m_axes.Push( axis ); m_axes.Push( axis );
IOHIDElement_SetCalibrationMin( element, -1 ); IOHIDElement_SetCalibrationMin( element, -1 );
IOHIDElement_SetCalibrationMax( element, 1 ); IOHIDElement_SetCalibrationMax( element, 1 );
HIDQueueElement( m_device, element ); HIDQueueElement( m_device, element );
} }
else if ( kHIDUsage_GD_Hatswitch == usage && m_POVs.Size() < 4 ) else if ( kHIDUsage_GD_Hatswitch == usage && m_POVs.Size() < 4 )
{ {
m_POVs.Push( element ); m_POVs.Push( element );
HIDQueueElement( m_device, element ); HIDQueueElement( m_device, element );
} }
} }
else if ( kHIDPage_Button == usagePage ) else if ( kHIDPage_Button == usagePage )
{ {
@ -200,10 +210,10 @@ IOKitJoystick::IOKitJoystick( IOHIDDeviceRef device )
HIDQueueElement( m_device, element ); HIDQueueElement( m_device, element );
} }
element = HIDGetNextDeviceElement( element, kHIDElementTypeInput );
} }
CFRelease(elements);
SetDefaultConfig(); SetDefaultConfig();
} }