return @{ @"type": self.class.serializationCode, @"button": @(_button) };
}
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
- withMappings:(NSArray *)mappings {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
NJOutputMouseButton *output = [[NJOutputMouseButton alloc] init];
output.button = [serialization[@"button"] intValue];
return output;
- (void)trigger {
CGFloat height = NSScreen.mainScreen.frame.size.height;
NSPoint mouseLoc = NSEvent.mouseLocation;
- CGEventType eventType = (_button == kCGMouseButtonLeft) ? kCGEventLeftMouseDown : kCGEventRightMouseDown;
+ CGEventType eventType = _button == kCGMouseButtonLeft ? kCGEventLeftMouseDown
+ : _button == kCGMouseButtonRight ? kCGEventRightMouseDown
+ : kCGEventOtherMouseDown;
CGEventRef click = CGEventCreateMouseEvent(NULL,
eventType,
CGPointMake(mouseLoc.x, height - mouseLoc.y),
_button);
if (clickCount >= 3 || [upTime compare:[NSDate date]] == NSOrderedAscending
- || !CGPointEqualToPoint(NSEvent.mouseLocation, clickPosition))
+ || !CGPointEqualToPoint(mouseLoc, clickPosition))
clickCount = 1;
else
++clickCount;
CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
-
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
+ clickPosition = mouseLoc;
}
- (void)untrigger {
upTime = [NJOutputMouseButton dateWithClickInterval];
- clickPosition = NSEvent.mouseLocation;
+ NSPoint mouseLoc = NSEvent.mouseLocation;
CGFloat height = NSScreen.mainScreen.frame.size.height;
- CGEventType eventType = (_button == kCGMouseButtonLeft) ? kCGEventLeftMouseUp : kCGEventRightMouseUp;
+ CGEventType eventType = _button == kCGMouseButtonLeft ? kCGEventLeftMouseUp
+ : _button == kCGMouseButtonRight ? kCGEventRightMouseUp
+ : kCGEventOtherMouseUp;
CGEventRef click = CGEventCreateMouseEvent(NULL,
eventType,
- CGPointMake(clickPosition.x, height - clickPosition.y),
+ CGPointMake(mouseLoc.x, height - mouseLoc.y),
_button);
CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
CGEventPost(kCGHIDEventTap, click);