X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetToggleMouseScope.m;h=0413b731d937a0b237d75c782dca1b6b359ddd06;hp=d6833fcd1888e08f2733731b171313c22d465417;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=c6fb77859e508aaef686b7a5a6a12abe29178708

diff --git a/TargetToggleMouseScope.m b/TargetToggleMouseScope.m
index d6833fc..0413b73 100644
--- a/TargetToggleMouseScope.m
+++ b/TargetToggleMouseScope.m
@@ -3,33 +3,34 @@
 //  Enjoy
 //
 //  Created by Yifeng Huang on 7/28/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
 #import "TargetToggleMouseScope.h"
 
 #import "ApplicationController.h"
-#import "JoystickController.h"
+#import "NJInputController.h"
 
 @implementation TargetToggleMouseScope
 
--(NSString*) stringify {
-	return [[NSString alloc] initWithFormat: @"mtoggle"];
++ (NSString *)serializationCode {
+    return @"mtoggle";
 }
 
-+(TargetToggleMouseScope*) unstringifyImpl: (NSArray*) comps {
-	NSParameterAssert([comps count] == 1);
-	TargetToggleMouseScope* target = [[TargetToggleMouseScope alloc] init];
-	return target;
+- (NSDictionary *)serialize {
+    return @{ @"type": @"mtoggle" };
 }
 
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withMappings:(NSArray *)mappings {
+	TargetToggleMouseScope *target = [[TargetToggleMouseScope alloc] init];
+	return target;
+}
 - (void)trigger {
     // FIXME: It's hacky to get at the controller this way, but it's
     // also hacky to pass it. Shouldn't need to do either.
-    ApplicationController *ac = [NSApplication sharedApplication].delegate;
-    JoystickController *jc = ac.jsController;
-    [jc setFrontWindowOnly: ![jc frontWindowOnly]];
-    printf("Front window only: %d\n", [jc frontWindowOnly]);
+    ApplicationController *ac = NSApplication.sharedApplication.delegate;
+    NJInputController *jc = ac.inputController;
+    jc.frontWindowOnly = !jc.frontWindowOnly;
 }
 
 @end