Better constructor for Config.

[enjoyable.git] / TargetKeyboard.m

diff --git a/TargetKeyboard.m b/TargetKeyboard.m
index eb1f4d7..0d0583e 100644 (file)
--- a/TargetKeyboard.m
+++ b/TargetKeyboard.m
@@ -5,32 +5,43 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "TargetKeyboard.h"
+
+#import "KeyInputTextView.h"
+
 @implementation TargetKeyboard
 
-@synthesize vk, descr;
+@synthesize vk;
+
++ (NSString *)serializationCode {
+    return @"key";
+}
 
--(NSString*) stringify {
-       return [[NSString alloc] initWithFormat: @"key~%d~%@", vk, descr];
+- (NSDictionary *)serialize {
+    return @{ @"type": @"key", @"key": @(self.vk) };
 }
 
-+(TargetKeyboard*) unstringifyImpl: (NSArray*) comps {
-       NSParameterAssert([comps count] == 3);
-       TargetKeyboard* target = [[TargetKeyboard alloc] init];
-       [target setVk: [comps[1] integerValue]];
-       [target setDescr: comps[2]];
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withConfigs:(NSArray *)configs {
+       TargetKeyboard *target = [[TargetKeyboard alloc] init];
+    target.vk = [serialization[@"key"] intValue];
        return target;
 }
 
 -(void) trigger {
-       CGEventRef keyDown = CGEventCreateKeyboardEvent(NULL, vk, true);
+       CGEventRef keyDown = CGEventCreateKeyboardEvent(NULL, vk, YES);
        CGEventPost(kCGHIDEventTap, keyDown);
        CFRelease(keyDown);
 }
 
 -(void) untrigger {
-       CGEventRef keyUp = CGEventCreateKeyboardEvent(NULL, vk, false);
+       CGEventRef keyUp = CGEventCreateKeyboardEvent(NULL, vk, NO);
        CGEventPost(kCGHIDEventTap, keyUp);
        CFRelease(keyUp);
 }
 
+- (NSString *)descr {
+    return [KeyInputTextView stringForKeyCode:self.vk];
+}
+
 @end