Changeset 53 for trunk/Cocoa/Pester/Source/PSAlarmAlertController.m

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• PSAlarmAlertController.m (modified) (2 diffs)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/PSAlarmAlertController.m

@@ -8 +8 @@
 
 #import "PSAlarmAlertController.h"
+#import "PSAlert.h"
+#import "PSAlerts.h"
 
 NSString * const PSAlarmAlertStopNotification = @"PSAlarmAlertStopNotification";
@@ -23 +25 @@
 }
 
+- (void)_resumeAlarm:(PSAlarm *)alarm;
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [alarm setTimer]; // if snooze not set and not repeating, alarm will die
+    if (frontmostApp.highLongOfPSN != 0 || frontmostApp.lowLongOfPSN != 0) {
+        SetFrontProcess(&frontmostApp);
+        if (appWasHidden)
+            [NSApp hide: self];
+    }
+}
+
+- (void)_alertCompleted:(NSNotification *)notification;
+{
+    PSAlert *alert = [[notification userInfo] objectForKey: @"alert"];
+    unsigned count = [pendingAlerts count];
+    [pendingAlerts removeObject: alert];
+    NSLog(@"removed: %@; still pending: %@", alert, [pendingAlerts description]);
+    NSLog(@"alarm: %@ retainCount %d", [notification object], [[notification object] retainCount]);
+    NSAssert2([pendingAlerts count] == count - 1, @"alert not in set: %@\n%@", alert, notification);
+    if ([pendingAlerts count] == 0) {
+        [self _resumeAlarm: [notification object]];
+        [self release];
+    }
+}
+
 - (id)initWithAlarm:(PSAlarm *)alarm;
 {
     if ( (self = [super init]) != nil) {
-        [[alarm alerts] makeObjectsPerformSelector: @selector(triggerForAlarm:)
-                                        withObject: alarm];
-        [NSApp activateIgnoringOtherApps: YES];
+        PSAlerts *alerts = [alarm alerts];
+        NSArray *allAlerts = [alerts allAlerts];
+        if ([allAlerts count] == 0) {
+            [self _resumeAlarm: alarm];
+        } else {
+            pendingAlerts = [[NSMutableSet alloc] init];
+            [pendingAlerts addObjectsFromArray: allAlerts];
+            [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alertCompleted:)
+                                                         name: PSAlarmAlertCompletedNotification object: alarm];
+            [self retain]; // release in _alertCompleted:
+        }
+        [alerts triggerForAlarm: alarm];
+        if ([alerts requirePesterFrontmost] && ![NSApp isActive]) { // restore frontmost process afterward
+            NSDictionary *activeProcessInfo = [[NSWorkspace sharedWorkspace] activeApplication];
+            frontmostApp.highLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberHigh"] longValue];
+            frontmostApp.lowLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberLow"] longValue];
+            appWasHidden = [NSApp isHidden];
+            [NSApp activateIgnoringOtherApps: YES];
+        }
     }
     return self;
 }
 
+- (void)dealloc;
+{
+    NSLog(@"%@ dealloc", self);
+    [pendingAlerts release];
+    [super dealloc];
+}
+
 @end

@@ -1 +1 @@
 build
+.gdb_history