mirror of
https://github.com/TomHarte/CLK.git
synced 2024-07-29 16:29:08 +00:00
Merge pull request #859 from MaddTheSane/gcJoystick
Initial GameController joystick support.
This commit is contained in:
Thomas Harte
GitHub
commit
9f0129cab8
@ -10,17 +10,35 @@
|
||||
|
||||
@import IOKit;
|
||||
#include <IOKit/hid/IOHIDLib.h>
|
||||
@import GameController;
|
||||
|
||||
#pragma mark - CSJoystickButton
|
||||
|
||||
@implementation CSJoystickButton {
|
||||
@package
|
||||
bool _isPressed;
|
||||
}
|
||||
|
||||
- (instancetype)initWithIndex:(NSInteger)index {
|
||||
if (self = [super init]) {
|
||||
_index = index;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface CSIOJoystickButton: CSJoystickButton
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSIOJoystickButton {
|
||||
IOHIDElementRef _element;
|
||||
}
|
||||
|
||||
- (instancetype)initWithElement:(IOHIDElementRef)element index:(NSInteger)index {
|
||||
self = [super init];
|
||||
self = [super initWithIndex:index];
|
||||
if(self) {
|
||||
_index = index;
|
||||
_element = (IOHIDElementRef)CFRetain(element);
|
||||
}
|
||||
return self;
|
||||
@ -31,7 +49,7 @@
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSJoystickButton: %p>; button %ld, %@", self, (long)self.index, self.isPressed ? @"pressed" : @"released"];
|
||||
return [NSString stringWithFormat:@"<CSIOJoystickButton: %p>; button %ld, %@", self, (long)self.index, self.isPressed ? @"pressed" : @"released"];
|
||||
}
|
||||
|
||||
- (IOHIDElementRef)element {
|
||||
@ -47,14 +65,33 @@
|
||||
#pragma mark - CSJoystickAxis
|
||||
|
||||
@implementation CSJoystickAxis {
|
||||
@package
|
||||
float _position;
|
||||
}
|
||||
|
||||
- (instancetype)initWithType:(CSJoystickAxisType)type
|
||||
{
|
||||
if (self = [super init]) {
|
||||
_type = type;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface CSIOJoystickAxis: CSJoystickAxis
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSIOJoystickAxis {
|
||||
IOHIDElementRef _element;
|
||||
}
|
||||
|
||||
- (instancetype)initWithElement:(IOHIDElementRef)element type:(CSJoystickAxisType)type {
|
||||
self = [super init];
|
||||
self = [super initWithType:type];
|
||||
if(self) {
|
||||
_element = (IOHIDElementRef)CFRetain(element);
|
||||
_type = type;
|
||||
_position = 0.5f;
|
||||
}
|
||||
return self;
|
||||
@ -65,7 +102,7 @@
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSJoystickAxis: %p>; type %d, value %0.2f", self, (int)self.type, self.position];
|
||||
return [NSString stringWithFormat:@"<CSIOJoystickAxis: %p>; type %d, value %0.2f", self, (int)self.type, self.position];
|
||||
}
|
||||
|
||||
- (IOHIDElementRef)element {
|
||||
@ -81,6 +118,18 @@
|
||||
#pragma mark - CSJoystickHat
|
||||
|
||||
@implementation CSJoystickHat {
|
||||
@package
|
||||
CSJoystickHatDirection _direction;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface CSIOJoystickHat: CSJoystickHat
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@implementation CSIOJoystickHat {
|
||||
IOHIDElementRef _element;
|
||||
}
|
||||
|
||||
@ -97,7 +146,7 @@
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSJoystickHat: %p>; direction %ld", self, (long)self.direction];
|
||||
return [NSString stringWithFormat:@"<CSIOJoystickHat: %p>; direction %ld", self, (long)self.direction];
|
||||
}
|
||||
|
||||
- (IOHIDElementRef)element {
|
||||
@ -113,6 +162,24 @@
|
||||
#pragma mark - CSJoystick
|
||||
|
||||
@implementation CSJoystick {
|
||||
@package
|
||||
NSArray<CSJoystickButton *> *_buttons;
|
||||
NSArray<CSJoystickAxis *> *_axes;
|
||||
NSArray<CSJoystickHat *> *_hats;
|
||||
}
|
||||
|
||||
- (void)update
|
||||
{
|
||||
//subclass!
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface CSIOJoystick: CSJoystick
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSIOJoystick {
|
||||
IOHIDDeviceRef _device;
|
||||
}
|
||||
|
||||
@ -142,12 +209,12 @@
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSJoystick: %p>; buttons %@, axes %@, hats %@", self, self.buttons, self.axes, self.hats];
|
||||
return [NSString stringWithFormat:@"<CSIOJoystick: %p>; buttons %@, axes %@, hats %@", self, self.buttons, self.axes, self.hats];
|
||||
}
|
||||
|
||||
- (void)update {
|
||||
// Update buttons.
|
||||
for(CSJoystickButton *button in _buttons) {
|
||||
for(CSIOJoystickButton *button in _buttons) {
|
||||
IOHIDValueRef value;
|
||||
if(IOHIDDeviceGetValue(_device, button.element, &value) == kIOReturnSuccess) {
|
||||
// Some pressure-sensitive buttons return values greater than 1 for hard presses,
|
||||
@ -157,7 +224,7 @@
|
||||
}
|
||||
|
||||
// Update hats.
|
||||
for(CSJoystickHat *hat in _hats) {
|
||||
for(CSIOJoystickHat *hat in _hats) {
|
||||
IOHIDValueRef value;
|
||||
if(IOHIDDeviceGetValue(_device, hat.element, &value) == kIOReturnSuccess) {
|
||||
// Hats report a direction, which is either one of eight or one of four.
|
||||
@ -181,7 +248,7 @@
|
||||
}
|
||||
|
||||
// Update axes.
|
||||
for(CSJoystickAxis *axis in _axes) {
|
||||
for(CSIOJoystickAxis *axis in _axes) {
|
||||
IOHIDValueRef value;
|
||||
if(IOHIDDeviceGetValue(_device, axis.element, &value) == kIOReturnSuccess) {
|
||||
const CFIndex integerValue = IOHIDValueGetIntegerValue(value) - IOHIDElementGetLogicalMin(axis.element);
|
||||
@ -197,11 +264,157 @@
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - GameController subclasses
|
||||
|
||||
API_AVAILABLE(macos(11.0))
|
||||
@interface CSGCJoystickHat: CSJoystickHat
|
||||
@property (readonly, strong) GCDeviceDirectionPad *directionPad;
|
||||
@end
|
||||
|
||||
API_AVAILABLE(macos(11.0))
|
||||
@interface CSGCJoystickAxis: CSJoystickAxis
|
||||
@property (readonly, strong) GCDeviceAxisInput *axis;
|
||||
@end
|
||||
|
||||
API_AVAILABLE(macos(11.0))
|
||||
@interface CSGCJoystickButton: CSJoystickButton
|
||||
@property (readonly, strong) GCDeviceButtonInput *button;
|
||||
@end
|
||||
|
||||
API_AVAILABLE(macos(11.0))
|
||||
@interface CSGCJoystick: CSJoystick
|
||||
@property (readonly, strong) GCController *device;
|
||||
@end
|
||||
|
||||
@implementation CSGCJoystickHat
|
||||
|
||||
- (instancetype)initWithDirectionPad:(GCDeviceDirectionPad*)dPad {
|
||||
if (self = [super init]) {
|
||||
_directionPad = dPad;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSGCJoystickHat: %p>; direction %ld", self, (long)self.direction];
|
||||
}
|
||||
|
||||
- (void)setDirection:(CSJoystickHatDirection)direction {
|
||||
_direction = direction;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSGCJoystickAxis
|
||||
|
||||
- (instancetype)initWithAxis:(GCDeviceAxisInput*)element type:(CSJoystickAxisType)type {
|
||||
self = [super initWithType:type];
|
||||
if(self) {
|
||||
_axis = element;
|
||||
_position = 0.5f;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSGCJoystickAxis: %p>; type %d, value %0.2f", self, (int)self.type, self.position];
|
||||
}
|
||||
|
||||
- (void)setPosition:(float)position {
|
||||
_position = position;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSGCJoystickButton
|
||||
|
||||
- (instancetype)initWithButton:(GCDeviceButtonInput*)element index:(NSInteger)index {
|
||||
self = [super initWithIndex:index];
|
||||
if(self) {
|
||||
_button = element;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSGCJoystickButton: %p>; button %ld, %@", self, (long)self.index, self.isPressed ? @"pressed" : @"released"];
|
||||
}
|
||||
|
||||
- (void)setIsPressed:(bool)isPressed {
|
||||
_isPressed = isPressed;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation CSGCJoystick
|
||||
|
||||
- (instancetype)initWithButtons:(NSArray<CSJoystickButton *> *)buttons
|
||||
axes:(NSArray<CSJoystickAxis *> *)axes
|
||||
hats:(NSArray<CSJoystickHat *> *)hats
|
||||
device:(GCController*)device {
|
||||
if (self = [super init]) {
|
||||
// Sort buttons by index.
|
||||
_buttons = [buttons sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES]]];
|
||||
|
||||
// Sort axes by enum value.
|
||||
_axes = [axes sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"type" ascending:YES]]];
|
||||
|
||||
// Hats have no guaranteed ordering.
|
||||
_hats = hats;
|
||||
|
||||
// Keep hold of the device.
|
||||
_device = device;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
-(void)update {
|
||||
// Update buttons.
|
||||
for(CSGCJoystickButton *button in _buttons) {
|
||||
// This assumes that the values provided by GCDeviceButtonInput are
|
||||
// digital. This might not always be the case.
|
||||
button.isPressed = button.button.pressed;
|
||||
}
|
||||
for(CSGCJoystickAxis *axis in _axes) {
|
||||
float val = axis.axis.value;
|
||||
val += 1;
|
||||
val /= 2;
|
||||
axis.position = val;
|
||||
}
|
||||
for(CSGCJoystickHat *hat in _hats) {
|
||||
// This assumes that the values provided by GCDeviceDirectionPad are
|
||||
// digital. this might not always be the case.
|
||||
CSJoystickHatDirection hatDir = 0;
|
||||
if (hat.directionPad.down.pressed) {
|
||||
hatDir |= CSJoystickHatDirectionDown;
|
||||
}
|
||||
if (hat.directionPad.up.pressed) {
|
||||
hatDir |= CSJoystickHatDirectionUp;
|
||||
}
|
||||
if (hat.directionPad.left.pressed) {
|
||||
hatDir |= CSJoystickHatDirectionLeft;
|
||||
}
|
||||
if (hat.directionPad.right.pressed) {
|
||||
hatDir |= CSJoystickHatDirectionRight;
|
||||
}
|
||||
// There shouldn't be any conflicting directions.
|
||||
hat.direction = hatDir;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"<CSGCJoystick: %p>; buttons %@, axes %@, hats %@", self, self.buttons, self.axes, self.hats];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - CSJoystickManager
|
||||
|
||||
@interface CSJoystickManager ()
|
||||
- (void)deviceMatched:(IOHIDDeviceRef)device result:(IOReturn)result sender:(void *)sender;
|
||||
- (void)deviceRemoved:(IOHIDDeviceRef)device result:(IOReturn)result sender:(void *)sender;
|
||||
- (void)controllerDidConnect:(NSNotification *)note API_AVAILABLE(macos(11.0));
|
||||
- (void)controllerDidDisconnect:(NSNotification *)note API_AVAILABLE(macos(11.0));
|
||||
@end
|
||||
|
||||
static void DeviceMatched(void *context, IOReturn result, void *sender, IOHIDDeviceRef device) {
|
||||
@ -235,6 +448,10 @@ static void DeviceRemoved(void *context, IOReturn result, void *sender, IOHIDDev
|
||||
IOHIDManagerRegisterDeviceMatchingCallback(_hidManager, DeviceMatched, (__bridge void *)self);
|
||||
IOHIDManagerRegisterDeviceRemovalCallback(_hidManager, DeviceRemoved, (__bridge void *)self);
|
||||
IOHIDManagerScheduleWithRunLoop(_hidManager, CFRunLoopGetMain(), kCFRunLoopDefaultMode);
|
||||
if (@available(macOS 11.0, *)) {
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(controllerDidConnect:) name:GCControllerDidConnectNotification object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(controllerDidDisconnect:) name:GCControllerDidDisconnectNotification object:nil];
|
||||
}
|
||||
|
||||
if(IOHIDManagerOpen(_hidManager, kIOHIDOptionsTypeNone) != kIOReturnSuccess) {
|
||||
NSLog(@"Failed to open HID manager");
|
||||
@ -246,15 +463,80 @@ static void DeviceRemoved(void *context, IOReturn result, void *sender, IOHIDDev
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)controllerDidConnect:(NSNotification *)note {
|
||||
GCController *controller = note.object;
|
||||
|
||||
// Double check this joystick isn't already known.
|
||||
for(CSGCJoystick *joystick in _joysticks) {
|
||||
if (![joystick isKindOfClass:[CSGCJoystick class]]) {
|
||||
continue;
|
||||
}
|
||||
if([joystick.device isEqual:controller]) return;
|
||||
}
|
||||
|
||||
// Prepare to collate a list of buttons, axes and hats for the new device.
|
||||
NSMutableArray<CSJoystickButton *> *buttons = [[NSMutableArray alloc] init];
|
||||
NSMutableArray<CSJoystickAxis *> *axes = [[NSMutableArray alloc] init];
|
||||
NSMutableArray<CSJoystickHat *> *hats = [[NSMutableArray alloc] init];
|
||||
|
||||
if (controller.extendedGamepad) {
|
||||
GCExtendedGamepad *gp = controller.extendedGamepad;
|
||||
// Let's go a b x y
|
||||
// 1 2 3 4
|
||||
[buttons addObject:[[CSGCJoystickButton alloc] initWithButton:gp.buttonA index:1]];
|
||||
[buttons addObject:[[CSGCJoystickButton alloc] initWithButton:gp.buttonB index:2]];
|
||||
[buttons addObject:[[CSGCJoystickButton alloc] initWithButton:gp.buttonX index:3]];
|
||||
[buttons addObject:[[CSGCJoystickButton alloc] initWithButton:gp.buttonY index:4]];
|
||||
|
||||
[hats addObject:[[CSGCJoystickHat alloc] initWithDirectionPad:gp.dpad]];
|
||||
|
||||
[axes addObject:[[CSGCJoystickAxis alloc] initWithAxis:gp.leftThumbstick.xAxis type:CSJoystickAxisTypeX]];
|
||||
[axes addObject:[[CSGCJoystickAxis alloc] initWithAxis:gp.leftThumbstick.yAxis type:CSJoystickAxisTypeY]];
|
||||
[axes addObject:[[CSGCJoystickAxis alloc] initWithAxis:gp.rightThumbstick.xAxis type:CSJoystickAxisTypeZ]];
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
// Add this joystick to the list.
|
||||
[_joysticks addObject:[[CSGCJoystick alloc] initWithButtons:buttons axes:axes hats:hats device:controller]];
|
||||
}
|
||||
|
||||
- (void)controllerDidDisconnect:(NSNotification *)note {
|
||||
GCController *controller = note.object;
|
||||
|
||||
// If this joystick was recorded, remove it.
|
||||
for(CSGCJoystick *joystick in [_joysticks copy]) {
|
||||
if (![joystick isKindOfClass:[CSGCJoystick class]]) {
|
||||
continue;
|
||||
}
|
||||
if([joystick.device isEqual:controller]) {
|
||||
[_joysticks removeObject:joystick];
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
IOHIDManagerUnscheduleFromRunLoop(_hidManager, CFRunLoopGetMain(), kCFRunLoopDefaultMode);
|
||||
IOHIDManagerClose(_hidManager, kIOHIDOptionsTypeNone);
|
||||
CFRelease(_hidManager);
|
||||
if (@available(macOS 11.0, *)) {
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self name:GCControllerDidConnectNotification object:nil];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self name:GCControllerDidDisconnectNotification object:nil];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)deviceMatched:(IOHIDDeviceRef)device result:(IOReturn)result sender:(void *)sender {
|
||||
if (@available(macOS 11.0, *)) {
|
||||
if ([GCController supportsHIDDevice:device]) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Double check this joystick isn't already known.
|
||||
for(CSJoystick *joystick in _joysticks) {
|
||||
for(CSIOJoystick *joystick in _joysticks) {
|
||||
if (![joystick isKindOfClass:[CSIOJoystick class]]) {
|
||||
continue;
|
||||
}
|
||||
if(joystick.device == device) return;
|
||||
}
|
||||
|
||||
@ -279,7 +561,7 @@ static void DeviceRemoved(void *context, IOReturn result, void *sender, IOHIDDev
|
||||
case kIOHIDElementTypeInput_Button: {
|
||||
// Add a button; pretty easy stuff. 'Usage' provides a button index.
|
||||
const uint32_t usage = IOHIDElementGetUsage(element);
|
||||
[buttons addObject:[[CSJoystickButton alloc] initWithElement:element index:usage]];
|
||||
[buttons addObject:[[CSIOJoystickButton alloc] initWithElement:element index:usage]];
|
||||
} break;
|
||||
|
||||
case kIOHIDElementTypeInput_Misc:
|
||||
@ -296,25 +578,28 @@ static void DeviceRemoved(void *context, IOReturn result, void *sender, IOHIDDev
|
||||
|
||||
// A hatswitch is a multi-directional control all of its own.
|
||||
case kHIDUsage_GD_Hatswitch:
|
||||
[hats addObject:[[CSJoystickHat alloc] initWithElement:element]];
|
||||
[hats addObject:[[CSIOJoystickHat alloc] initWithElement:element]];
|
||||
continue;
|
||||
}
|
||||
|
||||
// Add the axis; if it was a hat switch or unrecognised then the code doesn't
|
||||
// reach here.
|
||||
[axes addObject:[[CSJoystickAxis alloc] initWithElement:element type:axisType]];
|
||||
[axes addObject:[[CSIOJoystickAxis alloc] initWithElement:element type:axisType]];
|
||||
} break;
|
||||
}
|
||||
}
|
||||
CFRelease(elements);
|
||||
|
||||
// Add this joystick to the list.
|
||||
[_joysticks addObject:[[CSJoystick alloc] initWithButtons:buttons axes:axes hats:hats device:device]];
|
||||
[_joysticks addObject:[[CSIOJoystick alloc] initWithButtons:buttons axes:axes hats:hats device:device]];
|
||||
}
|
||||
|
||||
- (void)deviceRemoved:(IOHIDDeviceRef)device result:(IOReturn)result sender:(void *)sender {
|
||||
// If this joystick was recorded, remove it.
|
||||
for(CSJoystick *joystick in [_joysticks copy]) {
|
||||
for(CSIOJoystick *joystick in [_joysticks copy]) {
|
||||
if (![joystick isKindOfClass:[CSIOJoystick class]]) {
|
||||
continue;
|
||||
}
|
||||
if(joystick.device == device) {
|
||||
[_joysticks removeObject:joystick];
|
||||
return;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user