@implementation NJOutputMouseButton {
NSDate *upTime;
int clickCount;
+ NSPoint clickPosition;
}
+ (NSTimeInterval)doubleClickInterval {
- (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);
- NSLog(@"%@\n%@", upTime, [NSDate date]);
- if (clickCount >= 3 || [upTime compare:[NSDate date]] == NSOrderedAscending)
+ if (clickCount >= 3 || [upTime compare:[NSDate date]] == NSOrderedAscending
+ || !CGPointEqualToPoint(mouseLoc, clickPosition))
clickCount = 1;
else
++clickCount;
CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
-
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
+ clickPosition = mouseLoc;
}
- (void)untrigger {
- CGFloat height = NSScreen.mainScreen.frame.size.height;
+ upTime = [NJOutputMouseButton dateWithClickInterval];
NSPoint mouseLoc = NSEvent.mouseLocation;
- CGEventType eventType = (_button == kCGMouseButtonLeft) ? kCGEventLeftMouseUp : kCGEventRightMouseUp;
+ CGFloat height = NSScreen.mainScreen.frame.size.height;
+ CGEventType eventType = _button == kCGMouseButtonLeft ? kCGEventLeftMouseUp
+ : _button == kCGMouseButtonRight ? kCGEventRightMouseUp
+ : kCGEventOtherMouseUp;
CGEventRef click = CGEventCreateMouseEvent(NULL,
eventType,
CGPointMake(mouseLoc.x, height - mouseLoc.y),
CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
CGEventPost(kCGHIDEventTap, click);
CFRelease(click);
- upTime = [NJOutputMouseButton dateWithClickInterval];
}
@end