Changeset 328 for trunk

Timestamp:

08/04/07 23:43:21 (17 years ago)

Author:

Nicholas Riley

Message:

AntiRSI.m: Remove 10.4.2 workaround; use text instead of images for window title

File:

• trunk/Cocoa/AntiRSI/AntiRSI.m (modified) (5 diffs)

trunk/Cocoa/AntiRSI/AntiRSI.m

@@ -24 +24 @@
 #include <ApplicationServices/ApplicationServices.h>
 
-extern double CGSSecondsSinceLastInputEvent(unsigned long eventType);
+extern CFTimeInterval CGSSecondsSinceLastInputEvent(unsigned long eventType);
 
 @implementation AntiRSI
@@ -140 +140 @@
         work_break_taking_t = 0;
         
-        // setup images
-        micro_pause_image = [NSImage imageNamed:@"micro_pause"];
-        work_break_image = [NSImage imageNamed:@"work_break"];
-
         // initialize dock image
         dock_image = [[NSImage alloc] initWithSize:NSMakeSize(128,128)];
@@ -244 +240 @@
         
         // get idle time in seconds
-        double idle_time = CGSSecondsSinceLastInputEvent(kCGAnyInputEventType);
-    // double cgs_idle_time = idle_time;
+        CFTimeInterval idle_time = CGSSecondsSinceLastInputEvent(kCGAnyInputEventType);
+    // CFTimeInterval cgs_idle_time = idle_time;
     // from other people's reverse engineering of this function, on MDD G4s this can return a large positive number when input is in progress
     if (idle_time >= 18446744000.0) {
-        idle_time = 0.0;
+        idle_time = 0;
     } else if (CGEventSourceSecondsSinceLastEventType != NULL) {
-        // CGEventSourceSecondsSinceLastEventType in 10.4.2 returns a CGEventTimestamp of the last event, not a CFTimeInterval as is documented
                 CGEventType eventTypes[] = { kCGEventLeftMouseDown, kCGEventLeftMouseUp, kCGEventRightMouseDown, kCGEventRightMouseUp, kCGEventMouseMoved, kCGEventLeftMouseDragged, kCGEventRightMouseDragged, kCGEventKeyDown, kCGEventKeyUp, kCGEventFlagsChanged, kCGEventScrollWheel, kCGEventTabletPointer, kCGEventTabletProximity, kCGEventOtherMouseDown, kCGEventOtherMouseUp, kCGEventOtherMouseDragged, kCGEventNull };
-        double max_event_time = 0, event_time;
-        double current_time = CFAbsoluteTimeGetCurrent();
-        static double previous_time = 0;
+        CFTimeInterval event_idle_time;
+        idle_time = DBL_MAX;
         for (CGEventType *eventType = eventTypes ; *eventType != kCGEventNull ; eventType++) {
-            event_time = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, *eventType);
-            if (event_time > max_event_time)
-                max_event_time = event_time;
+            event_idle_time = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, *eventType);
+            if (event_idle_time < idle_time) idle_time = event_idle_time;
         }
-        const double NANOSECONDS = 1000000000;
-        static double event_time_offset = 0;
-        event_time = current_time - (max_event_time / NANOSECONDS) + event_time_offset;
-        if (fabs(previous_time - current_time) > 5) {
-            // calibrate offset for first time or after sleep/wake, etc.
-            UpdateSystemActivity(UsrActivity);
-            // despite what the docs say, kCGAnyInputEventType includes UpdateSystemActivity
-            event_time_offset = (CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGAnyInputEventType) / NANOSECONDS) - CFAbsoluteTimeGetCurrent(); 
-            // NSLog(@"reset offset to %.2f", event_time_offset);
-            idle_time = current_time - (max_event_time / NANOSECONDS) + event_time_offset;
-        } else {
-            idle_time = event_time;
-        }
-        previous_time = current_time;
     }
     // NSLog(@"CGEventSource %.2f, CGS %.2f", idle_time, cgs_idle_time);
@@ -500 +479 @@
 {
         micro_pause_taking_t = 0;
-        [view setImage:micro_pause_image];
+        [status setStringValue:@"Micro Pause"];
         [progress setMaxValue:micro_pause_duration];
         [progress setDoubleValue:micro_pause_taking_t];
@@ -516 +495 @@
 {
         work_break_taking_t = 0;
-        [view setImage:work_break_image];
+        [status setStringValue:@"Work Break"];
         [progress setMaxValue:work_break_duration / 60];
         [progress setDoubleValue:work_break_taking_t / 60 - 0.5];