Changeset 3414

Timestamp:

01/04/06 18:05:22 (3 years ago)

Author:

morris

Message:

Clean up more core classes

Files:

• WiredClient/trunk/WCAccounts.m (modified) (2 diffs)
• WiredClient/trunk/WCChat.m (modified) (54 diffs)
• WiredClient/trunk/WCMessages.m (modified) (24 diffs)
• WiredClient/trunk/WCPublicChat.m (modified) (18 diffs)
• WiredClient/trunk/WCSearch.m (modified) (20 diffs)

WiredClient/trunk/WCAccounts.m

@@ -36 +36 @@
-- (void)_updateStatus;
-- (void)_validate;
+
+- (WCAccount *)_accountAtIndex:(unsigned int)index;
-- (WCAccount *)_selectedAccount;
-- (NSArray *)_selectedAccounts;
@@ -87 +89 @@
-
-
-
-
+
+
+
+
-        
-        i = ([_accountsTableView sortOrder] == WISortDescending)
-(unsigned int) 
-(unsigned int) 
+
+
-        
-        return [_shownAccounts objectAtIndex:i];

WiredClient/trunk/WCChat.m

@@ -44 +44 @@
-@interface WCChat(Private)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+_
+_
+
+_
+_
+_
+_
+_
+_
+_
+_
+_
+
+_
-
-@end
-
-
+@implementation WCChat(Private)
+
+- (void)_update {
+        NSFont          *font;
+        NSColor         *color;
+
+        font = [WCSettings objectForKey:WCChatFont];
+
+        if(![[_chatOutputTextView font] isEqualTo:font]) {
+                [_chatOutputTextView setFont:font];
+                [_chatInputTextView setFont:font];
+                [_setTopicTextView setFont:font];
+        }
+        
+        color = [WCSettings objectForKey:WCChatBackgroundColor];
+
+        if(![[_chatOutputTextView backgroundColor] isEqualTo:color]) {
+                [_chatOutputTextView setBackgroundColor:color];
+                [_chatInputTextView setBackgroundColor:color];
+                [_setTopicTextView setBackgroundColor:color];
+        }
+
+        color = [WCSettings objectForKey:WCChatTextColor];
+
+        if(![[_chatOutputTextView textColor] isEqualTo:color]) {
+                [_chatOutputTextView setTextColor:color];
+                [_chatInputTextView setTextColor:color];
+                [_chatInputTextView setInsertionPointColor:color];
+                [_setTopicTextView setTextColor:color];
+                [_setTopicTextView setInsertionPointColor:color];
+
+                [_chatOutputTextView setString:[_chatOutputTextView string] withFilter:_chatFilter];
+        }
+
+        [_userListTableView setFont:[WCSettings objectForKey:WCChatUserListFont]];
+        [_userListTableView setDrawsStripes:[WCSettings boolForKey:WCChatUserListAlternateRows]];
+        
+        [_chatOutputTextView setNeedsDisplay:YES];
+        [_chatInputTextView setNeedsDisplay:YES];
+        [_setTopicTextView setNeedsDisplay:YES];
+        [_userListTableView setNeedsDisplay:YES];
+}
+
+
+
+- (void)_updateTopic {
+        [_topicTextField setToolTip:[_topic topic]];
+        [_topicTextField setStringValue:[_topic topic]];
+        [_topicNickTextField setStringValue:[NSSWF:
+                NSLS(@"%@ %C %@", @"Chat topic set by (nick, time)"),
+                [_topic nick],
+                0x2014,
+                [[_topic date] commonDateStringWithSeconds:NO relative:YES capitalized:YES]]];
+}
+
+
+
+#pragma mark -
+
+- (void)_printString:(NSString *)string {
+        float           position;
+        
+        position = [[_chatOutputScrollView verticalScroller] floatValue];
+        
+        if([[_chatOutputTextView textStorage] length] > 0)
+                [[[_chatOutputTextView textStorage] mutableString] appendString:@"\n"];
+        
+        [_chatOutputTextView appendString:string withFilter:_chatFilter];
+        
+        if(position == 1.0)
+                [_chatOutputTextView performSelectorOnce:@selector(scrollToBottom) withObject:NULL afterDelay:0.05];
+}
+
+
+
+- (void)_printTimestamp {
+        NSDate                  *date;
+        NSTimeInterval  interval;
+        
+        if(!_timestamp)
+                _timestamp = [[NSDate date] retain];
+        
+        interval = [[WCSettings objectForKey:WCTimestampChatInterval] doubleValue];
+        date = [NSDate dateWithTimeIntervalSinceNow:-interval];
+        
+        if([date compare:_timestamp] == NSOrderedDescending) {
+                [self printEvent:[[NSDate date] fullDateStringWithSeconds:NO]];
+                
+                [_timestamp release];
+                _timestamp = [[NSDate date] retain];
+        }
+}
+
+
+
+- (void)_printUserJoin:(WCUser *)user {
+        [self printEvent:[NSSWF:
+                NSLS(@"%@ has joined", @"Client has joined message (nick)"),
+                [user nick]]];
+}
+
+
+
+- (void)_printUserLeave:(WCUser *)user {
+        [self printEvent:[NSSWF:
+                NSLS(@"%@ has left", @"Client has left message (nick)"),
+                [user nick]]];
+}
+
+
+
+- (void)_printUserChange:(WCUser *)user nick:(NSString *)nick {
+        [self printEvent:[NSSWF:
+                NSLS(@"%@ is now known as %@", @"Client rename message (oldnick, newnick)"),
+                [user nick],
+                nick]];
+}
+
+
+
+- (void)_printUserKick:(WCUser *)victim by:(WCUser *)killer message:(NSString *)message {
+        [self printEvent:[NSSWF:
+                NSLS(@"%@ was kicked by %@ (%@)", @"Client kicked message (victim, killer, message)"),
+                [victim nick],
+                [killer nick],
+                message]];
+}
+
+
+
+- (void)_printUserBan:(WCUser *)victim by:(WCUser *)killer message:(NSString *)message {
+        [self printEvent:[NSSWF:
+                NSLS(@"%@ was banned by %@ (%@)", @"Client banned message (victim, killer, message)"),
+                [victim nick],
+                [killer nick],
+                message]];
+}
+
+
+
+- (void)_printChat:(NSString *)chat by:(WCUser *)user {
+        NSString        *output, *nick;
+        int                     offset, length;
+        
+        switch([WCSettings intForKey:WCChatStyle]) {
+                case WCChatStyleWired:
+                default:
+                        offset = [WCSettings boolForKey:WCTimestampEveryLine] ? WCChatPrepend - 4 : WCChatPrepend;
+                        nick = [user nick];
+                        length = offset - [nick length];
+
+                        if(length < 0)
+                                nick = [nick substringToIndex:offset];
+                        
+                        output = [NSSWF:NSLS(@"%@: %@", @"Chat message, Wired style (nick, message)"),
+                                nick, chat];
+                        
+                        if(length > 0)
+                                output = [NSSWF:@"%*s%@", length, " ", output];
+                        break;
+                        
+                case WCChatStyleIRC:
+                        output = [NSSWF:NSLS(@"<%@> %@", @"Chat message, IRC style (nick, message)"),
+                                [user nick], chat];
+                        break;
+        }
+        
+        if([WCSettings boolForKey:WCTimestampEveryLine])
+                output = [NSSWF:@"%@ %@", [[NSDate date] timeStringWithSeconds:NO], output];
+
+        [self _printString:output];
+}
+
+
+
+- (void)_printActionChat:(NSString *)chat by:(WCUser *)user {
+        NSString        *output;
+
+        switch([WCSettings intForKey:WCChatStyle]) {
+                case WCChatStyleWired:
+                default:
+                        output = [NSSWF:NSLS(@" *** %@ %@", @"Action chat message, Wired style (nick, message)"),
+                                [user nick], chat];
+                        break;
+                        
+                case WCChatStyleIRC:
+                        output = [NSSWF:NSLS(@" * %@ %@", @"Action chat message, IRC style (nick, message)"),
+                                [user nick], chat];
+                        break;
+        }
+
+        if([WCSettings boolForKey:WCTimestampEveryLine])
+                output = [NSSWF:@"%@ %@", [[NSDate date] timeStringWithSeconds:NO], output];
+        
+        [self _printString:output];
+}
+
+
+
+#pragma mark -
+
+- (BOOL)_runCommand:(NSString *)string {
+        NSString        *command, *argument;
+        NSRange         range;
+        
+        range = [string rangeOfString:@" "];
+        
+        if(range.location == NSNotFound) {
+                command = string;
+                argument = @"";
+        } else {
+                command = [string substringToIndex:range.location];
+                argument = [string substringFromIndex:range.location + 1];
+        }
+        
+        if([command isEqualToString:@"/me"] && [argument length] > 0) {
+                if([argument length] > WCChatLimit)
+                        argument = [argument substringToIndex:WCChatLimit];
+                
+                [[self connection] sendCommand:WCMeCommand
+                                                  withArgument:[NSSWF:@"%u", [self chatID]]
+                                                  withArgument:argument];
+                
+                [WCStats addUnsignedLongLong:[argument length] forKey:WCStatsChat];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/exec"] && [argument length] > 0) {
+                NSTask                          *task;
+                NSPipe                          *pipe;
+                NSFileHandle            *fileHandle;
+                NSDictionary            *environment;
+                NSData                          *data;
+                NSString                        *output;
+                double                          timeout = 10.0;
+                
+                pipe = [NSPipe pipe];
+                fileHandle = [pipe fileHandleForReading];
+                
+                environment     = [NSDictionary dictionaryWithObjectsAndKeys:
+                        @"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin",
+                                @"PATH",
+                        NULL];
+                
+                task = [[NSTask alloc] init];
+                [task setLaunchPath:@"/bin/sh"];
+                [task setArguments:[NSArray arrayWithObjects:@"-c", argument, NULL]];
+                [task setStandardOutput:pipe];
+                [task setStandardError:pipe];
+                [task setEnvironment:environment];
+                [task launch];
+                
+                while([task isRunning]) {
+                        sleep(1);
+                        timeout -= 1.0;
+                        
+                        if(timeout <= 0.0) {
+                                [task terminate];
+                                
+                                break;
+                        }
+                }
+
+                data = [fileHandle readDataToEndOfFile];
+                output = [NSString stringWithData:data encoding:NSUTF8StringEncoding];
+                
+                if(output && [output length] > 0) {
+                        if([output length] > WCChatLimit)
+                                output = [output substringToIndex:WCChatLimit];
+
+                        [[self connection] sendCommand:WCSayCommand
+                                                          withArgument:[NSSWF:@"%u", [self chatID]]
+                                                          withArgument:output];
+
+                        [WCStats addUnsignedLongLong:[output length] forKey:WCStatsChat];
+                }
+                
+                [task release];
+                
+                return YES;
+        }
+        else if(([command isEqualToString:@"/nick"] ||
+                         [command isEqualToString:@"/n"]) && [argument length] > 0) {
+                [[self connection] sendCommand:WCNickCommand withArgument:argument];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/status"] || [command isEqualToString:@"/s"]){
+                [[self connection] sendCommand:WCStatusCommand withArgument:argument];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/stats"]) {
+                [[self connection] sendCommand:WCSayCommand
+                                                  withArgument:[NSSWF:@"%u", [self chatID]]
+                                                  withArgument:[[WCStats stats] string]];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/clear"]) {
+                [[[_chatOutputTextView textStorage] mutableString] setString:@""];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/topic"]) {
+                [[self connection] sendCommand:WCTopicCommand
+                                                  withArgument:[NSSWF:@"%u", [self chatID]]
+                                                  withArgument:argument];
+                
+                return YES;
+        }
+        else if([command isEqualToString:@"/broadcast"] && [argument length] > 0) {
+                [[self connection] sendCommand:WCBroadcastCommand withArgument:argument];
+                
+                return YES;
+        }
+#ifndef RELEASE
+        else if([command isEqualToString:@"/dump"]) {
+                [[self connection] sendCommand:WCDumpCommand];
+                
+                return YES;
+        }
+#endif
+
+        return NO;
+}
+
+@end
+
+
-@implementation WCChat
-
-+ (id)allocWithZone:(NSZone *)zone {
-        // --- guard against direct instantiaton
-        if([self isEqual:[WCChat class]]) {
-                NSLog(@"*** -[%@ allocWithZone:]: attempt to instantiate abstract class", self);
@@ -85 +414 @@
-        _shownUsers             = [[NSMutableArray alloc] init];
-
-        // --- subscribe to these
-        [[WCMain main] addObserver:self
-                                          selector:@selector(preferencesDidChange:)
@@ -94 +422 @@
-                                                  name:WCDateDidChange];
-
-/*      [[self connection] addObserver:self
-                                                  selector:@selector(chatConnectionHasClosed:)
-                                                          name:WCConnectionHasClosed];
-
-        [[self connection] addObserver:self
-                                                  selector:@selector(chatConnectionHasReattached:)
-                                                          name:WCConnectionHasReattached];*/
-        
-        [[self connection] addObserver:self
-                                                  selector:@selector(chatReceivedUser:)
@@ -175 +495 @@
-        WCUserCell              *userCell;
-
-        // --- set up our custom cell type
-        imageCell = [[NSImageCell alloc] init];
-        [_iconTableColumn setDataCell:imageCell];
@@ -184 +503 @@
-        [userCell release];
-
-        // --- set up table view
-        [_userListTableView setDoubleAction:@selector(sendPrivateMessage:)];
-
-        // --- set up text view
-        [_chatOutputTextView setForwardsTextToNextKeyView:YES];
-        
-        // --- create filter
-        _chatFilter = [[WITextFilter alloc] init];
-        [_chatFilter push:@selector(filterWiredChat)];
-        [_chatFilter push:@selector(filterURLs)];
-
-
-
+
-        [self validate];
-}
@@ -215 +530 @@
-
-- (void)preferencesDidChange:(NSNotification *)notification {
-
+_
-
-        [_chatOutputTextView scrollToBottom];
@@ -223 +538 @@
-
-- (void)dateDidChange:(NSNotification *)notification {
-
+_
-}
-
@@ -268 +583 @@
-                return;
-
-        // --- allocate a new user and fill out the fields
-        user = [[WCUser alloc] init];
-        [user setUserID:[uid intValue]];
@@ -280 +594 @@
-        [user setJoinDate:[NSDate date]];
-
-        // --- decode image
-        data = [NSData dataWithBase64EncodedString:icon];
-        image = [[NSImage alloc] initWithData:data];
@@ -286 +599 @@
-        [image release];
-
-        // --- add it to our dictionary of users
-        [_allUsers addObject:user];
-        [_users setObject:user forKey:[NSNumber numberWithUnsignedInt:[user userID]]];
@@ -298 +610 @@
-        NSString                *cid;
-
-        // --- get the fields
-        fields = [[notification userInfo] objectForKey:WCArgumentsKey];
-        cid = [fields safeObjectAtIndex:0];
@@ -305 +616 @@
-                return;
-
-        // --- enter the accumulated users
-        [_shownUsers addObjectsFromArray:_allUsers];
-        [_allUsers removeAllObjects];
@@ -337 +647 @@
-                return;
-
-        // --- allocate a new user and fill out the fields
-        user = [[WCUser alloc] init];
-        [user setUserID:[uid intValue]];
@@ -349 +658 @@
-        [user setJoinDate:[NSDate date]];
-
-        // --- decode data
-        data = [NSData dataWithBase64EncodedString:icon];
-        image = [[NSImage alloc] initWithData:data];
@@ -355 +663 @@
-        [image release];
-
-        // --- add it to our dictionary of users
-        [_shownUsers addObject:user];
-        [_users setObject:user forKey:[NSNumber numberWithUnsignedInt:[user userID]]];
-
-        // --- post chat about it
-        if([[WCSettings eventForTag:WCEventsUserJoined] boolForKey:WCEventsPostInChat])
-
-
-
+
+
-        [[self connection] postNotificationName:WCChatUsersDidChange object:[self connection]];
-        [_userListTableView reloadData];
-
-        // --- trigger event
-        [[self connection] postNotificationName:WCConnectionTriggeredEvent
-                                                                         object:[NSNumber numberWithInt:WCEventsUserJoined]];
@@ -379 +683 @@
-        WCUser                  *user;
-
-        // --- get the fields
-        fields  = [[notification userInfo] objectForKey:WCArgumentsKey];
-        cid             = [fields safeObjectAtIndex:0];
@@ -387 +690 @@
-                return;
-
-        // --- get user
-        user = [self userWithUserID:[uid unsignedIntValue]];
-
-        // --- post chat about it
-        if([[WCSettings eventForTag:WCEventsUserLeft] boolForKey:WCEventsPostInChat])
-
-
-
+
+
-        [_shownUsers removeObject:user];
-        [_users removeObjectForKey:[NSNumber numberWithUnsignedInt:[user userID]]];
-        
-        // --- reload
-        [[self connection] postNotificationName:WCChatUsersDidChange object:[self connection]];
-        [_userListTableView reloadData];
-
-        // --- trigger event
-        [[self connection] postNotificationName:WCConnectionTriggeredEvent
-                                                                         object:[NSNumber numberWithInt:WCEventsUserLeft]];
@@ -426 +724 @@
-                return;
-
-        // --- post chat about nick changes
-        if(![nick isEqualToString:[user nick]]) {
-                if([[WCSettings eventForTag:WCEventsUserChangedNick] boolForKey:WCEventsPostInChat])
-
-
-
-
+
+
+
-        [user setIdle:[idle intValue]];
-        [user setAdmin:[admin intValue]];
@@ -459 +755 @@
-                return;
-
-        // --- decode image data
-        data = [NSData dataWithBase64EncodedString:icon];
-        image = [[NSImage alloc] initWithData:data];
@@ -465 +760 @@
-        [image release];
-
-        // --- reload the table
-        [_userListTableView setNeedsDisplay:YES];
-}
@@ -487 +781 @@
-                return;
-
-
-
-
-
+
+
-        [_shownUsers removeObject:victim];
-        [_users removeObjectForKey:[NSNumber numberWithInt:[victim userID]]];
@@ -505 +797 @@
-        WCUser          *victim, *killer;
-
-        // --- get the fields
-        fields  = [[notification userInfo] objectForKey:WCArgumentsKey];
-        uid1    = [fields safeObjectAtIndex:0];
@@ -517 +808 @@
-                return;
-
-
-
-
-
+
+
-        [_shownUsers removeObject:victim];
-        [_users removeObjectForKey:[NSNumber numberWithInt:[victim userID]]];
-        
-        // --- reload
-        [[self connection] postNotificationName:WCChatUsersDidChange object:[self connection]];
-        [_userListTableView reloadData];
@@ -549 +837 @@
-                return;
-
-        // --- insert a timestamp
-        if([WCSettings boolForKey:WCTimestampChat])
-
-
-
-
-
-
+
+
+
+
-        [[self connection] postNotificationName:WCConnectionTriggeredEvent
-                                                                         object:[NSNumber numberWithInt:WCEventsChatReceived]];
@@ -576 +861 @@
-                return;
-
-        // --- get user
-        user = [self userWithUserID:[uid intValue]];
-
-        // --- check ignore
-        if(!user || [user isIgnored])
-                return;
-
-        // --- insert a timestamp
-        if([WCSettings boolForKey:WCTimestampChat])
-
-
-
-
-
-
+
+
+
+
-        [[self connection] postNotificationName:WCConnectionTriggeredEvent
-                                                                         object:[NSNumber numberWithInt:WCEventsChatReceived]];
@@ -615 +895 @@
-                return;
-
-        // --- create new topic
-        [_topic release];
-        _topic = [[WCTopic alloc] init];
@@ -624 +903 @@
-        [_topic setTopic:message];
-
-
+_
-}
-
@@ -644 +923 @@
-                NSSize          size, rightSize, leftSize;
-
-                // --- get split view size
-                size = [_userListSplitView frame].size;
-
-                // --- get static right part size
-                rightSize = [_userListView frame].size;
-                rightSize.height = size.height;
-
-                // --- set dynamic left part size
-                leftSize.height = size.height;
-                leftSize.width = size.width - [_userListSplitView dividerThickness] - rightSize.width;
-
-                // --- set new frames
-                [_chatView setFrameSize:leftSize];
-                [_userListView setFrameSize:rightSize];
@@ -662 +935 @@
-                NSSize          size, bottomSize, topSize;
-
-                // --- get split view size
-                size = [_chatSplitView frame].size;
-
-                // --- get static bottom part size
-                bottomSize = [_chatInputScrollView frame].size;
-                bottomSize.width = size.width;
-
-                // --- set dynamic top part size
-                topSize.width = size.width;
-                topSize.height = size.height - [_chatSplitView dividerThickness] - bottomSize.height;
-
-                // --- set new frames
-                [_chatOutputScrollView setFrameSize:topSize];
-                [_chatInputScrollView setFrameSize:bottomSize];
@@ -696 +963 @@
-        }
-
-        // --- close sheet
-        [_setTopicPanel close];
-        [_setTopicTextView setString:@""];
@@ -704 +970 @@
-
-- (BOOL)topicTextView:(NSTextView *)textView doCommandBySelector:(SEL)selector {
-        // --- submit on enter
-        if(selector == @selector(insertNewline:)) {
-                if([[NSApp currentEvent] character] == NSEnterCharacter) {
@@ -722 +987 @@
-        BOOL    commandKey, optionKey, controlKey, historyScrollback;
-
-        // --- get key state
-        commandKey      = (([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask) != 0);
-        optionKey       = (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0);
-        controlKey      = (([[NSApp currentEvent] modifierFlags] & NSControlKeyMask) != 0);
-
-        // --- get history settings
-        historyScrollback = [WCSettings boolForKey:WCHistoryScrollback];
-        historyModifier = [WCSettings intForKey:WCHistoryScrollbackModifier];
@@ -744 +1007 @@
-                        return YES;
-
-                // --- enforce length limit
-                if(length > WCChatLimit)
-                        string = [string substringToIndex:WCChatLimit];
-                
-                // --- add it to the command history
-                [_commandHistory addObject:[[string copy] autorelease]];
-                _currentCommand = [_commandHistory count];
-                
-                // --- attempt a command parse
-                if([string hasPrefix:@"/"]) {
-
+_
-                                post = NO;
-                }
-
-                if(post) {
-                        // --- get command
-                        if(selector == @selector(insertNewlineIgnoringFieldEditor:) ||
-                           (selector == @selector(insertNewline:) && optionKey))
@@ -766 +1025 @@
-                                command = WCSayCommand;
-                        
-                        // --- send chat
-                        [[self connection] sendCommand:command
-                                                          withArgument:[NSSWF:@"%u", [self chatID]]
-                                                          withArgument:string];
-
-                        // --- save in stats
-                        [WCStats addUnsignedLongLong:[string UTF8StringLength] forKey:WCStatsChat];
-                }
@@ -786 +1043 @@
-                        int                             i, count, options;
-
-                        // --- get matching nicks
-                        options = NSCaseInsensitiveSearch;
-                        nicks = [[self nicks] stringsMatchingString:[_chatInputTextView string]
@@ -808 +1064 @@
-                                }
-                                
-                                // --- enter our partial match
-                                if([p length] > 0)
-                                        [_chatInputTextView setString:prefix];
@@ -836 +1091 @@
-                          controlKey))) {
-                if(_currentCommand > 0) {
-                        // --- save current string
-                        if(_currentCommand == [_commandHistory count]) {
-                                [_currentString release];
@@ -843 +1097 @@
-                        }
-
-                        // --- move up in the command history
-                        [_chatInputTextView setString:[_commandHistory objectAtIndex:--_currentCommand]];
-
@@ -863 +1116 @@
-                          controlKey))) {
-                if(_currentCommand + 1 < [_commandHistory count]) {
-                        // --- move down in the command history
-                        [_chatInputTextView setString:[_commandHistory objectAtIndex:++_currentCommand]];
-
@@ -869 +1121 @@
-                }
-                else if(_currentCommand + 1 == [_commandHistory count]) {
-                        // --- reset original string
-                        _currentCommand++;
-                        [_chatInputTextView setString:_currentString];
@@ -913 +1164 @@
-
-#pragma mark -
-
-- (void)update {
-        NSFont          *font;
-        NSColor         *color;
-        BOOL            parse = NO;
-
-        // --- set font
-        font = [WCSettings objectForKey:WCChatFont];
-
-        if(![[_chatOutputTextView font] isEqualTo:font]) {
-                [_chatOutputTextView setFont:font];
-                [_chatInputTextView setFont:font];
-                [_setTopicTextView setFont:font];
-        }
-        
-        // --- set background color
-        color = [WCSettings objectForKey:WCChatBackgroundColor];
-
-        if(![[_chatOutputTextView backgroundColor] isEqualTo:color]) {
-                [_chatOutputTextView setBackgroundColor:color];
-                [_chatInputTextView setBackgroundColor:color];
-                [_setTopicTextView setBackgroundColor:color];
-        }
-
-        // --- set text color
-        color = [WCSettings objectForKey:WCChatTextColor];
-
-        if(![[_chatOutputTextView textColor] isEqualTo:color]) {
-                [_chatOutputTextView setTextColor:color];
-                [_chatInputTextView setTextColor:color];
-                [_chatInputTextView setInsertionPointColor:color];
-                [_setTopicTextView setTextColor:color];
-                [_setTopicTextView setInsertionPointColor:color];
-
-                parse = YES;
-        }
-
-        // --- parse text
-        if(parse)
-                [_chatOutputTextView setString:[_chatOutputTextView string] withFilter:_chatFilter];
-
-        // --- set up user list
-        [_userListTableView setFont:[WCSettings objectForKey:WCChatUserListFont]];
-        [_userListTableView setDrawsStripes:[WCSettings boolForKey:WCChatUserListAlternateRows]];
-        
-        // --- mark them as updated
-        [_chatOutputTextView setNeedsDisplay:YES];
-        [_chatInputTextView setNeedsDisplay:YES];
-        [_setTopicTextView setNeedsDisplay:YES];
-        [_userListTableView setNeedsDisplay:YES];
-}
-
-
-
-- (void)updateTopic {
-        [_topicTextField setToolTip:[_topic topic]];
-        [_topicTextField setStringValue:[_topic topic]];
-        [_topicNickTextField setStringValue:[NSSWF:
-                NSLS(@"%@ %C %@", @"Chat topic set by (nick, time)"),
-                [_topic nick],
-                0x2014,
-                [[_topic date] commonDateStringWithSeconds:NO relative:YES capitalized:YES]]];
-}
-
-
-
-- (void)validate {
@@ -1078 +1264 @@
-#pragma mark -
-
-- (void)printString:(NSString *)string {
-        float           position;
-        
-        // --- append string
-        position = [[_chatOutputScrollView verticalScroller] floatValue];
-        
-        if([[_chatOutputTextView textStorage] length] > 0)
-                [[[_chatOutputTextView textStorage] mutableString] appendString:@"\n"];
-        
-        [_chatOutputTextView appendString:string withFilter:_chatFilter];
-        
-        // --- scroll
-        if(position == 1.0)
-                [_chatOutputTextView performSelectorOnce:@selector(scrollToBottom) withObject:NULL afterDelay:0.05];
-}
-
-
-
-- (void)printEvent:(NSString *)message {
-        NSString        *output;
-
-        // --- build the output string
-        output = [NSSWF:NSLS(@"<<< %@ >>>", @"Chat event (message)"), message];
-
-        // --- add tim