X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.m;h=51c2a378d33f5473bbf03842a679456f340be085;hp=6b748df7a33eaae1322268b63f4bbd59951e03df;hb=d2b45b2c32dcc7c3cc553b62252ca48842e08d48;hpb=51ca12b552a9c17c4d4029b0340e193b273044a8

diff --git a/JoystickController.m b/JoystickController.m
index 6b748df..51c2a37 100644
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -21,20 +21,19 @@
 	return self;
 }
 
--(void) finalize {
+-(void) dealloc {
 	for(int i=0; i<[joysticks count]; i++) {
 		[joysticks[i] invalidate];
 	}
 	IOHIDManagerClose(hidManager, kIOHIDOptionsTypeNone);
 	CFRelease(hidManager);
-	[super finalize];
 }
 
 static NSMutableDictionary* create_criterion( UInt32 inUsagePage, UInt32 inUsage )
 {
 	NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-	dict[(NSString*)CFSTR(kIOHIDDeviceUsagePageKey)] = [NSNumber numberWithInt: inUsagePage];
-	dict[(NSString*)CFSTR(kIOHIDDeviceUsageKey)] = [NSNumber numberWithInt: inUsage];
+	dict[(NSString*)CFSTR(kIOHIDDeviceUsagePageKey)] = @(inUsagePage);
+	dict[(NSString*)CFSTR(kIOHIDDeviceUsageKey)] = @(inUsage);
 	return dict;
 } 
 
@@ -44,29 +43,20 @@ static NSMutableDictionary* create_criterion( UInt32 inUsagePage, UInt32 inUsage
 	[outlineView expandItem: handler];
 }
 
-BOOL objInArray(NSMutableArray *array, id object) {
-    for (id o in array) {
-        if (o == object)
-            return true;
-    }
-    return false;
-}
-
-void timer_callback(CFRunLoopTimerRef timer, void *ctx) {
-    JoystickController *jc = (JoystickController *)ctx;
+static void timer_callback(CFRunLoopTimerRef timer, void *ctx) {
+    JoystickController *jc = (__bridge JoystickController *)ctx;
     jc->mouseLoc = [NSEvent mouseLocation];
     for (Target *target in [jc runningTargets]) {
         [target update: jc];
     }
 }
 
-void input_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDValueRef value) {
-	JoystickController* self = (JoystickController*)inContext;
-	IOHIDDeviceRef device = IOHIDQueueGetDevice((IOHIDQueueRef) inSender);
+static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDValueRef value) {
+	JoystickController *controller = (__bridge JoystickController *)ctx;
+	IOHIDDeviceRef device = IOHIDQueueGetDevice(inSender);
 	
-	Joystick* js = [self findJoystickByRef: device];
+	Joystick *js = [controller findJoystickByRef:device];
 	if([(ApplicationController *)[[NSApplication sharedApplication] delegate] active]) {
-		// for reals
 		JSAction* mainAction = [js actionForEvent: value];
 		if(!mainAction)
 			return;
@@ -76,17 +66,17 @@ void input_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDVal
 		if(!subactions)
 			subactions = @[mainAction];
 		for(id subaction in subactions) {
-			Target* target = [[self->configsController currentConfig] getTargetForAction:subaction];
+			Target* target = [[controller->configsController currentConfig] getTargetForAction:subaction];
 			if(!target)
 				continue;
 			/* target application? doesn't seem to be any need since we are only active when it's in front */
 			/* might be required for some strange actions */
             if ([target running] != [subaction active]) {
                 if ([subaction active]) {
-                    [target trigger: self];
+                    [target trigger: controller];
                 }
                 else {
-                    [target untrigger: self];
+                    [target untrigger: controller];
                 }
                 [target setRunning: [subaction active]];
             }
@@ -97,8 +87,8 @@ void input_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDVal
             
                 // Add to list of running targets
                 if ([target isContinuous] && [target running]) {
-                    if (!objInArray([self runningTargets], target)) {
-                        [[self runningTargets] addObject: target];
+                    if (![controller.runningTargets containsObject:target]) {
+                        [[controller runningTargets] addObject: target];
                     }
                 }
             }
@@ -109,13 +99,13 @@ void input_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDVal
 		if(!handler)
 			return;
 	
-		[self expandRecursive: handler];
-		self->programmaticallySelecting = YES;
-		[self->outlineView selectRowIndexes: [NSIndexSet indexSetWithIndex: [self->outlineView rowForItem: handler]] byExtendingSelection: NO];
+		[controller expandRecursive: handler];
+		controller->programmaticallySelecting = YES;
+		[controller->outlineView selectRowIndexes: [NSIndexSet indexSetWithIndex: [controller->outlineView rowForItem: handler]] byExtendingSelection: NO];
 	}
 }
 
-int findAvailableIndex(id list, Joystick* js) {
+static int findAvailableIndex(id list, Joystick* js) {
 	BOOL available;
 	Joystick* js2;
 	for(int index=0;;index++) {
@@ -132,63 +122,52 @@ int findAvailableIndex(id list, Joystick* js) {
 	}
 }
 
-void add_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDDeviceRef device) {
-	JoystickController* self = (JoystickController*)inContext;
-	
-	IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone);
-	IOHIDDeviceRegisterInputValueCallback(device, input_callback, (void*) self);
-	
-	Joystick *js = [[Joystick alloc] initWithDevice: device];
-	[js setIndex: findAvailableIndex([self joysticks], js)];
-	
+static void add_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDDeviceRef device) {
+	JoystickController *controller = (__bridge JoystickController *)ctx;
+    IOHIDDeviceRegisterInputValueCallback(device, input_callback, (__bridge void*)controller);
+	Joystick *js = [[Joystick alloc] initWithDevice:device];
+    js.index = findAvailableIndex(controller.joysticks, js);
 	[js populateActions];
-
-	[[self joysticks] addObject: js];
-	[self->outlineView reloadData];
+	[[controller joysticks] addObject:js];
+	[controller->outlineView reloadData];
 }
 	
--(Joystick*) findJoystickByRef: (IOHIDDeviceRef) device {
+- (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device {
     for (Joystick *js in joysticks)
         if (js.device == device)
             return js;
 	return nil;
 }	
 
-void remove_callback(void* inContext, IOReturn inResult, void* inSender, IOHIDDeviceRef device) {
-	JoystickController* self = (JoystickController*)inContext;
-	
-	Joystick* match = [self findJoystickByRef: device];
-	if(!match)
-		return;
-				
-	[[self joysticks] removeObject: match];
-
-	[match invalidate];
-	[self->outlineView reloadData];
+static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDDeviceRef device) {
+	JoystickController *controller = (__bridge JoystickController *)ctx;
+	Joystick *match = [controller findJoystickByRef:device];
+    IOHIDDeviceRegisterInputValueCallback(device, NULL, NULL);
+	if (match) {
+        [controller.joysticks removeObject:match];
+        [controller->outlineView reloadData];
+    }
 }
 
--(void) setup {
+- (void)setup {
     hidManager = IOHIDManagerCreate( kCFAllocatorDefault, kIOHIDOptionsTypeNone);
-	NSArray *criteria = @[create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick),
-		 create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad),
-         create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController)];
+	NSArray *criteria = @[
+        create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick),
+        create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad),
+        create_criterion(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController)];
 	
-	IOHIDManagerSetDeviceMatchingMultiple(hidManager, (CFArrayRef)criteria);
+	IOHIDManagerSetDeviceMatchingMultiple(hidManager, (CFArrayRef)CFBridgingRetain(criteria));
     
 	IOHIDManagerScheduleWithRunLoop( hidManager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode );
 	IOReturn tIOReturn = IOHIDManagerOpen( hidManager, kIOHIDOptionsTypeNone );
 	(void)tIOReturn;
 	
-	IOHIDManagerRegisterDeviceMatchingCallback( hidManager, add_callback, (void*)self );
-	IOHIDManagerRegisterDeviceRemovalCallback(hidManager, remove_callback, (void*) self);
-//	IOHIDManagerRegisterInputValueCallback(hidManager, input_callback, (void*)self);
-// register individually so we can find the device more easily
-    
-    
-	
+	IOHIDManagerRegisterDeviceMatchingCallback(hidManager, add_callback, (__bridge void *)self );
+	IOHIDManagerRegisterDeviceRemovalCallback(hidManager, remove_callback, (__bridge void *)self);
+
     // Setup timer for continuous targets
     CFRunLoopTimerContext ctx = {
-        0, (void*)self, NULL, NULL, NULL
+        0, (__bridge void*)self, NULL, NULL, NULL
     };
     CFRunLoopTimerRef timer = CFRunLoopTimerCreate(kCFAllocatorDefault,
                                                    CFAbsoluteTimeGetCurrent(), 1.0/80.0,