Move logic into messages rather than directly in the callback functions.

[enjoyable.git] / TargetKeyboard.m

diff --git a/TargetKeyboard.m b/TargetKeyboard.m
index 0d0583e..a3a0b51 100644 (file)
--- a/TargetKeyboard.m
+++ b/TargetKeyboard.m
@@ -11,37 +11,31 @@
 
 @implementation TargetKeyboard
 
-@synthesize vk;
-
 + (NSString *)serializationCode {
     return @"key";
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"key", @"key": @(self.vk) };
+    return @{ @"type": @"key", @"key": @(_vk) };
 }
 
 + (Target *)targetDeserialize:(NSDictionary *)serialization
                   withConfigs:(NSArray *)configs {
-       TargetKeyboard *target = [[TargetKeyboard alloc] init];
+    TargetKeyboard *target = [[TargetKeyboard alloc] init];
     target.vk = [serialization[@"key"] intValue];
-       return target;
-}
-
--(void) trigger {
-       CGEventRef keyDown = CGEventCreateKeyboardEvent(NULL, vk, YES);
-       CGEventPost(kCGHIDEventTap, keyDown);
-       CFRelease(keyDown);
+    return target;
 }
 
--(void) untrigger {
-       CGEventRef keyUp = CGEventCreateKeyboardEvent(NULL, vk, NO);
-       CGEventPost(kCGHIDEventTap, keyUp);
-       CFRelease(keyUp);
+- (void)trigger {
+    CGEventRef keyDown = CGEventCreateKeyboardEvent(NULL, _vk, YES);
+    CGEventPost(kCGHIDEventTap, keyDown);
+    CFRelease(keyDown);
 }
 
-- (NSString *)descr {
-    return [KeyInputTextView stringForKeyCode:self.vk];
+- (void)untrigger {
+    CGEventRef keyUp = CGEventCreateKeyboardEvent(NULL, _vk, NO);
+    CGEventPost(kCGHIDEventTap, keyUp);
+    CFRelease(keyUp);
 }
 
 @end