projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
28fe536
..
3efb88a
100644
(file)
--- a/
TargetMouseBtn.m
+++ b/
TargetMouseBtn.m
@@
-10,20
+10,18
@@
@implementation TargetMouseBtn
@implementation TargetMouseBtn
-@synthesize which;
-
+ (NSString *)serializationCode {
return @"mbtn";
}
- (NSDictionary *)serialize {
+ (NSString *)serializationCode {
return @"mbtn";
}
- (NSDictionary *)serialize {
- return @{ @"type": @"mbtn", @"
which": @(self.which
) };
+ return @{ @"type": @"mbtn", @"
button": @(_button
) };
}
+ (Target *)targetDeserialize:(NSDictionary *)serialization
withConfigs:(NSArray *)configs {
TargetMouseBtn *target = [[TargetMouseBtn alloc] init];
}
+ (Target *)targetDeserialize:(NSDictionary *)serialization
withConfigs:(NSArray *)configs {
TargetMouseBtn *target = [[TargetMouseBtn alloc] init];
- target.
which = [serialization[@"which
"] intValue];
+ target.
button = [serialization[@"button
"] intValue];
return target;
}
return target;
}
@@
-31,11
+29,11
@@
NSRect screenRect = [[NSScreen mainScreen] frame];
NSInteger height = screenRect.size.height;
NSPoint mouseLoc = [NSEvent mouseLocation];
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),
CGEventRef click = CGEventCreateMouseEvent(NULL,
eventType,
CGPointMake(mouseLoc.x, height - mouseLoc.y),
-
which
);
+
_button
);
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
}
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
}
@@
-44,11
+42,11
@@
NSRect screenRect = [[NSScreen mainScreen] frame];
NSInteger height = screenRect.size.height;
NSPoint mouseLoc = [NSEvent mouseLocation];
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),
CGEventRef click = CGEventCreateMouseEvent(NULL,
eventType,
CGPointMake(mouseLoc.x, height - mouseLoc.y),
-
which
);
+
_button
);
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
}
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
}