#import "JoystickController.h"
-#import "ApplicationController.h"
#import "Config.h"
#import "ConfigsController.h"
#import "Joystick.h"
NSMutableArray *runningTargets;
}
-@synthesize joysticks;
-@synthesize selectedAction;
-@synthesize frontWindowOnly;
-@synthesize mouseLoc;
-
- (id)init {
if ((self = [super init])) {
- joysticks = [[NSMutableArray alloc] initWithCapacity:16];
+ _joysticks = [[NSMutableArray alloc] initWithCapacity:16];
runningTargets = [[NSMutableArray alloc] initWithCapacity:32];
}
return self;
IOHIDDeviceRef device = IOHIDQueueGetDevice(inSender);
Joystick *js = [controller findJoystickByRef:device];
- if (((ApplicationController *)[NSApplication sharedApplication].delegate).active) {
+ if (controller.sendingRealEvents) {
JSAction *mainAction = [js actionForEvent:value];
[mainAction notifyEvent:value];
NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
}
} else if ([NSApplication sharedApplication].isActive
&& [NSApplication sharedApplication].mainWindow.isVisible) {
- // joysticks not active, use it to select stuff
JSAction *handler = [js handlerForEvent:value];
if (!handler)
return;
}
- (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device {
- for (Joystick *js in joysticks)
+ for (Joystick *js in _joysticks)
if (js.device == device)
return js;
return nil;
IOHIDManagerSetDeviceMatchingMultiple(hidManager, (__bridge CFArrayRef)criteria);
IOHIDManagerScheduleWithRunLoop(hidManager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
- IOHIDManagerOpen(hidManager, kIOHIDOptionsTypeNone); // FIXME: If an error happens, report it!
+ IOReturn ret = IOHIDManagerOpen(hidManager, kIOHIDOptionsTypeNone);
+ if (ret != kIOReturnSuccess) {
+ [[NSAlert alertWithMessageText:@"Input devices are unavailable"
+ defaultButton:nil
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:@"Error 0x%08x occured trying to access your devices. "
+ @"Input may not be correctly detected or mapped.",
+ ret]
+ runModal];
+ }
IOHIDManagerRegisterDeviceMatchingCallback(hidManager, add_callback, (__bridge void *)self);
IOHIDManagerRegisterDeviceRemovalCallback(hidManager, remove_callback, (__bridge void *)self);
}
- (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 {
}
- (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 {