Changeset 2401

Timestamp:

03/05/05 17:16:59 (4 years ago)

Author:

timothy

Message:

Many changes mostly related to AppleScripting.

• Scripting should be mostly restored now. The iTunes script fully functions, and the most common scripts should.
  
• Many Chat Core level scripting things have been reworked and will not be backwards compat.
  
• Some Colloquy level scripting commands are missing awaiting better counterparts.
  
• Fixes all the remaining Tiger GCC 4 "differ in signedness" compile warnings.
  

Files:

• trunk/Colloquy.xcode/project.pbxproj (modified) (2 diffs)
• trunk/JVChatConsolePanel.m (modified) (1 diff)
• trunk/JVChatController.m (modified) (1 diff)
• trunk/JVChatEvent.h (modified) (1 diff)
• trunk/JVChatEvent.m (modified) (8 diffs)
• trunk/JVChatMessage.m (modified) (5 diffs)
• trunk/JVChatRoomMember.m (modified) (2 diffs)
• trunk/JVChatSession.m (modified) (1 diff)
• trunk/JVChatTranscript.h (modified) (2 diffs)
• trunk/JVChatTranscript.m (modified) (29 diffs)
• trunk/JVChatTranscriptPanel.m (modified) (3 diffs)
• trunk/JVChatWindowController.m (modified) (5 diffs)
• trunk/JVStyle.m (modified) (3 diffs)
• trunk/MVApplicationController.m (modified) (2 diffs)
• trunk/MVChatConnection.h (modified) (1 diff)
• trunk/MVChatConnection.m (modified) (4 diffs)
• trunk/MVChatPluginManager.h (modified) (1 diff)
• trunk/MVChatPluginManager.m (modified) (2 diffs)
• trunk/MVChatRoom.h (modified) (1 diff)
• trunk/MVChatRoom.m (modified) (2 diffs)
• trunk/MVChatUser.h (modified) (1 diff)
• trunk/MVChatUser.m (modified) (2 diffs)
• trunk/MVIRCChatConnection.m (modified) (1 diff)
• trunk/MVSILCChatConnection.m (modified) (3 diffs)
• trunk/MVSILCChatRoom.m (modified) (1 diff)
• trunk/MVSILCChatUser.m (modified) (2 diffs)
• trunk/NSAttributedStringMoreAdditions.m (modified) (10 diffs)
• trunk/NSURLAdditions.m (modified) (3 diffs)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.m (modified) (2 diffs)
• trunk/Plug-Ins/F-Script Support/JVFScriptChatPlugin.m (modified) (2 diffs)
• trunk/Resources/ChatCore.scriptSuite (modified) (7 diffs)
• trunk/Resources/ChatCore.scriptTerminology (modified) (5 diffs)
• trunk/Resources/ChatPlugIn.scriptSuite (modified) (9 diffs)
• trunk/Resources/ChatPlugIn.scriptTerminology (modified) (2 diffs)
• trunk/Resources/Colloquy.scriptSuite (modified) (13 diffs)
• trunk/Resources/Colloquy.scriptTerminology (modified) (10 diffs)
• trunk/Resources/Colloquy.sdef (modified) (27 diffs)
• trunk/Resources/Info.plist (modified) (1 diff)
• trunk/Resources/JVChatWindow.nib/info.nib (modified) (2 diffs)
• trunk/Resources/JVChatWindow.nib/keyedobjects.nib (modified) (previous)
• trunk/Resources/JVTabbedChatWindow.nib/info.nib (modified) (1 diff)
• trunk/Resources/JVTabbedChatWindow.nib/keyedobjects.nib (modified) (previous)

trunk/Colloquy.xcode/project.pbxproj

@@ -2304 +2304 @@
-                                1C0A4C9D0799BDB00093B702,
-                                1C04394A07CAFCA000304949,
-                                1CD9DF6607D934F70006BB99,
-                        );
-                        isa = PBXResourcesBuildPhase;
@@ -4247 +4246 @@
-                        sourceTree = "<group>";
-                };
-                1CD9DF6607D934F70006BB99 = {
-                        fileRef = 1CD9DF6507D934F70006BB99;
-                        isa = PBXBuildFile;
-                        settings = {
-                        };
-                };
-                1CDDCF830716208300FE11C3 = {
-                        fileEncoding = 4;

trunk/JVChatConsolePanel.m

@@ -589 +589 @@
-        return [NSNumber numberWithUnsignedInt:(unsigned long) self];
-}
+
+- (NSWindow *) window {
+        return [[self windowController] window];
+}
-@end

trunk/JVChatController.m

@@ -451 +451 @@
-@end
-
-/* #pragma mark -
-
-@implementation JVChatWindowController (JVChatWindowControllerObjectSpecifier)
-- (NSScriptObjectSpecifier *) objectSpecifier {
-        id classDescription = [NSClassDescription classDescriptionForClass:[JVChatController class]];
-        NSScriptObjectSpecifier *container = [[JVChatController defaultManager] objectSpecifier];
-        return [[[NSUniqueIDSpecifier alloc] initWithContainerClassDescription:classDescription containerSpecifier:container key:@"chatWindows" uniqueID:[self uniqueIdentifier]] autorelease];
-}
-@end */
-
-#pragma mark -
-

trunk/JVChatEvent.h

@@ -34 +34 @@
-        /* xmlDoc */ void *_doc;
-}
-NSString *
-NSString *
+id
+id
-
-- (void) setDate:(NSDate *) date;

trunk/JVChatEvent.m

@@ -36 +36 @@
-
-                @synchronized( [self transcript] ) {
-
-
+(xmlChar *) 
+(char *) 
-                        xmlFree( prop );
-                }
@@ -74 +74 @@
-
-        @synchronized( [self transcript] ) {
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-        }
@@ -93 +93 @@
-
-                do {
-
+(char *) 
-                                _message = [[NSTextStorage allocWithZone:[self zone]] initWithXHTMLTree:subNode baseURL:nil defaultAttributes:nil];
-                                break;
@@ -111 +111 @@
-
-                do {
-
+(char *) 
-                                NSMutableDictionary *properties = [NSMutableDictionary dictionary];
-                                xmlAttrPtr prop = NULL;
@@ -117 +117 @@
-                                        xmlChar *value = xmlGetProp( subNode, prop -> name );
-                                        if( value ) {
-value] forKey:[NSString stringWithUTF8String:
+(char *) value] forKey:[NSString stringWithUTF8String:(char *) 
-                                                xmlFree( value );
-                                        }
@@ -134 +134 @@
-                                } else {
-                                        xmlChar *content = xmlNodeGetContent( subNode );
-
+(char *) 
-                                        xmlFree( content );
-                                }
@@ -140 +140 @@
-                                if( [properties count] ) {
-                                        [properties setObject:value forKey:@"value"];
-
+(char *) 
-                                } else {
-
+(char *) 
-                                }
-                        }
@@ -249 +249 @@
-        if( ! _node ) {
-                if( _doc ) xmlFreeDoc( _doc );
-
-
-
-"id",
-"name",
-"occurred",
+(xmlChar *) 
+
+(xmlChar *) 
+(xmlChar *) "id", (xmlChar *)
+(xmlChar *) "name", (xmlChar *)
+(xmlChar *) "occurred", (xmlChar *)
-                xmlDocSetRootElement( _doc, root );
-

trunk/JVChatMessage.m

@@ -40 +40 @@
-
-        @synchronized( [self transcript] ) {
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                xmlFree( prop );
-        }
@@ -85 +85 @@
-
-                do {
-
-
-
-
-
+(char *) 
+(char *) 
+
+(xmlChar *) 
+(char *) 
-                                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                                else _senderIsLocalUser = NO;
-                                xmlFree( prop );
@@ -150 +150 @@
-
-                @synchronized( [self transcript] ) {
-
-
+(xmlChar *) 
+(char *) 
-                        xmlFree( idStr );
-                }
@@ -364 +364 @@
-        if( ! _node ) {
-                if( _doc ) xmlFreeDoc( _doc );
-
+(xmlChar *) 
-
-                xmlNodePtr child = NULL;
-
+(xmlChar *) 
-                xmlDocSetRootElement( _doc, root );
-
@@ -390 +390 @@
-
-                _node = child = xmlDocCopyNode( xmlDocGetRootElement( msgDoc ), _doc, 1 );
-"id",
-"received",
-"action",
-"highlight",
-"ignored",
-"ignored",
-"type",
+(xmlChar *) "id", (xmlChar *)
+(xmlChar *) "received", (xmlChar *)
+(xmlChar *) "action", (xmlChar *)
+(xmlChar *) "highlight", (xmlChar *)
+(xmlChar *) "ignored", (xmlChar *)
+(xmlChar *) "ignored", (xmlChar *)
+(xmlChar *) "type", (xmlChar *)
-                xmlAddChild( root, child );
-

trunk/JVChatRoomMember.m

@@ -695 +695 @@
-}
-
-
+/*
-
-- (void) voiceScriptCommand:(NSScriptCommand *) command {
@@ -711 +711 @@
-- (void) demoteScriptCommand:(NSScriptCommand *) command {
-        if( [self operator] ) [self toggleOperatorStatus:nil];
-
+ */
-@end

trunk/JVChatSession.m

@@ -14 +14 @@
-
-                @synchronized( [self transcript] ) {
-
-
+(xmlChar *) 
+(char *) 
-                        xmlFree( startedStr );
-                }

trunk/JVChatTranscript.h

@@ -10 +10 @@
-
-@interface JVChatTranscript : NSObject {
+        NSScriptObjectSpecifier *_objectSpecifier;
-        void *_xmlLog; /* xmlDoc * */
-        NSMutableArray *_messages;
@@ -85 +86 @@
-- (BOOL) writeToFile:(NSString *) path atomically:(BOOL) useAuxiliaryFile;
-- (BOOL) writeToURL:(NSURL *) url atomically:(BOOL) atomically;
+
+- (void) setObjectSpecifier:(NSScriptObjectSpecifier *) objectSpecifier;
-@end

trunk/JVChatTranscript.m

@@ -89 +89 @@
-                _filePath = nil;
-                _logFile = nil;
+                _objectSpecifier = nil;
-                _autoWriteChanges = NO;
-                _requiresNewEnvelope = YES;
@@ -96 +97 @@
-                        _messages = [[NSMutableArray allocWithZone:[self zone]] initWithCapacity:100];
-
-
-
-"began",
+(xmlChar *) 
+(xmlChar *) 
+(xmlChar *) "began", (xmlChar *)
-                }
-        }
@@ -162 +163 @@
-        [_logFile release];
-        [_messages release];
+        [_objectSpecifier release];
-
-        xmlFreeDoc( _xmlLog );
-
+        _objectSpecifier = nil;
-        _filePath = nil;
-        _logFile = nil;
@@ -199 +202 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
+(char *) 
-                                                count++;
-                                } while( subNode && ( subNode = subNode -> next ) ); 
@@ -218 +221 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                count++;
-                } while( node && ( node = node -> next ) );
@@ -232 +235 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
+(char *) 
-                                                count++;
-                                } while( subNode && ( subNode = subNode -> next ) ); 
@@ -251 +254 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                count++;
-                } while( node && ( node = node -> next ) );
@@ -274 +277 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
+(char *) 
-                                                if( NSLocationInRange( i, range ) ) {
-                                                        JVChatMessage *msg = [JVChatMessage messageWithNode:subNode andTranscript:self];
@@ -286 +289 @@
-                                        }
-                                } while( subNode && ( subNode = subNode -> next ) ); 
-
+(char *) 
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatSession *session = [JVChatSession sessionWithNode:node andTranscript:self];
@@ -293 +296 @@
-
-                                if( ++i > ( range.location + range.length ) ) goto done;
-
+(char *) 
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatEvent *event = [JVChatEvent eventWithNode:node andTranscript:self];
@@ -316 +319 @@
-                xmlNode *node = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-                do {
-
+(char *) 
-                                xmlNode *subNode = xmlGetLastChild( node );
-                                do {
-
+(char *) 
-                                                return [JVChatMessage messageWithNode:subNode andTranscript:self];
-                                } while( subNode && ( subNode = subNode -> prev ) );
-
+(char *) 
-                                return [JVChatSession sessionWithNode:node andTranscript:self];
-
+(char *) 
-                                return [JVChatEvent eventWithNode:node andTranscript:self];
-                        }
@@ -388 +391 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
+(char *) 
-                                                if( NSLocationInRange( i, range ) ) {
-                                                        if( [_messages count] > i && [[_messages objectAtIndex:i] isKindOfClass:[JVChatMessage class]] ) {
@@ -398 +401 @@
-                                                                msg = [JVChatMessage messageWithNode:subNode andTranscript:self];
-                                                                id classDesc = [NSClassDescription classDescriptionForClass:[self class]];
-IndexSpecifier alloc] initWithContainerClassDescription:classDesc containerSpecifier:[self objectSpecifier] key:@"messages" index:i
+UniqueIDSpecifier alloc] initWithContainerClassDescription:classDesc containerSpecifier:[self objectSpecifier] key:@"messages" uniqueID:[msg messageIdentifier]
-                                                                [_messages replaceObjectAtIndex:i withObject:msg];
-                                                        } else if( [_messages count] == i ) {
-                                                                msg = [JVChatMessage messageWithNode:subNode andTranscript:self];
-                                                                id classDesc = [NSClassDescription classDescriptionForClass:[self class]];
-IndexSpecifier alloc] initWithContainerClassDescription:classDesc containerSpecifier:[self objectSpecifier] key:@"messages" index:i
+UniqueIDSpecifier alloc] initWithContainerClassDescription:classDesc containerSpecifier:[self objectSpecifier] key:@"messages" uniqueID:[msg messageIdentifier]
-                                                                [_messages insertObject:msg atIndex:i];
-                                                        } else continue;
@@ -443 +446 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
-
-
+(char *) 
+(xmlChar *) 
+(char *) 
-                                                if( prop ) xmlFree( prop );
-                                                if( foundNode ) break;
@@ -470 +473 @@
-
-                do {
-
+(char *) 
-                                JVChatMessage *msg = [JVChatMessage messageWithNode:node andTranscript:self];
-                                if( msg ) [results addObject:msg];
@@ -488 +491 @@
-
-                do {
-
+(char *) 
-                                xmlNode *subNode = xmlGetLastChild( node );
-                                do {
-
+(char *) 
-                                                foundNode = subNode;
-                                                break;
@@ -515 +518 @@
-
-                do {
-
+(char *) 
-                                xmlNode *subNode = node -> children;
-                                do {
-
-
-
+(char *) 
+(xmlChar *) 
+(char *) 
-                                                if( prop ) xmlFree( prop );
-                                                if( found ) return YES;
@@ -549 +552 @@
-                        // check if the last node is an envelope by the same sender, if so append this message to that envelope
-                        xmlNode *lastChild = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-
+(char *) 
-                                xmlNode *subNode = lastChild -> children;
-                                do {
-
+(char *) 
-                                                NSString *identifier = [message senderIdentifier];
-                                                NSString *nickname = [message senderNickname];
@@ -558 +561 @@
-
-                                                xmlChar *senderNameStr = xmlNodeGetContent( subNode );
-
+(char *) 
-                                                xmlFree( senderNameStr );
-
@@ -564 +567 @@
-                                                NSString *senderIdentifier = nil;
-
-
-
+(xmlChar *) 
+(char *) 
-                                                xmlFree( prop );
-
-
-
+(xmlChar *) 
+(char *) 
-                                                xmlFree( prop );
-
@@ -582 +585 @@
-
-                if( ! parent ) { // make a new envelope to append
-
+(xmlChar *) 
-                        root = xmlAddChild( xmlDocGetRootElement( _xmlLog ), root );
-
-                        if( [message ignoreStatus] == JVUserIgnored )
-"ignored",
+(xmlChar *) "ignored", (xmlChar *)
-
-                        xmlNode *subNode = ((xmlNode *) [message node]) -> parent -> children;
-
-                        do {
-
+(char *) 
-                        } while( subNode && ( subNode = subNode -> next ) ); 
-
@@ -650 +653 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-
+(char *) 
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatSession *session = [JVChatSession sessionWithNode:node andTranscript:self];
@@ -673 +676 @@
-                xmlNode *node = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-                do {
-