Changeset 370 for trunk/Cocoa/AntiRSI/AntiRSI.m

Timestamp:

12/08/07 06:07:14 (16 years ago)

Author:

Nicholas Riley

Message:

Apparently in Xcode, 'Commit Entire Project' doesn't. See the log message from [369].

File:

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

trunk/Cocoa/AntiRSI/AntiRSI.m

@@ -24 +24 @@
 #include <ApplicationServices/ApplicationServices.h>
 
+// 10.5-only
+enum {
+    NSWindowCollectionBehaviorDefault = 0,
+    NSWindowCollectionBehaviorCanJoinAllSpaces = 1 << 0,
+    NSWindowCollectionBehaviorMoveToActiveSpace = 1 << 1
+};
+typedef unsigned NSWindowCollectionBehavior;
+@interface NSWindow (NSWindowCollectionBehavior)
+- (void)setCollectionBehavior:(NSWindowCollectionBehavior)behavior;
+@end
+
 extern CFTimeInterval CGSSecondsSinceLastInputEvent(unsigned long eventType);
 
@@ -194 +205 @@
     [main_window setHasShadow:NO];
     [main_window setMovableByWindowBackground:YES];
+    if ([main_window respondsToSelector:@selector(setCollectionBehavior:)])
+        [main_window setCollectionBehavior: NSWindowCollectionBehaviorCanJoinAllSpaces];
+
     [main_window center];
     [main_window setContentView:view];
@@ -235 +249 @@
     [dc setInitialValues:initial];
     
-    // bind to defauls controller
+    // bind to defaults controller
     [self bind:@"micro_pause_period" toObject:dc withKeyPath:@"values.micro_pause_period" options:nil];
     [self bind:@"micro_pause_duration" toObject:dc withKeyPath:@"values.micro_pause_duration" options:nil];
@@ -550 +564 @@
 }
 
+static ProcessSerialNumber frontmostApp;
+
 // done with micro pause or work break
 - (void)endBreak
 {
     [main_window orderOut:NULL];
+    if (lock_focus && (frontmostApp.highLongOfPSN != 0 || frontmostApp.lowLongOfPSN != 0)) {
+        SetFrontProcess(&frontmostApp);
+        frontmostApp.highLongOfPSN = kNoProcess;
+    }
     state = s_normal;
     // reset time interval to user's choice
     [self installTimer:sample_interval];
+}
+
+// bring app to front, saving previous app
+- (void)focus
+{
+    NSDictionary *activeProcessInfo = [[NSWorkspace sharedWorkspace] activeApplication];
+    if (lock_focus) {
+        frontmostApp.highLongOfPSN = [[activeProcessInfo objectForKey:@"NSApplicationProcessSerialNumberHigh"] longValue];
+        frontmostApp.lowLongOfPSN = [[activeProcessInfo objectForKey:@"NSApplicationProcessSerialNumberLow"] longValue];
+    }
+    [self tick: nil];
+    [main_window center];
+    [main_window orderFrontRegardless];
 }
 
@@ -570 +603 @@
     [postpone setHidden:YES];
     state = s_taking_micro_pause;
-    [self tick: nil];
-    [main_window center];
-    [main_window orderFrontRegardless];
+    [self focus];
 }
 
@@ -591 +622 @@
     [postpone setHidden:NO];
     state = s_taking_work_break;
-    [self tick: nil];
-    [main_window center];
-    [main_window orderFrontRegardless];
+    [self focus];
 }
 
@@ -656 +685 @@
         int r = NSRunInformationalAlertPanel(
              @"New Version",
-             [NSString stringWithFormat:@"A new version (%@) of AntiRSI is available; would you like to go to the website now?", latest_version],
+             [NSString stringWithFormat:@"A new version (%@) of AntiRSI is available; would you like to go to its Web site now?", latest_version],
              @"Goto Website", @"Cancel", nil);
         if (r == NSOKButton) {