anulax
/
glfw
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Cleanup

Browse Source
master
Camilla Berglund ago%!(EXTRA string=10 years)
parent 8a7fa306ce
commit 3aebb0bfe3
2 changed files with 81 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/cocoa_joystick.h
  2. 169
      src/cocoa_joystick.m

2
src/cocoa_joystick.h
Unescape View File

@ -56,7 +56,7 @@ typedef struct _GLFWjoydeviceNS
// //
typedef struct _GLFWjoystickNS typedef struct _GLFWjoystickNS
{ {
_GLFWjoydeviceNS devices[GLFW_JOYSTICK_LAST + 1]; _GLFWjoydeviceNS js[GLFW_JOYSTICK_LAST + 1];
IOHIDManagerRef managerRef; IOHIDManagerRef managerRef;
} _GLFWjoystickNS; } _GLFWjoystickNS;

169
src/cocoa_joystick.m
Unescape View File

@ -38,9 +38,8 @@
#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h> #include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
//------------------------------------------------------------------------
// Joystick element information // Joystick element information
//------------------------------------------------------------------------ //
typedef struct _GLFWjoyelementNS typedef struct _GLFWjoyelementNS
{ {
IOHIDElementRef elementRef; IOHIDElementRef elementRef;
@ -58,7 +57,7 @@ static void getElementsCFArrayHandler(const void* value, void* parameter);
// Adds an element to the specified joystick // Adds an element to the specified joystick
// //
static void addJoystickElement(_GLFWjoydeviceNS* joystick, static void addJoystickElement(_GLFWjoydeviceNS* js,
IOHIDElementRef elementRef) IOHIDElementRef elementRef)
{ {
IOHIDElementType elementType; IOHIDElementType elementType;
@ -91,10 +90,10 @@ static void addJoystickElement(_GLFWjoydeviceNS* joystick,
case kHIDUsage_GD_Slider: case kHIDUsage_GD_Slider:
case kHIDUsage_GD_Dial: case kHIDUsage_GD_Dial:
case kHIDUsage_GD_Wheel: case kHIDUsage_GD_Wheel:
elementsArray = joystick->axisElements; elementsArray = js->axisElements;
break; break;
case kHIDUsage_GD_Hatswitch: case kHIDUsage_GD_Hatswitch:
elementsArray = joystick->hatElements; elementsArray = js->hatElements;
break; break;
} }
@ -102,7 +101,7 @@ static void addJoystickElement(_GLFWjoydeviceNS* joystick,
} }
case kHIDPage_Button: case kHIDPage_Button:
elementsArray = joystick->buttonElements; elementsArray = js->buttonElements;
break; break;
default: default:
break; break;
@ -134,15 +133,15 @@ static void getElementsCFArrayHandler(const void* value, void* parameter)
// Returns the value of the specified element of the specified joystick // Returns the value of the specified element of the specified joystick
// //
static long getElementValue(_GLFWjoydeviceNS* joystick, _GLFWjoyelementNS* element) static long getElementValue(_GLFWjoydeviceNS* js, _GLFWjoyelementNS* element)
{ {
IOReturn result = kIOReturnSuccess; IOReturn result = kIOReturnSuccess;
IOHIDValueRef valueRef; IOHIDValueRef valueRef;
long value = 0; long value = 0;
if (joystick && element && joystick->deviceRef) if (js && element && js->deviceRef)
{ {
result = IOHIDDeviceGetValue(joystick->deviceRef, result = IOHIDDeviceGetValue(js->deviceRef,
element->elementRef, element->elementRef,
&valueRef); &valueRef);
@ -164,57 +163,57 @@ static long getElementValue(_GLFWjoydeviceNS* joystick, _GLFWjoyelementNS* eleme
// Removes the specified joystick // Removes the specified joystick
// //
static void removeJoystick(_GLFWjoydeviceNS* joystick) static void removeJoystick(_GLFWjoydeviceNS* js)
{ {
int i; int i;
if (!joystick->present) if (!js->present)
return; return;
for (i = 0; i < CFArrayGetCount(joystick->axisElements); i++) for (i = 0; i < CFArrayGetCount(js->axisElements); i++)
free((void*) CFArrayGetValueAtIndex(joystick->axisElements, i)); free((void*) CFArrayGetValueAtIndex(js->axisElements, i));
CFArrayRemoveAllValues(joystick->axisElements); CFArrayRemoveAllValues(js->axisElements);
CFRelease(joystick->axisElements); CFRelease(js->axisElements);
for (i = 0; i < CFArrayGetCount(joystick->buttonElements); i++) for (i = 0; i < CFArrayGetCount(js->buttonElements); i++)
free((void*) CFArrayGetValueAtIndex(joystick->buttonElements, i)); free((void*) CFArrayGetValueAtIndex(js->buttonElements, i));
CFArrayRemoveAllValues(joystick->buttonElements); CFArrayRemoveAllValues(js->buttonElements);
CFRelease(joystick->buttonElements); CFRelease(js->buttonElements);
for (i = 0; i < CFArrayGetCount(joystick->hatElements); i++) for (i = 0; i < CFArrayGetCount(js->hatElements); i++)
free((void*) CFArrayGetValueAtIndex(joystick->hatElements, i)); free((void*) CFArrayGetValueAtIndex(js->hatElements, i));
CFArrayRemoveAllValues(joystick->hatElements); CFArrayRemoveAllValues(js->hatElements);
CFRelease(joystick->hatElements); CFRelease(js->hatElements);
free(joystick->axes); free(js->axes);
free(joystick->buttons); free(js->buttons);
memset(joystick, 0, sizeof(_GLFWjoydeviceNS)); memset(js, 0, sizeof(_GLFWjoydeviceNS));
_glfwInputJoystickChange(joystick - _glfw.ns_js.devices, GLFW_DISCONNECTED); _glfwInputJoystickChange(js - _glfw.ns_js.js, GLFW_DISCONNECTED);
} }
// Polls for joystick axis events and updates GLFW state // Polls for joystick axis events and updates GLFW state
// //
static GLFWbool pollJoystickAxisEvents(_GLFWjoydeviceNS* joystick) static GLFWbool pollJoystickAxisEvents(_GLFWjoydeviceNS* js)
{ {
CFIndex i; CFIndex i;
if (!joystick->present) if (!js->present)
return GLFW_FALSE; return GLFW_FALSE;
for (i = 0; i < CFArrayGetCount(joystick->axisElements); i++) for (i = 0; i < CFArrayGetCount(js->axisElements); i++)
{ {
_GLFWjoyelementNS* axis = (_GLFWjoyelementNS*) _GLFWjoyelementNS* axis = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(joystick->axisElements, i); CFArrayGetValueAtIndex(js->axisElements, i);
long value = getElementValue(joystick, axis); long value = getElementValue(js, axis);
long readScale = axis->maxReport - axis->minReport; long readScale = axis->maxReport - axis->minReport;
if (readScale == 0) if (readScale == 0)
joystick->axes[i] = value; js->axes[i] = value;
else else
joystick->axes[i] = (2.f * (value - axis->minReport) / readScale) - 1.f; js->axes[i] = (2.f * (value - axis->minReport) / readScale) - 1.f;
} }
return GLFW_TRUE; return GLFW_TRUE;
@ -222,43 +221,43 @@ static GLFWbool pollJoystickAxisEvents(_GLFWjoydeviceNS* joystick)
// Polls for joystick button events and updates GLFW state // Polls for joystick button events and updates GLFW state
// //
static GLFWbool pollJoystickButtonEvents(_GLFWjoydeviceNS* joystick) static GLFWbool pollJoystickButtonEvents(_GLFWjoydeviceNS* js)
{ {
CFIndex i; CFIndex i;
int buttonIndex = 0; int buttonIndex = 0;
if (!joystick->present) if (!js->present)
return GLFW_FALSE; return GLFW_FALSE;
for (i = 0; i < CFArrayGetCount(joystick->buttonElements); i++) for (i = 0; i < CFArrayGetCount(js->buttonElements); i++)
{ {
_GLFWjoyelementNS* button = (_GLFWjoyelementNS*) _GLFWjoyelementNS* button = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(joystick->buttonElements, i); CFArrayGetValueAtIndex(js->buttonElements, i);
if (getElementValue(joystick, button)) if (getElementValue(js, button))
joystick->buttons[buttonIndex++] = GLFW_PRESS; js->buttons[buttonIndex++] = GLFW_PRESS;
else else
joystick->buttons[buttonIndex++] = GLFW_RELEASE; js->buttons[buttonIndex++] = GLFW_RELEASE;
} }
for (i = 0; i < CFArrayGetCount(joystick->hatElements); i++) for (i = 0; i < CFArrayGetCount(js->hatElements); i++)
{ {
_GLFWjoyelementNS* hat = (_GLFWjoyelementNS*) _GLFWjoyelementNS* hat = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(joystick->hatElements, i); CFArrayGetValueAtIndex(js->hatElements, i);
// Bit fields of button presses for each direction, including nil // Bit fields of button presses for each direction, including nil
const int directions[9] = { 1, 3, 2, 6, 4, 12, 8, 9, 0 }; const int directions[9] = { 1, 3, 2, 6, 4, 12, 8, 9, 0 };
long j, value = getElementValue(joystick, hat); long j, value = getElementValue(js, hat);
if (value < 0 || value > 8) if (value < 0 || value > 8)
value = 8; value = 8;
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
{ {
if (directions[value] & (1 << j)) if (directions[value] & (1 << j))
joystick->buttons[buttonIndex++] = GLFW_PRESS; js->buttons[buttonIndex++] = GLFW_PRESS;
else else
joystick->buttons[buttonIndex++] = GLFW_RELEASE; js->buttons[buttonIndex++] = GLFW_RELEASE;
} }
} }
@ -272,49 +271,43 @@ static void matchCallback(void* context,
void* sender, void* sender,
IOHIDDeviceRef deviceRef) IOHIDDeviceRef deviceRef)
{ {
_GLFWjoydeviceNS* joystick; _GLFWjoydeviceNS* js;
int joy; int joy;
for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++) for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++)
{ {
joystick = _glfw.ns_js.devices + joy; if (!_glfw.ns_js.js[joy].present && _glfw.ns_js.js[joy].deviceRef == deviceRef)
if (!joystick->present)
continue;
if (joystick->deviceRef == deviceRef)
return; return;
} }
for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++) for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++)
{ {
joystick = _glfw.ns_js.devices + joy; if (!_glfw.ns_js.js[joy].present)
if (!joystick->present)
break; break;
} }
if (joy > GLFW_JOYSTICK_LAST) if (joy > GLFW_JOYSTICK_LAST)
return; return;
joystick->present = GLFW_TRUE; js = _glfw.ns_js.js + joy;
joystick->deviceRef = deviceRef; js->present = GLFW_TRUE;
js->deviceRef = deviceRef;
CFStringRef name = IOHIDDeviceGetProperty(deviceRef, CFStringRef name = IOHIDDeviceGetProperty(deviceRef,
CFSTR(kIOHIDProductKey)); CFSTR(kIOHIDProductKey));
if (name) if (name)
{ {
CFStringGetCString(name, CFStringGetCString(name,
joystick->name, js->name,
sizeof(joystick->name), sizeof(js->name),
kCFStringEncodingUTF8); kCFStringEncodingUTF8);
} }
else else
strncpy(joystick->name, "Unknown", sizeof(joystick->name)); strncpy(js->name, "Unknown", sizeof(js->name));
joystick->axisElements = CFArrayCreateMutable(NULL, 0, NULL); js->axisElements = CFArrayCreateMutable(NULL, 0, NULL);
joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL); js->buttonElements = CFArrayCreateMutable(NULL, 0, NULL);
joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL); js->hatElements = CFArrayCreateMutable(NULL, 0, NULL);
CFArrayRef arrayRef = IOHIDDeviceCopyMatchingElements(deviceRef, CFArrayRef arrayRef = IOHIDDeviceCopyMatchingElements(deviceRef,
NULL, NULL,
@ -323,14 +316,13 @@ static void matchCallback(void* context,
CFArrayApplyFunction(arrayRef, CFArrayApplyFunction(arrayRef,
range, range,
getElementsCFArrayHandler, getElementsCFArrayHandler,
(void*) joystick); (void*) js);
CFRelease(arrayRef); CFRelease(arrayRef);
joystick->axes = calloc(CFArrayGetCount(joystick->axisElements), js->axes = calloc(CFArrayGetCount(js->axisElements), sizeof(float));
sizeof(float)); js->buttons = calloc(CFArrayGetCount(js->buttonElements) +
joystick->buttons = calloc(CFArrayGetCount(joystick->buttonElements) + CFArrayGetCount(js->hatElements) * 4, 1);
CFArrayGetCount(joystick->hatElements) * 4, 1);
_glfwInputJoystickChange(joy, GLFW_CONNECTED); _glfwInputJoystickChange(joy, GLFW_CONNECTED);
} }
@ -346,10 +338,9 @@ static void removeCallback(void* context,
for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++) for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; if (_glfw.ns_js.js[joy].deviceRef == deviceRef)
if (joystick->deviceRef == deviceRef)
{ {
removeJoystick(joystick); removeJoystick(_glfw.ns_js.js + joy);
break; break;
} }
} }
@ -467,10 +458,10 @@ void _glfwTerminateJoysticksNS(void)
{ {
int joy; int joy;
for (joy = 0; joy <= GLFW_JOYSTICK_LAST; joy++) for (joy = GLFW_JOYSTICK_1; joy <= GLFW_JOYSTICK_LAST; joy++)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* js = _glfw.ns_js.js + joy;
removeJoystick(joystick); removeJoystick(js);
} }
CFRelease(_glfw.ns_js.managerRef); CFRelease(_glfw.ns_js.managerRef);
@ -484,37 +475,37 @@ void _glfwTerminateJoysticksNS(void)
int _glfwPlatformJoystickPresent(int joy) int _glfwPlatformJoystickPresent(int joy)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* js = _glfw.ns_js.js + joy;
return joystick->present; return js->present;
} }
const float* _glfwPlatformGetJoystickAxes(int joy, int* count) const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* js = _glfw.ns_js.js + joy;
if (!pollJoystickAxisEvents(joystick)) if (!pollJoystickAxisEvents(js))
return NULL; return NULL;
*count = (int) CFArrayGetCount(joystick->axisElements); *count = (int) CFArrayGetCount(js->axisElements);
return joystick->axes; return js->axes;
} }
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count) const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* js = _glfw.ns_js.js + joy;
if (!pollJoystickButtonEvents(joystick)) if (!pollJoystickButtonEvents(js))
return NULL; return NULL;
*count = (int) CFArrayGetCount(joystick->buttonElements) + *count = (int) CFArrayGetCount(js->buttonElements) +
(int) CFArrayGetCount(joystick->hatElements) * 4; (int) CFArrayGetCount(js->hatElements) * 4;
return joystick->buttons; return js->buttons;
} }
const char* _glfwPlatformGetJoystickName(int joy) const char* _glfwPlatformGetJoystickName(int joy)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* js = _glfw.ns_js.js + joy;
if (!joystick->present) if (!js->present)
return NULL; return NULL;
return joystick->name; return js->name;
} }

Write Preview
Loading…
Cancel
Save