X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetKeyboard.m;h=eab2d4e8e080608c3f4af3f0f93441cd1d0e5143;hp=d19c65f039df547d4818d34c7e8f6349a70832eb;hb=f563321aec9e13b8479ab3b890a9179f095a8b17;hpb=0a402879ee3beb79bb4d2270f909ad75eead0c96

diff --git a/TargetKeyboard.m b/TargetKeyboard.m
index d19c65f..eab2d4e 100644
--- a/TargetKeyboard.m
+++ b/TargetKeyboard.m
@@ -7,41 +7,35 @@
 
 #import "TargetKeyboard.h"
 
-#import "KeyInputTextView.h"
+#import "NJKeyInputField.h"
 
 @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, true);
-	CGEventPost(kCGHIDEventTap, keyDown);
-	CFRelease(keyDown);
+    return target;
 }
 
--(void) untrigger {
-	CGEventRef keyUp = CGEventCreateKeyboardEvent(NULL, vk, false);
-	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