Changeset 829

Timestamp:

Aug 24, 2006, 1:55:09 AM (17 years ago)

Author:

livings124

Message:

Limit message log to 1000 lines.

Location:

trunk/macosx

Files:

• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (6 diffs)

trunk/macosx/MessageWindowController.h

@@ -34 +34 @@
     NSTimer * fTimer;
     NSDictionary * fAttributes;
+    
+    int fLines;
 }
 

trunk/macosx/MessageWindowController.m

@@ -30 +30 @@
 #define LEVEL_DEBUG 2
 
-#define UPDATE_SECONDS 0.35
+#define UPDATE_SECONDS  0.35
+#define MAX_LINES       1000
 
 @implementation MessageWindowController
@@ -38 +39 @@
     if ((self = [super initWithWindowNibName: name]))
     {
-        fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
-                    selector: @selector(updateLog:) userInfo: nil repeats: YES];
-        
         NSMutableParagraphStyle * paragraph = [[NSMutableParagraphStyle defaultParagraphStyle] mutableCopy];
         [paragraph setHeadIndent: 20.0];
@@ -48 +46 @@
                         paragraph, NSParagraphStyleAttributeName, nil];
         [paragraph release];
+        
+        fLines = 0;
+        
+        fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
+                    selector: @selector(updateLog:) userInfo: nil repeats: YES];
         
         [[self window] update]; //make sure nib is loaded right away
@@ -92 +95 @@
     BOOL shouldScroll = [scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0;
     
-    NSAttributedString * messageString;
-    NSString * levelString, * dateString;
+    NSString * levelString, * dateString, * messageString;
     for (currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
     {
-        //new line if text view is not empty
-        if (currentMessage != messages || ![[fTextView string] isEqualToString: @""])
-            [[fTextView textStorage] appendAttributedString: [[[NSAttributedString alloc]
-                                        initWithString: @"\n" attributes: fAttributes] autorelease]];
-        
         int level = currentMessage->level;
         if (level == TR_MSG_ERR)
@@ -113 +110 @@
         dateString = [[NSDate dateWithTimeIntervalSince1970: currentMessage->when]
                             descriptionWithCalendarFormat: @"%1m/%d %H:%M:%S" timeZone: nil locale: nil];
-        messageString = [[[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%@ %@ %s",
-                            dateString, levelString, currentMessage->message] attributes: fAttributes] autorelease];
+        messageString = [NSString stringWithFormat: @"%s%@ %@ %s",
+                            fLines > 0 ? "\n" : "", dateString, levelString, currentMessage->message];
         
-        [[fTextView textStorage] appendAttributedString: messageString];
+        //remove the first line if at max number of lines
+        if (fLines == MAX_LINES)
+        {
+            NSString * text = [fTextView string];
+            unsigned int loc = [text rangeOfString: @"\n"].location;
+            if (loc != NSNotFound)
+                [fTextView setString: [[text substringFromIndex: loc + 1] stringByAppendingString: messageString]];
+        }
+        else
+        {
+            [[fTextView textStorage] appendAttributedString: [[[NSAttributedString alloc] initWithString:
+                                        messageString attributes: fAttributes] autorelease]];
+            fLines++;
+        }
     }
     
@@ -144 +154 @@
 {
     [fTextView setString: @""];
+    fLines = 0;
 }