X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJDeviceController.m;h=1b64aaf3f694e5dd26eb3c8324ebf0de77c82e04;hp=4a6d3dc06cd19c586aef5490ede9071e3ea43527;hb=6cee2033d1c0fc0dacf444064305b9e7e87672a9;hpb=91ea24909c2c38d9f3d319e6440b362222fdfd87

diff --git a/Classes/NJDeviceController.m b/Classes/NJDeviceController.m
index 4a6d3dc..1b64aaf 100644
--- a/Classes/NJDeviceController.m
+++ b/Classes/NJDeviceController.m
@@ -12,7 +12,6 @@
 #import "NJDevice.h"
 #import "NJInput.h"
 #import "NJOutput.h"
-#import "NJOutputController.h"
 #import "NJEvents.h"
 
 @implementation NJDeviceController {
@@ -20,10 +19,8 @@
     NSTimer *_continuousOutputsTick;
     NSMutableArray *_continousOutputs;
     NSMutableArray *_devices;
-    NSMutableArray *_expanded;
 }
 
-#define EXPANDED_MEMORY_MAX_SIZE 100
 #define NSSTR(e) ((NSString *)CFSTR(e))
 
 - (id)init {
@@ -31,12 +28,6 @@
         _devices = [[NSMutableArray alloc] initWithCapacity:16];
         _continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
         
-        NSArray *expanded = [NSUserDefaults.standardUserDefaults objectForKey:@"expanded rows"];
-        if (![expanded isKindOfClass:NSArray.class])
-            expanded = @[];
-        _expanded = [[NSMutableArray alloc] initWithCapacity:MAX(16, _expanded.count)];
-        [_expanded addObjectsFromArray:expanded];
-        
         _hidManager = [[NJHIDManager alloc] initWithCriteria:@[
                        @{ NSSTR(kIOHIDDeviceUsagePageKey) : @(kHIDPage_GenericDesktop),
                        NSSTR(kIOHIDDeviceUsageKey) : @(kHIDUsage_GD_Joystick) },
@@ -47,12 +38,6 @@
                        ]
                                                     delegate:self];
 
-        [NSNotificationCenter.defaultCenter
-             addObserver:self
-             selector:@selector(startHid)
-             name:NSApplicationDidFinishLaunchingNotification
-             object:nil];
-        
         // The HID manager uses 5-10ms per second doing basically
         // nothing if a noisy device is plugged in (the % of that
         // spent in input_callback is negligible, so it's not
@@ -81,24 +66,12 @@
     [_continuousOutputsTick invalidate];
 }
 
-- (void)expandRecursive:(NJInputPathElement *)pathElement {
-    if (pathElement) {
-        [self expandRecursive:pathElement.parent];
-        [outlineView expandItem:pathElement];
-    }
-}
-
-- (id)elementForUID:(NSString *)uid {
-    for (NJDevice *dev in _devices) {
-        id item = [dev elementForUID:uid];
-        if (item)
-            return item;
-    }
-    return nil;
+- (NJDevice *)objectAtIndexedSubscript:(NSUInteger)idx {
+    return idx < _devices.count ? _devices[idx] : nil;
 }
 
-- (void)expandRecursiveByUID:(NSString *)uid {
-    [self expandRecursive:[self elementForUID:uid]];
+- (NSUInteger)count {
+    return _devices.count;
 }
 
 - (void)addRunningOutput:(NJOutput *)output {
@@ -135,11 +108,7 @@
     if (!handler)
         return;
     
-    [self expandRecursive:handler];
-    [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[outlineView rowForItem:handler]]
-             byExtendingSelection: NO];
-    if (!self.simulatingEvents)
-        [outputController focusKey];
+    [self.delegate deviceController:self didInput:handler];
 }
 
 - (void)hidManager:(NJHIDManager *)manager
@@ -153,29 +122,25 @@
     }
 }
 
-static int findAvailableIndex(NSArray *list, NJDevice *dev) {
-    for (int index = 1; ; index++) {
-        BOOL available = YES;
-        for (NJDevice *used in list) {
-            if ([used.productName isEqualToString:dev.productName]
-                && used.index == index) {
+- (void)addDevice:(NJDevice *)device {
+    BOOL available;
+    do {
+        available = YES;
+        for (NJDevice *used in _devices) {
+            if ([used isEqual:device]) {
+                device.index += 1;
                 available = NO;
-                break;
             }
         }
-        if (available)
-            return index;
-    }
+    } while (!available);
+    
+    [_devices addObject:device];
 }
 
 - (void)hidManager:(NJHIDManager *)manager deviceAdded:(IOHIDDeviceRef)device {
     NJDevice *match = [[NJDevice alloc] initWithDevice:device];
-    match.index = findAvailableIndex(_devices, match);
-    [_devices addObject:match];
-    [outlineView reloadData];
-    [self reexpandAll];
-    hidSleepingPrompt.hidden = YES;
-    connectDevicePrompt.hidden = !!_devices.count;
+    [self addDevice:match];
+    [self.delegate deviceController:self didAddDevice:match];
 }
 
 - (NJDevice *)findDeviceByRef:(IOHIDDeviceRef)device {
@@ -187,15 +152,11 @@ static int findAvailableIndex(NSArray *list, NJDevice *dev) {
 
 - (void)hidManager:(NJHIDManager *)manager deviceRemoved:(IOHIDDeviceRef)device {
     NJDevice *match = [self findDeviceByRef:device];
-    IOHIDDeviceRegisterInputValueCallback(device, NULL, NULL);
     if (match) {
-        [_devices removeObject:match];
-        [outlineView reloadData];
-        connectDevicePrompt.hidden = !!_devices.count;
-        hidSleepingPrompt.hidden = YES;
+        NSInteger idx = [_devices indexOfObjectIdenticalTo:match];
+        [_devices removeObjectAtIndex:idx];
+        [self.delegate deviceController:self didRemoveDeviceAtIndex:idx];
     }
-    if (_devices.count == 1)
-        [outlineView expandItem:_devices[0]];
 }
 
 - (void)updateContinuousOutputs:(NSTimer *)timer {
@@ -212,35 +173,17 @@ static int findAvailableIndex(NSArray *list, NJDevice *dev) {
 }
 
 - (void)hidManager:(NJHIDManager *)manager didError:(NSError *)error {
-    // Since the error shows the window, it can trigger another attempt
-    // to re-open the HID manager, which will also probably fail and error,
-    // so don't bother repeating ourselves.
-    if (!outlineView.window.attachedSheet) {
-        [NSApplication.sharedApplication activateIgnoringOtherApps:YES];
-        [outlineView.window makeKeyAndOrderFront:nil];
-        [outlineView.window presentError:error
-                          modalForWindow:outlineView.window
-                                delegate:nil
-                      didPresentSelector:nil
-                             contextInfo:nil];
-    }
+    [self.delegate deviceController:self didError:error];
     self.simulatingEvents = NO;
-    if (manager.running)
-        [self hidManagerDidStart:manager];
-    else
-        [self hidManagerDidStop:manager];
 }
 
 - (void)hidManagerDidStart:(NJHIDManager *)manager {
-    hidSleepingPrompt.hidden = YES;
-    connectDevicePrompt.hidden = !!_devices.count;
+    [self.delegate deviceControllerDidStartHID:self];
 }
 
 - (void)hidManagerDidStop:(NJHIDManager *)manager {
     [_devices removeAllObjects];
-    [outlineView reloadData];
-    hidSleepingPrompt.hidden = NO;
-    connectDevicePrompt.hidden = YES;
+    [self.delegate deviceControllerDidStopHID:self];
 }
 
 - (void)startHid {
@@ -251,74 +194,9 @@ static int findAvailableIndex(NSArray *list, NJDevice *dev) {
     [_hidManager stop];
 }
 
-- (NJInput *)selectedInput {
-    NJInputPathElement *item = [outlineView itemAtRow:outlineView.selectedRow];
-    return (NJInput *)((!item.children && item.parent) ? item : nil);
-}
-
-- (NSInteger)outlineView:(NSOutlineView *)outlineView
-  numberOfChildrenOfItem:(NJInputPathElement *)item {
-    return item ? item.children.count : _devices.count;
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView
-   isItemExpandable:(NJInputPathElement *)item {
-    return item ? [[item children] count] > 0: YES;
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView
-            child:(NSInteger)index
-           ofItem:(NJInputPathElement *)item {
-    return item ? item.children[index] : _devices[index];
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView
-objectValueForTableColumn:(NSTableColumn *)tableColumn
-           byItem:(NJInputPathElement *)item  {
-    return item ? item.name : @"root";
-}
-
-- (void)outlineViewSelectionDidChange:(NSNotification *)notification {
-    NJInputPathElement *item = [outlineView itemAtRow:outlineView.selectedRow];
-    if (item)
-        [NSUserDefaults.standardUserDefaults setObject:item.uid
-                                                forKey:@"selected input"];
-    [outputController loadCurrent];
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView
-        isGroupItem:(NJInputPathElement *)item {
-    return [item isKindOfClass:NJDevice.class];
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView_
-   shouldSelectItem:(NJInputPathElement *)item {
-    return ![self outlineView:outlineView_ isGroupItem:item];
-}
-
-- (void)outlineViewItemDidExpand:(NSNotification *)notification {
-    NJInputPathElement *item = notification.userInfo[@"NSObject"];
-    NSString *uid = item.uid;
-    if (![_expanded containsObject:uid])
-        [_expanded addObject:uid];
-    while (_expanded.count > EXPANDED_MEMORY_MAX_SIZE)
-        [_expanded removeObjectAtIndex:0];
-    [NSUserDefaults.standardUserDefaults setObject:_expanded
-                                            forKey:@"expanded rows"];
-}
-
-- (void)outlineViewItemDidCollapse:(NSNotification *)notification {
-    NJInputPathElement *item = notification.userInfo[@"NSObject"];
-    [_expanded removeObject:item.uid];
-    [NSUserDefaults.standardUserDefaults setObject:_expanded
-                                            forKey:@"expanded rows"];
-}
-
 - (void)setSimulatingEvents:(BOOL)simulatingEvents {
     if (simulatingEvents != _simulatingEvents) {
         _simulatingEvents = simulatingEvents;
-        NSInteger state = simulatingEvents ? NSOnState : NSOffState;
-        simulatingEventsButton.state = state;
         NSString *name = simulatingEvents
             ? NJEventSimulationStarted
             : NJEventSimulationStopped;
@@ -332,25 +210,18 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
     }
 }
 
-- (void)reexpandAll {
-    for (NSString *uid in [_expanded copy])
-        [self expandRecursiveByUID:uid];
-    if (outlineView.selectedRow == -1) {
-        NSString *selectedUid = [NSUserDefaults.standardUserDefaults objectForKey:@"selected input"];
-        id item = [self elementForUID:selectedUid];
-        NSInteger row = [outlineView rowForItem:item];
-        if (row >= 0)
-            [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-    }
-}
-
 - (void)stopHidIfDisabled:(NSNotification *)application {
-    if (!self.simulatingEvents)
+    if (!self.simulatingEvents && !NSProcessInfo.processInfo.isBeingDebugged)
         [self stopHid];
 }
 
-- (IBAction)simulatingEventsChanged:(NSButton *)sender {
-    self.simulatingEvents = sender.state == NSOnState;
+- (NJInputPathElement *)objectForKeyedSubscript:(NSString *)uid {
+    for (NJDevice *dev in _devices) {
+        id item = [dev elementForUID:uid];
+        if (item)
+            return item;
+    }
+    return nil;
 }
 
 @end