projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a variety of issues with incorrect / unexpected / unfriendly first responder...
[enjoyable.git]
/
JoystickController.m
diff --git
a/JoystickController.m
b/JoystickController.m
index
13db938
..
97ca74b
100644
(file)
--- a/
JoystickController.m
+++ b/
JoystickController.m
@@
-20,15
+20,9
@@
NSMutableArray *runningTargets;
}
NSMutableArray *runningTargets;
}
-@synthesize joysticks;
-@synthesize selectedAction;
-@synthesize frontWindowOnly;
-@synthesize mouseLoc;
-@synthesize sendingRealEvents;
-
- (id)init {
if ((self = [super init])) {
- (id)init {
if ((self = [super init])) {
- joysticks = [[NSMutableArray alloc] initWithCapacity:16];
+
_
joysticks = [[NSMutableArray alloc] initWithCapacity:16];
runningTargets = [[NSMutableArray alloc] initWithCapacity:32];
}
return self;
runningTargets = [[NSMutableArray alloc] initWithCapacity:32];
}
return self;
@@
-112,7
+106,7
@@
static void add_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDDevi
}
- (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device {
}
- (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device {
- for (Joystick *js in joysticks)
+ for (Joystick *js in
_
joysticks)
if (js.device == device)
return js;
return nil;
if (js.device == device)
return js;
return nil;
@@
-133,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];
for (Target *target in [runningTargets copy]) {
if (![target update:self]) {
[runningTargets removeObject:target];
- NSLog(@"Removing action, now running %lu.", runningTargets.count);
}
}
if (!runningTargets.count) {
}
}
if (!runningTargets.count) {
@@
-183,7
+176,7
@@
static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
}
- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
}
- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
- return item ? [[item children] count] :
[joysticks count]
;
+ return item ? [[item children] count] :
_joysticks.count
;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
@@
-191,7
+184,7
@@
static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
- return item ? [item children][index] : joysticks[index];
+ return item ? [item children][index] :
_
joysticks[index];
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
@@
-200,9
+193,8
@@
static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
return [item name];
}
return [item name];
}
-- (void)outlineViewSelectionDidChange: (NSNotification*) notification {
- [targetController reset];
- [targetController load];
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification {
+ [targetController loadCurrent];
}
@end
}
@end