X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.m;h=33201f5ba2b98e6235f6f5506c2fc129591785fd;hp=13db938c8d33febd60669a0dd10104111314230d;hb=1bb3f553caac2b6b74380bd20ddc4bb1ff22abb2;hpb=cc2c6ed12ca38c56a4263d95af75692d6cf716a5

diff --git a/JoystickController.m b/JoystickController.m
index 13db938..33201f5 100644
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -18,17 +18,12 @@
     IOHIDManagerRef hidManager;
     NSTimer *continuousTimer;
     NSMutableArray *runningTargets;
+    NSMutableArray *_joysticks;
 }
 
-@synthesize joysticks;
-@synthesize selectedAction;
-@synthesize frontWindowOnly;
-@synthesize mouseLoc;
-@synthesize sendingRealEvents;
-
 - (id)init {
     if ((self = [super init])) {
-        joysticks = [[NSMutableArray alloc] initWithCapacity:16];
+        _joysticks = [[NSMutableArray alloc] initWithCapacity:16];
         runningTargets = [[NSMutableArray alloc] initWithCapacity:32];
     }
     return self;
@@ -60,31 +55,39 @@
     }
 }
 
+- (void)runTargetForDevice:(IOHIDDeviceRef)device value:(IOHIDValueRef)value {
+    Joystick *js = [self findJoystickByRef:device];
+    JSAction *mainAction = [js actionForEvent:value];
+    [mainAction notifyEvent:value];
+    NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
+    for (JSAction *subaction in children) {
+        Target *target = configsController.currentConfig[subaction];
+        target.magnitude = mainAction.magnitude;
+        target.running = subaction.active;
+        if (target.running && target.isContinuous)
+            [self addRunningTarget:target];
+    }
+}
+
+- (void)showTargetForDevice:(IOHIDDeviceRef)device value:(IOHIDValueRef)value {
+    Joystick *js = [self findJoystickByRef:device];
+    JSAction *handler = [js handlerForEvent:value];
+    if (!handler)
+        return;
+    
+    [self expandRecursive:handler];
+    [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[outlineView rowForItem:handler]] byExtendingSelection: NO];
+    [targetController focusKey];
+}
+
 static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDValueRef value) {
     JoystickController *controller = (__bridge JoystickController *)ctx;
     IOHIDDeviceRef device = IOHIDQueueGetDevice(inSender);
     
-    Joystick *js = [controller findJoystickByRef:device];
     if (controller.sendingRealEvents) {
-        JSAction *mainAction = [js actionForEvent:value];
-        [mainAction notifyEvent:value];
-        NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
-        for (JSAction *subaction in children) {
-            Target *target = controller.currentConfig[subaction];
-            target.magnitude = mainAction.magnitude;
-            target.running = subaction.active;
-            if (target.running && target.isContinuous)
-                [controller addRunningTarget:target];
-        }
-    } else if ([NSApplication sharedApplication].isActive
-               && [NSApplication sharedApplication].mainWindow.isVisible) {
-        JSAction *handler = [js handlerForEvent:value];
-        if (!handler)
-            return;
-        
-        [controller expandRecursive:handler];
-        [controller->outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[controller->outlineView rowForItem:handler]] byExtendingSelection: NO];
-        [controller->targetController focusKey];
+        [controller runTargetForDevice:device value:value];
+    } else if ([NSApplication sharedApplication].mainWindow.isVisible) {
+        [controller showTargetForDevice:device value:value];
     }
 }
 
@@ -102,17 +105,21 @@ static int findAvailableIndex(NSArray *list, Joystick *js) {
     }
 }
 
+- (void)addJoystickForDevice:(IOHIDDeviceRef)device {
+    IOHIDDeviceRegisterInputValueCallback(device, input_callback, (__bridge void*)self);
+    Joystick *js = [[Joystick alloc] initWithDevice:device];
+    js.index = findAvailableIndex(_joysticks, js);
+    [_joysticks addObject:js];
+    [outlineView reloadData];
+}
+
 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);
-    [[controller joysticks] addObject:js];
-    [controller->outlineView reloadData];
+    [controller addJoystickForDevice:device];
 }
 
 - (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device {
-    for (Joystick *js in joysticks)
+    for (Joystick *js in _joysticks)
         if (js.device == device)
             return js;
     return nil;
@@ -120,12 +127,17 @@ static void add_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDDevi
 
 static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDDeviceRef device) {
     JoystickController *controller = (__bridge JoystickController *)ctx;
-    Joystick *match = [controller findJoystickByRef:device];
+    [controller removeJoystickForDevice:device];
+}
+
+- (void)removeJoystickForDevice:(IOHIDDeviceRef)device {
+    Joystick *match = [self findJoystickByRef:device];
     IOHIDDeviceRegisterInputValueCallback(device, NULL, NULL);
     if (match) {
-        [controller.joysticks removeObject:match];
-        [controller->outlineView reloadData];
+        [_joysticks removeObject:match];
+        [outlineView reloadData];
     }
+    
 }
 
 - (void)updateContinuousActions:(NSTimer *)timer {
@@ -133,7 +145,6 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
     for (Target *target in [runningTargets copy]) {
         if (![target update:self]) {
             [runningTargets removeObject:target];
-            NSLog(@"Removing action, now running %lu.", runningTargets.count);
         }
     }
     if (!runningTargets.count) {
@@ -173,25 +184,21 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
     IOHIDManagerRegisterDeviceRemovalCallback(hidManager, remove_callback, (__bridge void *)self);
 }
 
-- (Config *)currentConfig {
-    return configsController.currentConfig;
-}
-
 - (JSAction *)selectedAction {
     id item = [outlineView itemAtRow:outlineView.selectedRow];
     return [item children] ? nil : item;
 }
 
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
-    return item ? [[item children] count] : [joysticks count];
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
+    return item ? [[item children] count] : _joysticks.count;
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
     return item ? [[item children] count] > 0: YES;
 }
 
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
-    return item ? [item children][index] : joysticks[index];
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
+    return item ? [item children][index] : _joysticks[index];
 }
 
 - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item  {
@@ -200,9 +207,8 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
     return [item name];
 }
 
-- (void)outlineViewSelectionDidChange: (NSNotification*) notification {
-    [targetController reset];
-    [targetController load];
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification {
+    [targetController loadCurrent];
 }
 
 @end