X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputMouseButton.m;fp=Classes%2FNJOutputMouseButton.m;h=18d82ff99b05fe76b41dfb9332f684a0138feadd;hp=d5b1f16e940baade744c9dddcaed2699decf49a3;hb=abe3d190a6388da35ee54c9ab4ef4b56e45045c1;hpb=e860f52adf6efd7edf51f9b41add107d33bb483f

diff --git a/Classes/NJOutputMouseButton.m b/Classes/NJOutputMouseButton.m
index d5b1f16..18d82ff 100644
--- a/Classes/NJOutputMouseButton.m
+++ b/Classes/NJOutputMouseButton.m
@@ -7,7 +7,25 @@
 
 #import "NJOutputMouseButton.h"
 
-@implementation NJOutputMouseButton
+@implementation NJOutputMouseButton {
+    NSDate *upTime;
+    int clickCount;
+}
+
++ (NSTimeInterval)doubleClickInterval {
+    static NSTimeInterval s_doubleClickThreshold;
+    if (!s_doubleClickThreshold) {
+        s_doubleClickThreshold = [[NSUserDefaults.standardUserDefaults
+                                 objectForKey:@"com.apple.mouse.doubleClickThreshold"] floatValue];
+        if (s_doubleClickThreshold <= 0)
+            s_doubleClickThreshold = 1.0;
+    }
+    return s_doubleClickThreshold;
+}
+
++ (NSDate *)dateWithClickInterval {
+    return [[NSDate alloc] initWithTimeIntervalSinceNow:self.doubleClickInterval];
+}
 
 + (NSString *)serializationCode {
     return @"mouse button";
@@ -32,6 +50,14 @@
                                                eventType,
                                                CGPointMake(mouseLoc.x, height - mouseLoc.y),
                                                _button);
+
+    NSLog(@"%@\n%@", upTime, [NSDate date]);
+    if (clickCount >= 3 || [upTime compare:[NSDate date]] == NSOrderedAscending)
+        clickCount = 1;
+    else
+        ++clickCount;
+    CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
+    
     CGEventPost(kCGHIDEventTap, click);
     CFRelease(click);
 }
@@ -44,8 +70,10 @@
                                                eventType,
                                                CGPointMake(mouseLoc.x, height - mouseLoc.y),
                                                _button);
+    CGEventSetIntegerValueField(click, kCGMouseEventClickState, clickCount);
     CGEventPost(kCGHIDEventTap, click);
     CFRelease(click);
+    upTime = [NJOutputMouseButton dateWithClickInterval];
 }
 
 @end