Fix a variety of issues with incorrect / unexpected / unfriendly first responder...

diff --git a/ApplicationController.m b/ApplicationController.m
index 6a34916400c52691039436c05003fc94ed94357d..dd3832367854af3fe0c8472987539074a6650aec 100644 (file)
--- a/ApplicationController.m
+++ b/ApplicationController.m
@@ -63,6 +63,7 @@
         [dockMenuBase removeItemAtIndex:dockMenuBase.numberOfItems - 1];
     for (Config *config in self.configsController.configs)
         [dockMenuBase addItemWithTitle:config.name action:@selector(chooseConfig:) keyEquivalent:@""];
+    [_targetController refreshConfigs];
     [self configChanged];
 }
 

diff --git a/ConfigsController.m b/ConfigsController.m
index 769fabde56158060e5951f2108e324a6d3660b40..b4db790889fb9118a80b8aeec634631e463f3286 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -48,9 +48,8 @@
         return;
     manualConfig = config;
     _currentConfig = config;
-    [targetController reset];
     [removeButton setEnabled:_configs[0] != config];
-    [targetController load];
+    [targetController loadCurrent];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
     [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO];
 }
@@ -91,7 +90,6 @@
 
 - (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index {
     [(Config *)_configs[index] setName:obj];
-    [targetController refreshConfigsPreservingSelection:YES];
     [tableView reloadData];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
 }

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index ac82d630cf0899b475f10c788be83b41b149b027..d9cfe8e178571f797f7f25c1d6830f0b5673cc57 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -720,7 +720,7 @@
                                                                                        <int key="NSNumCols">1</int>
                                                                                        <array class="NSMutableArray" key="NSCells">
                                                                                                <object class="NSButtonCell" id="177186415">
-                                                                                                       <int key="NSCellFlags">-1543503872</int>
+                                                                                                       <int key="NSCellFlags">603979776</int>
                                                                                                        <int key="NSCellFlags2">0</int>
                                                                                                        <string key="NSContents">Do nothing</string>
                                                                                                        <reference key="NSSupport" ref="45863614"/>
@@ -1012,7 +1012,7 @@ ZSwgSW5jLiwgMjAwOQA</bytes>
                                                                                        </array>
                                                                                        <string key="NSCellSize">{201, 32}</string>
                                                                                        <string key="NSIntercellSpacing">{4, 2}</string>
-                                                                                       <int key="NSMatrixFlags">1151868928</int>
+                                                                                       <int key="NSMatrixFlags">1353195520</int>
                                                                                        <string key="NSCellClass">NSActionCell</string>
                                                                                        <object class="NSButtonCell" key="NSProtoCell" id="632642090">
                                                                                                <int key="NSCellFlags">603979776</int>
@@ -1064,7 +1064,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                                                                                <int key="NSPeriodicDelay">400</int>
                                                                                                <int key="NSPeriodicInterval">75</int>
                                                                                        </object>
-                                                                                       <reference key="NSSelectedCell" ref="177186415"/>
+                                                                                       <int key="NSSelectedRow">-1</int>
+                                                                                       <int key="NSSelectedCol">-1</int>
                                                                                        <object class="NSColor" key="NSBackgroundColor" id="473846075">
                                                                                                <int key="NSColorSpace">6</int>
                                                                                                <string key="NSCatalogName">System</string>

diff --git a/Enjoy.xcodeproj/project.pbxproj b/Enjoy.xcodeproj/project.pbxproj
index 16e0380e25b67b13e02cea5f1fbd4f7118ca96f6..642e5e27ff3ae693f3983c49af2d98b608a40583 100644 (file)
--- a/Enjoy.xcodeproj/project.pbxproj
+++ b/Enjoy.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
                D594BF830FAE9661007A85F2 /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BF820FAE9661007A85F2 /* ApplicationController.m */; };
                D5F809710FB093400006A4DE /* TargetConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D5F809700FB093400006A4DE /* TargetConfig.m */; };
                D5F80A9D0FB0A2FF0006A4DE /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D5617A080FAEAF8300928B3A /* icon.icns */; };
+               EE1D7C9216E01E7000B000EB /* NSView+FirstResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -85,6 +86,8 @@
                D594BF820FAE9661007A85F2 /* ApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationController.m; sourceTree = "<group>"; };
                D5F8096F0FB093400006A4DE /* TargetConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetConfig.h; sourceTree = "<group>"; };
                D5F809700FB093400006A4DE /* TargetConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TargetConfig.m; sourceTree = "<group>"; };
+               EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+FirstResponder.h"; sourceTree = "<group>"; };
+               EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+FirstResponder.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -188,6 +191,8 @@
                        children = (
                                32CA4F630368D1EE00C91783 /* Enjoy_Prefix.pch */,
                                29B97316FDCFA39411CA2CEA /* main.m */,
+                               EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */,
+                               EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */,
                        );
                        name = "Other Sources";
                        sourceTree = "<group>";
@@ -299,6 +304,7 @@
                                8B7E476C15C314A200C588FA /* TargetMouseBtn.m in Sources */,
                                8BEFAD9C15C46BFF00823AEC /* TargetMouseScroll.m in Sources */,
                                8BEFADA015C476DC00823AEC /* TargetToggleMouseScope.m in Sources */,
+                               EE1D7C9216E01E7000B000EB /* NSView+FirstResponder.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Enjoy_Prefix.pch b/Enjoy_Prefix.pch
index d6e96a630c7a535e68ddb9456b782ffbacd60308..1f44b2f4160004ee1978cddd087b5a9b4c63032c 100644 (file)
--- a/Enjoy_Prefix.pch
+++ b/Enjoy_Prefix.pch
@@ -7,3 +7,5 @@
 #endif
 
 #import <IOKit/hid/IOHIDLib.h>
+
+#import "NSView+FirstResponder.h"

diff --git a/JoystickController.m b/JoystickController.m
index 84366ef028e40e218d1448091c3667ac88b4b8b3..97ca74b6e10e7e42d86264d70ae50f66e2408c5a 100644 (file)
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -127,7 +127,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) {
@@ -194,9 +193,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

diff --git a/KeyInputTextView.m b/KeyInputTextView.m
index 1bb79521fc1eda6d15817ad4b0fe98254d564a29..abff2c6060c56423724950f4d6d4fe1353911bd8 100644 (file)
--- a/KeyInputTextView.m
+++ b/KeyInputTextView.m
@@ -25,6 +25,8 @@
 
 - (void)clear {
     self.vk = -1;
+    [targetController keyChanged];
+    [self resignIfFirstResponder];
 }
 
 - (BOOL)hasKey {
@@ -168,15 +170,9 @@
     return [super resignFirstResponder];
 }
 
-- (void)setBackgroundColor:(NSColor *)color {
-    [super setBackgroundColor:color];
-}
-
 - (void)setVk:(int)key {
     vk = key;
     [self setStringValue:[KeyInputTextView stringForKeyCode:key]];
-    if (self.hasKey)
-        [targetController keyChanged];
 }
 
 - (int)vk {
@@ -186,20 +182,22 @@
 - (void)keyDown:(NSEvent *)evt {
     if (!evt.isARepeat) {
         self.vk = evt.keyCode;
-        [self.window makeFirstResponder:nil];
+        [targetController keyChanged];
+        [self resignIfFirstResponder];
     }
 }
 
 - (void)flagsChanged:(NSEvent *)evt {
     self.vk = evt.keyCode;
-    [[self window] makeFirstResponder:nil];
+    [targetController keyChanged];
+    [self resignIfFirstResponder];
 }
 
 - (void)setEnabled:(BOOL)newEnabled {
     enabled = newEnabled;
 
-    if (!enabled && window.firstResponder == self)
-        [window makeFirstResponder:nil];
+    if (!enabled)
+        [self resignIfFirstResponder];
 }
 
 - (BOOL)enabled {

diff --git a/NSView+FirstResponder.h b/NSView+FirstResponder.h
new file mode 100644 (file)
index 0000000..9aee2e6
--- /dev/null
+++ b/NSView+FirstResponder.h
@@ -0,0 +1,15 @@
+//
+//  NSView+FirstResponder.h
+//  Enjoy
+//
+//  Created by Joe Wreschnig on 3/1/13.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSView (FirstResponder)
+
+- (BOOL)resignIfFirstResponder;
+
+@end

diff --git a/NSView+FirstResponder.m b/NSView+FirstResponder.m
new file mode 100644 (file)
index 0000000..817d399
--- /dev/null
+++ b/NSView+FirstResponder.m
@@ -0,0 +1,19 @@
+//
+//  NSView+FirstResponder.m
+//  Enjoy
+//
+//  Created by Joe Wreschnig on 3/1/13.
+//
+//
+
+#import "NSView+FirstResponder.h"
+
+@implementation NSView (FirstResponder)
+
+- (BOOL)resignIfFirstResponder {
+    if (self.window.firstResponder == self)
+        return [self.window makeFirstResponder:nil];
+    return NO;
+}
+
+@end

diff --git a/TargetController.h b/TargetController.h
index 7e24cc460d1effbb444d420e15ec44b7d110adfd..9c9ee2cb770890e0323be434dbb9ba10ab945d37 100644 (file)
--- a/TargetController.h
+++ b/TargetController.h
@@ -27,9 +27,8 @@
 @property (assign) BOOL enabled;
 
 - (void)keyChanged;
-- (void)load;
-- (void)reset;
-- (void)refreshConfigsPreservingSelection:(BOOL)preserve;
+- (void)loadCurrent;
+- (void)refreshConfigs;
 - (IBAction)configChosen:(id)sender;
 - (IBAction)radioChanged:(id)sender;
 - (IBAction)mdirChanged:(id)sender;

diff --git a/TargetController.m b/TargetController.m
index 08bf1493b797b88e7171f7db4151c42323630c24..a7dbd2c6535bb89e75e108d9d66196f54455f74c 100644 (file)
--- a/TargetController.m
+++ b/TargetController.m
@@ -22,62 +22,73 @@
 
 @implementation TargetController
 
-- (IBAction)radioChanged:(id)sender {
-    NSInteger row, col;
-    [radioButtons getRow:&row column:&col ofCell:sender];
-    [[NSApplication sharedApplication].mainWindow makeFirstResponder:sender];
+- (void)cleanUpInterface {
+    NSInteger row = radioButtons.selectedRow;
     
-    if (row != 1)
+    if (row != 1) {
         keyInput.vk = -1;
+        [keyInput resignIfFirstResponder];
+    }
     
-    if (row != 2)
+    if (row != 2) {
         [configPopup selectItemAtIndex:-1];
-    else if (!configPopup.selectedItem)
+        [configPopup resignIfFirstResponder];
+    } else if (!configPopup.selectedItem)
         [configPopup selectItemAtIndex:0];
     
-    if (row != 3)
+    if (row != 3) {
         mouseDirSelect.selectedSegment = -1;
-    else if (mouseDirSelect.selectedSegment == -1)
+        [mouseDirSelect resignIfFirstResponder];
+    } else if (mouseDirSelect.selectedSegment == -1)
         mouseDirSelect.selectedSegment = 0;
     
-    if (row != 4)
+    if (row != 4) {
         mouseBtnSelect.selectedSegment = -1;
-    else if (mouseBtnSelect.selectedSegment == -1)
+        [mouseBtnSelect resignIfFirstResponder];
+    } else if (mouseBtnSelect.selectedSegment == -1)
         mouseBtnSelect.selectedSegment = 0;
     
-    if (row != 5)
+    if (row != 5) {
         scrollDirSelect.selectedSegment = -1;
-    else if (scrollDirSelect.selectedSegment == -1)
-        scrollDirSelect.selectedSegment = 0;
-    
+        [scrollDirSelect resignIfFirstResponder];
+    } else if (scrollDirSelect.selectedSegment == -1)
+        scrollDirSelect.selectedSegment = 0;    
+}
+
+- (IBAction)radioChanged:(NSView *)sender {
+    [sender.window makeFirstResponder:sender];
+    if (radioButtons.selectedRow == 1)
+        [keyInput.window makeFirstResponder:keyInput];
     [self commit];
 }
 
 - (void)keyChanged {
-    [radioButtons setState:1 atRow:1 column:0];
+    [radioButtons selectCellAtRow:1 column:0];
+    [radioButtons.window makeFirstResponder:radioButtons];
     [self commit];
 }
 
 - (void)configChosen:(id)sender {
-    [radioButtons setState:1 atRow:2 column:0];
+    [radioButtons selectCellAtRow:2 column:0];
+    [configPopup.window makeFirstResponder:configPopup];
     [self commit];
 }
 
-- (void)mdirChanged:(id)sender {
-    [radioButtons setState:1 atRow:3 column:0];
-    [[NSApplication sharedApplication].mainWindow makeFirstResponder:sender];
+- (void)mdirChanged:(NSView *)sender {
+    [radioButtons selectCellAtRow:3 column:0];
+    [sender.window makeFirstResponder:sender];
     [self commit];
 }
 
-- (void)mbtnChanged:(id)sender {
-    [radioButtons setState:1 atRow:4 column:0];
-    [[NSApplication sharedApplication].mainWindow makeFirstResponder:sender];
+- (void)mbtnChanged:(NSView *)sender {
+    [radioButtons selectCellAtRow:4 column:0];
+    [sender.window makeFirstResponder:sender];
     [self commit];
 }
 
-- (void)sdirChanged:(id)sender {
-    [radioButtons setState:1 atRow:5 column:0];
-    [[NSApplication sharedApplication].mainWindow makeFirstResponder:sender];
+- (void)sdirChanged:(NSView *)sender {
+    [radioButtons selectCellAtRow:5 column:0];
+    [sender.window makeFirstResponder:sender];
     [self commit];
 }
 
@@ -100,8 +111,6 @@
             break;
         case 2: {
             TargetConfig *c = [[TargetConfig alloc] init];
-            if (!configPopup.selectedItem)
-                [configPopup selectItemAtIndex:0];
             c.config = configsController.configs[configPopup.indexOfSelectedItem];
             return c;
         }
@@ -130,16 +139,11 @@
 }
 
 - (void)commit {
+    [self cleanUpInterface];
     configsController.currentConfig[joystickController.selectedAction] = [self makeTarget];
     [configsController save];
 }
 
-- (void)reset {
-    [keyInput clear];
-    [radioButtons setState:1 atRow:0 column:0];
-    [self refreshConfigsPreservingSelection:NO];
-}
-
 - (BOOL)enabled {
     return [radioButtons isEnabled];
 }
@@ -153,64 +157,65 @@
     [scrollDirSelect setEnabled:enabled];
 }
 
-- (void)load {
-    JSAction *act = joystickController.selectedAction;
-    if (!act) {
+- (void)loadTarget:(Target *)target forAction:(JSAction *)action {
+    if (!action) {
         self.enabled = NO;
         title.stringValue = @"";
-        return;
     } else {
         self.enabled = YES;
+        NSString *actFullName = action.name;
+        for (JSAction *cur = action.base; cur; cur = cur.base) {
+            actFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, actFullName];
+        }
+        title.stringValue = [[NSString alloc] initWithFormat:@"%@ > %@", configsController.currentConfig.name, actFullName];
     }
-    
-    Target *target = [self currentTarget];
-    NSString *actFullName = act.name;
-    for (JSAction *cur = act.base; cur; cur = cur.base) {
-        actFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, actFullName];
-    }
-    title.stringValue = [[NSString alloc] initWithFormat:@"%@ > %@", configsController.currentConfig.name, actFullName];
-    
+
     if ([target isKindOfClass:[TargetKeyboard class]]) {
-        [radioButtons setState:1 atRow:1 column:0];
+        [radioButtons selectCellAtRow:1 column:0];
         keyInput.vk = [(TargetKeyboard*)target vk];
     } else if ([target isKindOfClass:[TargetConfig class]]) {
-        [radioButtons setState:1 atRow:2 column:0];
+        [radioButtons selectCellAtRow:2 column:0];
         [configPopup selectItemAtIndex:[configsController.configs
                                         indexOfObject:[(TargetConfig *)target config]]];
     }
     else if ([target isKindOfClass:[TargetMouseMove class]]) {
-        [radioButtons setState:1 atRow:3 column:0];
+        [radioButtons selectCellAtRow:3 column:0];
         [mouseDirSelect setSelectedSegment:[(TargetMouseMove *)target axis]];
     }
     else if ([target isKindOfClass:[TargetMouseBtn class]]) {
-        [radioButtons setState:1 atRow:4 column:0];
+        [radioButtons selectCellAtRow:4 column:0];
         mouseBtnSelect.selectedSegment = [(TargetMouseBtn *)target button] == kCGMouseButtonLeft ? 0 : 1;
     }
     else if ([target isKindOfClass:[TargetMouseScroll class]]) {
-        [radioButtons setState:1 atRow:5 column:0];
+        [radioButtons selectCellAtRow:5 column:0];
         scrollDirSelect.selectedSegment = [(TargetMouseScroll *)target amount] > 0;
     }
     else if ([target isKindOfClass:[TargetToggleMouseScope class]]) {
-        [radioButtons setState:1 atRow:6 column:0];
+        [radioButtons selectCellAtRow:6 column:0];
     } else {
-        [radioButtons setState:1 atRow:0 column:0];
+        [radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
     }
+    [self cleanUpInterface];
+}
+
+- (void)loadCurrent {
+    [self loadTarget:[self currentTarget] forAction:joystickController.selectedAction];
 }
 
 - (void)focusKey {
-    Target *currentTarget = [self currentTarget];
-    if (!currentTarget || [currentTarget isKindOfClass:[TargetKeyboard class]])
-        [[[NSApplication sharedApplication] mainWindow] makeFirstResponder:keyInput];
+    if (radioButtons.selectedRow <= 1)
+        [keyInput.window makeFirstResponder:keyInput];
     else
-        [keyInput resignFirstResponder];
+        [keyInput resignIfFirstResponder];
 }
 
-- (void)refreshConfigsPreservingSelection:(BOOL)preserve  {
-    int initialIndex = [configPopup indexOfSelectedItem];
+- (void)refreshConfigs {
+    // TODO: This doesn't work when removing configs.
+    int initialIndex = configPopup.indexOfSelectedItem;
     [configPopup removeAllItems];
     for (Config *config in configsController.configs)
         [configPopup addItemWithTitle:config.name];
-    [configPopup selectItemAtIndex:preserve ? initialIndex : -1];
+    [configPopup selectItemAtIndex:initialIndex];
 }
 
 @end