X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ApplicationController.m;h=50f9c295393fdf64e03269820b910c064155a431;hp=531d1f469a54aa57c31869ffc23587a10330610f;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=f41f770d67370cbd71002515d81c0842b50cb04b

diff --git a/ApplicationController.m b/ApplicationController.m
index 531d1f4..50f9c29 100644
--- a/ApplicationController.m
+++ b/ApplicationController.m
@@ -7,9 +7,9 @@
 
 #import "ApplicationController.h"
 
-#import "Config.h"
-#import "ConfigsController.h"
-#import "JoystickController.h"
+#import "NJMapping.h"
+#import "NJMappingsController.h"
+#import "NJInputController.h"
 #import "TargetController.h"
 #import "NJEvents.h"
 
@@ -19,81 +19,93 @@
 
 - (void)didSwitchApplication:(NSNotification *)notification {
     NSRunningApplication *currentApp = notification.userInfo[NSWorkspaceApplicationKey];
-    [self.configsController activateConfigForProcess:currentApp.localizedName];
+    [self.mappingsController activateMappingForProcess:currentApp.localizedName];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
     [drawer open];
     self.targetController.enabled = NO;
-    [self.jsController setup];
-    [self.configsController load];
+    [self.inputController setup];
+    [self.mappingsController load];
     [NSNotificationCenter.defaultCenter
-        addObserver:self
-        selector:@selector(mappingDidChange:)
-        name:NJEventMappingChanged
-        object:nil];
+     addObserver:self
+     selector:@selector(mappingDidChange:)
+     name:NJEventMappingChanged
+     object:nil];
+    [NSNotificationCenter.defaultCenter
+     addObserver:self
+     selector:@selector(eventTranslationActivated:)
+     name:NJEventTranslationActivated
+     object:nil];
+    [NSNotificationCenter.defaultCenter
+     addObserver:self
+     selector:@selector(eventTranslationDeactivated:)
+     name:NJEventTranslationDeactivated
+     object:nil];
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
 	[NSUserDefaults.standardUserDefaults synchronize];
 }
 
-- (IBAction)toggleActivity:(id)sender {
-    BOOL sendRealEvents = !self.jsController.sendingRealEvents;
-    self.jsController.sendingRealEvents = sendRealEvents;
-    activeButton.image = [NSImage imageNamed:sendRealEvents ? @"NSStopProgressFreestandingTemplate" : @"NSGoRightTemplate"];
-    activeMenuItem.state = sendRealEvents;
-    
-    if (sendRealEvents) {
-        [NSWorkspace.sharedWorkspace.notificationCenter
-            addObserver:self
-            selector:@selector(didSwitchApplication:)
-            name:NSWorkspaceDidActivateApplicationNotification
-            object:nil];
-        NSLog(@"Listening for application changes.");
-    } else {
-        [NSWorkspace.sharedWorkspace.notificationCenter
-            removeObserver:self
-            name:NSWorkspaceDidActivateApplicationNotification
-            object:nil];
-        NSLog(@"Ignoring application changes.");
-    }
+- (void)eventTranslationActivated:(NSNotification *)note {
+    activeButton.image = [NSImage imageNamed:@"NSStopProgressFreestandingTemplate"];
+    activeMenuItem.state = [note.object translatingEvents];
+    [NSWorkspace.sharedWorkspace.notificationCenter
+     addObserver:self
+     selector:@selector(didSwitchApplication:)
+     name:NSWorkspaceDidActivateApplicationNotification
+     object:nil];
+    NSLog(@"Listening for application changes.");
+}
+
+- (void)eventTranslationDeactivated:(NSNotification *)note {
+    activeButton.image = [NSImage imageNamed:@"NSGoRightTemplate"];
+    activeMenuItem.state = [note.object translatingEvents];
+    [NSWorkspace.sharedWorkspace.notificationCenter
+     removeObserver:self
+     name:NSWorkspaceDidActivateApplicationNotification
+     object:nil];
+    NSLog(@"Ignoring application changes.");
+}
 
+- (IBAction)toggleActivity:(id)sender {
+    self.inputController.translatingEvents = !self.inputController.translatingEvents;
 }
 
-- (NSInteger)firstConfigMenuIndex {
+- (NSInteger)firstMappingMenuIndex {
     for (NSInteger i = dockMenuBase.numberOfItems - 1; i >= 0; --i)
         if ([dockMenuBase itemAtIndex:i].isSeparatorItem)
             return i + 1;
     return dockMenuBase.numberOfItems;
 }
 
-- (void)configsChanged {
-    NSInteger removeFrom = self.firstConfigMenuIndex;
+- (void)mappingsChanged {
+    NSInteger removeFrom = self.firstMappingMenuIndex;
     while (dockMenuBase.numberOfItems > removeFrom)
         [dockMenuBase removeItemAtIndex:dockMenuBase.numberOfItems - 1];
     int added = 0;
-    for (Config *config in self.configsController.configs) {
+    for (NJMapping *mapping in self.mappingsController.mappings) {
         NSString *keyEquiv = ++added < 10 ? @(added).stringValue : @"";
-        [dockMenuBase addItemWithTitle:config.name
-                                action:@selector(chooseConfig:)
+        [dockMenuBase addItemWithTitle:mapping.name
+                                action:@selector(chooseMapping:)
                          keyEquivalent:keyEquiv];
         
     }
-    [_targetController refreshConfigs];
+    [_targetController refreshMappings];
 }
 
 - (void)mappingDidChange:(NSNotification *)note {
-    NSInteger firstConfig = self.firstConfigMenuIndex;
-    Config *current = note.object;
-    NSArray *configs = self.configsController.configs;
-    for (NSUInteger i = 0; i < configs.count; ++i)
-        [dockMenuBase itemAtIndex:i + firstConfig].state = configs[i] == current;
+    NSInteger firstMapping = self.firstMappingMenuIndex;
+    NJMapping *current = note.object;
+    NSArray *mappings = self.mappingsController.mappings;
+    for (NSUInteger i = 0; i < mappings.count; ++i)
+        [dockMenuBase itemAtIndex:i + firstMapping].state = mappings[i] == current;
 }
 
-- (void)chooseConfig:(id)sender {
-    NSInteger idx = [dockMenuBase indexOfItem:sender] - self.firstConfigMenuIndex;
-    Config *chosen = self.configsController.configs[idx];
-    [_configsController activateConfig:chosen];
+- (void)chooseMapping:(id)sender {
+    NSInteger idx = [dockMenuBase indexOfItem:sender] - self.firstMappingMenuIndex;
+    NJMapping *chosen = self.mappingsController.mappings[idx];
+    [_mappingsController activateMapping:chosen];
 }
 @end