Joystick *js = [controller findJoystickByRef:device];
if (((ApplicationController *)[NSApplication sharedApplication].delegate).active) {
JSAction *mainAction = [js actionForEvent:value];
- if (!mainAction)
- return;
-
[mainAction notifyEvent:value];
- NSArray *children = mainAction.children ? mainAction.children : @[mainAction];
+ NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
for (JSAction *subaction in children) {
- Target *target = [[controller->configsController currentConfig] getTargetForAction:subaction];
- if (!target)
- continue;
- // TODO: Can we just trigger based on setRunning:?
- if (target.running != subaction.active) {
- if (subaction.active)
- [target trigger:controller];
- else
- [target untrigger:controller];
- target.running = subaction.active;
- }
-
- // FIXME: Hack, should just expose analog info properly in continuous target.
- if ([mainAction isKindOfClass:[JSActionAnalog class]]) {
- double realValue = [(JSActionAnalog *)mainAction getRealValue:IOHIDValueGetIntegerValue(value)];
- [target setInputValue:realValue];
- if (target.isContinuous && target.running)
- [controller addRunningTarget:target];
- }
+ 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) {
+ } else if ([NSApplication sharedApplication].isActive
+ && [NSApplication sharedApplication].mainWindow.isVisible) {
// joysticks not active, use it to select stuff
JSAction *handler = [js handlerForEvent:value];
if (!handler)
}
static int findAvailableIndex(NSArray *list, Joystick *js) {
- for (int index = 0; ; index++) {
+ for (int index = 1; ; index++) {
BOOL available = YES;
for (Joystick *used in list) {
if ([used.productName isEqualToString:js.productName] && used.index == index) {
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;