Changeset 2161

Timestamp:

12/28/04 13:06:07 (4 years ago)

Author:

timothy

Message:

Bringing the branch up to r2160. THis should be the last commit here, as I am about to merge the branch back into the trunk.

Files:

• branches/overhaul/JVChatTranscript.m (modified) (4 diffs)
• branches/overhaul/JVDirectChat.m (modified) (21 diffs)
• branches/overhaul/MVIRCChatConnection.m (modified) (3 diffs)
• branches/overhaul/MVIRCFileTransfer.m (modified) (11 diffs)
• branches/overhaul/Plug-Ins/Standard Commands/JVStandardCommands.m (modified) (2 diffs)
• branches/overhaul/Resources/Changes.rtf (modified) (9 diffs)
• branches/overhaul/Resources/Info.plist (modified) (3 diffs)

branches/overhaul/JVChatTranscript.m

@@ -676 +676 @@
-
-// Allows some simple code to work when not built with WebKit/Safari 1.3
-_WEB_SCRIPT_OBJECT_H_
+WebKitVersion146
-#define WebMenuItemTagGoBack 9
-#define WebMenuItemTagGoForward 10
@@ -810 +810 @@
-- (void) webView:(WebView *) sender didFinishLoadForFrame:(WebFrame *) frame {
-// Test for WebKit/Safari 1.3
-_WEB_SCRIPT_OBJECT_H_
+WebKitVersion146
-        if( [display respondsToSelector:@selector( setDrawsBackground: )] ) {
-                DOMCSSStyleDeclaration *style = [sender computedStyleForElement:[(DOMHTMLDocument *)[[sender mainFrame] DOMDocument] body] pseudoElement:nil];
@@ -954 +954 @@
-
-- (void) _prependMessages:(NSString *) messages {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                NSMutableString *result = [messages mutableCopy];
-                [result replaceOccurrencesOfString:@"  " withString:@"  " options:NSLiteralSearch range:NSMakeRange( 0, [result length] )];
@@ -979 +979 @@
-                // scroll down if we need to
-                if( [scrollNeeded boolValue] ) [body setValue:[body valueForKey:@"offsetHeight"] forKey:@"scrollTop"];
+        } else
-#endif
-} else {
+{ // old JavaScript method
-                NSMutableString *result = [messages mutableCopy];
-                [result escapeCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\\\"'"]];

branches/overhaul/JVDirectChat.m

@@ -102 +102 @@
-- (void) addEventMessageToLogAndDisplay:(NSString *) message withName:(NSString *) name andAttributes:(NSDictionary *) attributes entityEncodeAttributes:(BOOL) encode;
-- (void) addMessageToLogAndDisplay:(NSData *) message fromUser:(MVChatUser *) user asAction:(BOOL) action;
+- (int) visibleMessageCount;
-- (int) locationOfMessage:(unsigned int) identifier;
-- (int) locationOfElementByIndex:(unsigned int) index;
@@ -119 +120 @@
-- (void) _saveSelfIcon;
-- (void) _saveBuddyIcon:(JVBuddy *) buddy;
+- (void) _setCurrentMessage:(JVMutableChatMessage *) message;
-@end
-
@@ -499 +501 @@
-
-- (void) handleDraggedFile:(NSString *) path {
-
+
+
-}
-
@@ -798 +801 @@
-                                        [[self connection] sendRawMessage:[command stringByAppendingFormat:@" %@", [arguments string]]];
-                        } else {
-
-
-
+
-                                if( [[NSUserDefaults standardUserDefaults] boolForKey:@"MVChatNaturalActions"] && ! action ) {
-                                        extern NSArray *JVAutoActionVerbs;
@@ -816 +817 @@
-                                }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-                                if( [[subMsg string] length] )
-
-
-
-
+
+
+
-                        }
-                }
@@ -849 +844 @@
-        [invocation setArgument:&message atIndex:2];
-
+        [self _setCurrentMessage:message];
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation stoppingOnFirstSuccessfulReturn:NO];
+        [self _setCurrentMessage:nil];
-
-        if( [[message body] length] )
@@ -1296 +1293 @@
-        }
-
-
-
-
-
-
-
-
+
+
+
+
-
-        if( ! [user isLocalUser] )
-_currentM
-
-_currentM
+cm
+
+cm
-                _newMessageCount++;
-
@@ -1346 +1340 @@
-                                else [classes addObject:@"highlight"];
-                                [messageString addAttribute:@"CSSClasses" value:classes range:foundRange];
-_currentM
+cm
-                        }
-                }
-        }
-
-_currentM
-
-_currentM
-
-_currentM
+cm
+
+cm
+
+cm
-                _newMessageCount--;
-                return;
@@ -1362 +1356 @@
-        [self _breakLongLinesInString:messageString];
-
-_currentMessage isHighlighted] && [_currentM
+cmessage isHighlighted] && [cm
-                _newHighlightMessageCount++;
-                NSMutableDictionary *context = [NSMutableDictionary dictionary];
@@ -1374 +1368 @@
-        }
-
-_currentM
+cm
-                NSMutableDictionary *context = [NSMutableDictionary dictionary];
-_currentM
+cm
-                if( [self isMemberOfClass:[JVChatRoom class]] ) [context setObject:[NSString stringWithFormat:@"%@'s message was ignored in %@.", user, [self title]] forKey:@"description"];
-                else [context setObject:[NSString stringWithFormat:@"%@'s message was ignored.", user] forKey:@"description"];
-                [context setObject:[NSImage imageNamed:@"activity"] forKey:@"image"];
-_currentM
+cm
-        }
-
@@ -1458 +1452 @@
-
-        child = xmlDocCopyNode( xmlDocGetRootElement( msgDoc ), doc, 1 );
-_currentM
-_currentM
-_currentM
-_currentM
-_currentM
+cm
+cm
+cm
+cm
+cm
-        xmlAddChild( root, child );
-
@@ -1494 +1488 @@
-                [self appendMessage:transformedMessage subsequent:subsequent];
-
-_currentM
+cm
-                        NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
-                        if( [scroller isKindOfClass:[JVMarkedScroller class]] ) {
@@ -1506 +1500 @@
-                _firstMessage = NO; // not the first message anymore
-                _requiresFullMessage = NO; // next message will not require a new envelope if it is consecutive
-_currentM
+cm
-                // the style decided to excluded this message, decrease the new message counts
-_currentM
+cm
-                _newMessageCount--;             
-        }
@@ -1514 +1508 @@
-        xmlFreeDoc( doc );
-
-_currentMessage release]; // not needed anymore
-_currentMessage = nil
+self _setCurrentMessage:nil];
+[cmessage release]
-
-        [_windowController reloadListItem:self andChildren:NO];
@@ -1521 +1515 @@
-
-- (int) locationOfMessage:(unsigned int) identifier {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                DOMElement *element = [[[display mainFrame] DOMDocument] getElementById:[NSString stringWithFormat:@"%d", identifier]];
-                return [[element valueForKey:@"offsetTop"] intValue];
+        } else
-#endif
-
-
-
+
+
-}
-
-- (int) locationOfElementByIndex:(unsigned int) index {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                DOMHTMLElement *body = [(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body];
-                if( index < [[body children] length] ) return [[[[body children] item:index] valueForKey:@"offsetTop"] intValue];
-                else return 0;
+        } else
-#endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-- (void) scrollToBottom {
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                DOMHTMLElement *body = [(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body];
-                [body setValue:[body valueForKey:@"offsetHeight"] forKey:@"scrollTop"];
+        } else
-#endif
-
-
-
+
+
-}
-
-- (void) appendMessage:(NSString *) html subsequent:(BOOL) subsequent {
-0
+[self visibleMessageCount]
-        unsigned int scrollbackLimit = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatScrollbackLimit"];
-        NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
-
-
-
-
-
-
-
-
+
-                int loc = [self locationOfElementByIndex:( ( messageCount + 1 ) - scrollbackLimit )];
-                if( loc > 0 && [scroller isKindOfClass:[JVMarkedScroller class]] )
@@ -1571 +1569 @@
-        }
-
+#ifdef WebKitVersion146
-        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
-#ifdef _WEB_SCRIPT_OBJECT_H_
-                DOMHTMLElement *element = (DOMHTMLElement *)[[[display mainFrame] DOMDocument] createElement:@"span"];
-                DOMHTMLElement *replaceElement = (DOMHTMLElement *)[[[display mainFrame] DOMDocument] getElementById:@"consecutiveInsert"];
@@ -1613 +1611 @@
-                // scroll down if we need to
-                if( [scrollNeeded boolValue] ) [self scrollToBottom];
-
-
+
+
+
-                NSMutableString *transformedMessage = [html mutableCopy];
-                [transformedMessage escapeCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\\\"'"]];
@@ -1860 +1859 @@
-                [self addEventMessageToDisplay:[NSString stringWithFormat:NSLocalizedString( @"You have set yourself away with \"%@\".", "self away status set message" ), msgString] withName:@"awaySet" andAttributes:[NSDictionary dictionaryWithObjectsAndKeys:messageString, @"away-message", nil]];
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
@@ -1878 +1867 @@
-                [self addEventMessageToDisplay:NSLocalizedString( @"You have returned from away.", "self away status removed message" ) withName:@"awayRemoved" andAttributes:nil];
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
@@ -2100 +2079 @@
-        }
-}
+
+- (void) _setCurrentMessage:(JVMutableChatMessage *) message {
+        [_currentMessage setObjectSpecifier:nil];
+        [_currentMessage autorelease];
+        _currentMessage = [message retain];
+
+        id classDescription = [NSClassDescription classDescriptionForClass:[self class]];
+        id msgSpecifier = [[[NSPropertySpecifier alloc] initWithContainerClassDescription:classDescription containerSpecifier:[self objectSpecifier] key:@"currentMessage"] autorelease];
+        [_currentMessage setObjectSpecifier:msgSpecifier];
+}
-@end
-
@@ -2122 +2111 @@
-        BOOL localEcho = ( [[command evaluatedArguments] objectForKey:@"echo"] ? [[[command evaluatedArguments] objectForKey:@"echo"] boolValue] : YES );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-

branches/overhaul/MVIRCChatConnection.m

@@ -1 +1 @@
-#import <unistd.h>
+#import <pthread.h>
-
-#define HAVE_IPV6 1
@@ -190 +191 @@
-        MVIRCChatConnection *self = [MVIRCChatConnection _connectionForServer:server];
-
-
-
-
+
+
+
+
+
-}
-
@@ -199 +202 @@
-        if( ! self ) return;
-
-
-
-
+
+
+
+
+
+
+
-}
-

branches/overhaul/MVIRCFileTransfer.m

@@ +1 @@
+#import <pthread.h>
+
-#define HAVE_IPV6 1
-#define MODULE_NAME "MVIRCFileTransfer"
@@ -36 +38 @@
-        if( ! self ) return;
-
-
-
-
+
+
+
+
+
-
-        if( dcc -> size != dcc -> transfd ) {
@@ -55 +59 @@
-        if( ! self ) return;
-
-
-
-
+
+
+
+
+
-
-        NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:@"The file transfer connection could not be made.", NSLocalizedDescriptionKey, nil];
@@ -68 +74 @@
-        if( ! self ) return;
-
-
-
-
+
+
+
+
+
-
-        NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:@"The file %@ could not be created, please make sure you have write permissions in the %@ folder.", NSLocalizedDescriptionKey, nil];
@@ -81 +89 @@
-        if( ! self ) return;
-
-
-
-
-
+
+
+
+
+
+
-        NSError *ferror = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil];
-        NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:@"The file %@ could not be opened, please make sure you have read permissions for this file.", NSLocalizedDescriptionKey, ferror, @"NSUnderlyingErrorKey", nil];
@@ -95 +105 @@
-        if( ! self ) return;
-
-
-
-
+
+
+
+
+
-
-        NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:@"The file %@ is already being offerend to %@.", NSLocalizedDescriptionKey, nil];
@@ -106 +118 @@
-#pragma mark -
-
+static BOOL fileTransferSignalsRegistered = NO;
+
-@implementation MVFileTransfer (MVIRCFileTransferPrivate)
-+ (id) _transferForDCCFileRecord:(FILE_DCC_REC *) record {
@@ -122 +136 @@
-+ (void) initialize {
-        [super initialize];
-
-
+
-                [MVIRCChatConnectionThreadLock lock];
-                signal_add_last( "dcc connected", (SIGNAL_FUNC) MVFileTransferConnected );
@@ -132 +145 @@
-                signal_add_last( "dcc error send exists", (SIGNAL_FUNC) MVFileTransferErrorSendExists );
-                [MVIRCChatConnectionThreadLock unlock];
-tooLate
+fileTransferSignalsRegistered
-        }
-}
@@ -329 +342 @@
-        static BOOL tooLate = NO;
-        if( ! tooLate ) {
+                [MVIRCChatConnectionThreadLock lock];
+                signal_add_last( "dcc get receive", (SIGNAL_FUNC) MVIRCDownloadFileTransferSpecifyPath );
+                [MVIRCChatConnectionThreadLock unlock];
+                tooLate = YES;
+        }
+
+        if( ! fileTransferSignalsRegistered ) {
-                [MVIRCChatConnectionThreadLock lock];
-                signal_add_last( "dcc connected", (SIGNAL_FUNC) MVFileTransferConnected );
@@ -336 +356 @@
-                signal_add_last( "dcc error file open", (SIGNAL_FUNC) MVFileTransferErrorFileOpen );
-                signal_add_last( "dcc error send exists", (SIGNAL_FUNC) MVFileTransferErrorSendExists );
-                signal_add_last( "dcc get receive", (SIGNAL_FUNC) MVIRCDownloadFileTransferSpecifyPath );
-                [MVIRCChatConnectionThreadLock unlock];
-tooLate
+fileTransferSignalsRegistered
-        }
-}

branches/overhaul/Plug-Ins/Standard Commands/JVStandardCommands.m

@@ -55 +55 @@
-                if( ! [command caseInsensitiveCompare:@"me"] || ! [command caseInsensitiveCompare:@"action"] || ! [command caseInsensitiveCompare:@"say"] ) {
-                        if( [arguments length] ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        return YES;
@@ -592 +588 @@
-        }
-
-
+&& [(NSString *)[argsArray objectAtIndex:offset] length] 
-                rooms = [argsArray subarrayWithRange:NSMakeRange( offset, [argsArray count] - offset )];
-

branches/overhaul/Resources/Changes.rtf

@@ -14 +14 @@
-
-\f2\b0\fs20 \cf0 \'b7
+\f3  Can't join channels that require a key with the GUI. A workaround is to use this command "/join #room password" for the room.\
+
+\f2 \'b7
-\f3  SOCKS and HTTP proxies don't function still.\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
@@ -21 +24 @@
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\f1\b \cf0 \
-Build 2C10 
-
-
-
-
-
+
+
+
+
+
+
+
+
-\f3  The SILC protocol is now supported right along side existing IRC connections. For more information about SILC visit http://silcnet.org.\
-
@@ -75 +115 @@
-\f1\b \cf0 \
-Build 2C9 
-
+ & September
-\f1\b\fs28 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
@@ -861 +901 @@
-\f2 \'b7
-\f3  Some perferences will not carry over from version 1.\
-
-
-
+
+
-\f3  No longer crashes when you don't have an outside internet connection and/or the host-name can't be resolved.\
- 
@@ -924 +963 @@
-\f2 \'b7
-\f3  Windows that are miniaturized into the Dock will not keep popping out when either "Show hidden \'c9 on \'c9 activity" preferences are on.\
-
-
-
+
+
-\f3  All windows remember their position on screen better, and chat windows remember the member drawer size and state.\
-
@@ -957 +995 @@
-\f5\i /itunes
-\f3\i0  in a room to test the basic iTunes plugin.\
-
-
-
+
+
-\f3  Added the French localization.\
- 
@@ -1010 +1047 @@
-\f2 \'b7
-\f3  NickServ password authorization enabled with password prompts and saving passwords in your keychain.\
-
-
-
+
+
-\f3  Connections are stored different now, old bookmarks will not load and may show up as blank lines in the connection manager.\
- 
@@ -1111 +1147 @@
-\f2 \'b7
-\f3  IRC URLs are now handled from the system and internally in chat dialog (was only rooms before, now allows new server connections). Here is an example URL that will connect to 'javelin.cc' as user 'test' on port '6669' and will join the room 'colloquy' when connected: \ul irc://test@javelin.cc:6669/#colloquy\ulnone . Note that only the scheme and host part of the URL need to be present. Valid room paths a begin with '#', '&' or '+'; if the path of the URL is not a valid room then a new message to that user is made. Mozilla's Chatzilla handles IRC URLs in this manner also.\
-
-
-
+
+
-\f3  Nickname changes were not being reported due to a Firetalk API change \'d1 now fixed.\
- 
@@ -1144 +1179 @@
-\f3\b0 (Wednesday November 13, 2002) \'d1
-\f1\b\fs28 \
-
-
-
+
+
-\f2 \'b7
-\f3  Enabled the Software Update check.\

branches/overhaul/Resources/Info.plist

@@ -58 +58 @@
-                        </array>
-                        <key>CFBundleTypeName</key>
-t
+T
-                        <key>CFBundleTypeOSTypes</key>
-                        <array>
@@ -65 +65 @@
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
+                </dict>
+        </array>
+        <key>UTExportedTypeDeclarations</key>
+        <array>
+                <dict>
+                        <key>UTTypeIdentifier</key>
+                        <string>cc.javelin.colloquy.colloquystyle</string>
+                        <key>UTTypeReferenceURL</key>
+                        <string>http://www.colloquy.info/</string>
+                        <key>UTTypeDescription</key>
+                        <string>Colloquy View Style</string>
+                        <key>UTTypeIconName</key>
+                        <string>Generic.icns</string>
+                        <key>UTTypeConformsTo</key>
+                        <array>
+                                <string>public.bundle</string>
+                        </array>
+                        <key>UTTypeTagSpecification</key>
+                        <dict>
+                                <key>com.apple.ostype</key>
+                                <string>coSt</string>
+                                <key>public.filename-extension</key>
+                                <array>
+                                        <string>colloquyStyle</string>
+                                        <string>colloquystyle</string>
+                                </array>
+                                <key>public.mime-type</key>
+                                <string>application/data</string>
+                        </dict>
+                </dict>
+                <dict>
+                        <key>UTTypeIdentifier</key>
+                        <string>cc.javelin.colloquy.colloquyemoticons</string>
+                        <key>UTTypeReferenceURL</key>
+                        <string>http://www.colloquy.info/</string>
+                        <key>UTTypeDescription</key>
+                        <string>Colloquy Emoticon Set</string>
+                        <key>UTTypeIconName</key>
+                        <string>Generic.icns</string>
+                        <key>UTTypeConformsTo</key>