Clean up a bunch of properties; remove unused ones, use automatic ones where possible...

[enjoyable.git] / TargetMouseBtn.m

diff --git a/TargetMouseBtn.m b/TargetMouseBtn.m
index e8d77e4..3efb88a 100644 (file)
--- a/TargetMouseBtn.m
+++ b/TargetMouseBtn.m
@@ -10,16 +10,18 @@
 
 @implementation TargetMouseBtn
 
-@synthesize which;
++ (NSString *)serializationCode {
+    return @"mbtn";
+}
 
--(NSString*) stringify {
-       return [[NSString alloc] initWithFormat: @"mbtn~%u", which];
+- (NSDictionary *)serialize {
+    return @{ @"type": @"mbtn", @"button": @(_button) };
 }
 
-+(TargetMouseBtn*) unstringifyImpl: (NSArray*) comps {
-       NSParameterAssert([comps count] == 2);
-       TargetMouseBtn* target = [[TargetMouseBtn alloc] init];
-       [target setWhich: [comps[1] integerValue]];
++ (Target *)targetDeserialize:(NSDictionary *)serialization
+                  withConfigs:(NSArray *)configs {
+       TargetMouseBtn *target = [[TargetMouseBtn alloc] init];
+    target.button = [serialization[@"button"] intValue];
        return target;
 }
 
@@ -27,11 +29,11 @@
     NSRect screenRect = [[NSScreen mainScreen] frame];
     NSInteger height = screenRect.size.height;
     NSPoint mouseLoc = [NSEvent mouseLocation];
-    CGEventType eventType = (which == kCGMouseButtonLeft) ? kCGEventLeftMouseDown : kCGEventRightMouseDown;
+    CGEventType eventType = (_button == kCGMouseButtonLeft) ? kCGEventLeftMouseDown : kCGEventRightMouseDown;
     CGEventRef click = CGEventCreateMouseEvent(NULL,
                                                eventType,
                                                CGPointMake(mouseLoc.x, height - mouseLoc.y),
-                                               which);
+                                               _button);
     CGEventPost(kCGHIDEventTap, click);
     CFRelease(click);
 }
@@ -40,11 +42,11 @@
     NSRect screenRect = [[NSScreen mainScreen] frame];
     NSInteger height = screenRect.size.height;
     NSPoint mouseLoc = [NSEvent mouseLocation];
-    CGEventType eventType = (which == kCGMouseButtonLeft) ? kCGEventLeftMouseUp : kCGEventRightMouseUp;
+    CGEventType eventType = (_button == kCGMouseButtonLeft) ? kCGEventLeftMouseUp : kCGEventRightMouseUp;
     CGEventRef click = CGEventCreateMouseEvent(NULL,
                                                eventType,
                                                CGPointMake(mouseLoc.x, height - mouseLoc.y),
-                                               which);
+                                               _button);
     CGEventPost(kCGHIDEventTap, click);
     CFRelease(click);
 }