Changeset 2110

Timestamp:

11/13/04 21:33:47 (4 years ago)

Author:

timothy

Message:

New direct DOM access calls to append messages, only kicks in when the user has Safari 1.3 installed.

Files:

• branches/overhaul/JVDirectChat.m (modified) (9 diffs)

branches/overhaul/JVDirectChat.m

@@ -100 +100 @@
-- (void) addEventMessageToLogAndDisplay:(NSString *) message withName:(NSString *) name andAttributes:(NSDictionary *) attributes entityEncodeAttributes:(BOOL) encode;
-- (void) addMessageToLogAndDisplay:(NSData *) message fromUser:(MVChatUser *) user asAction:(BOOL) action;
+- (int) locationOfMessage:(unsigned int) identifier;
+- (int) locationOfElementByIndex:(unsigned int) index;
+- (void) scrollToBottom;
+- (void) appendMessage:(NSString *) html subsequent:(BOOL) subsequent;
-- (void) processQueue;
-- (void) displayQueue;
@@ -829 +833 @@
-
-        [send reset:nil];
-display stringByEvaluatingJavaScriptFromString:@"scrollToBottom();"
+self scrollToBottom
-}
-
@@ -1227 +1231 @@
-        [self writeToLog:root withDoc:doc initializing:NO continuation:NO];
-
-Mutable
+
-
-        @try {
-[[_chatStyle transformXMLDocument:doc withParameters:_styleParams] mutableCopy] autorelease
+_chatStyle transformXMLDocument:doc withParameters:_styleParams
-        } @catch ( NSException *exception ) {
-                messageString = nil;
@@ -1238 +1242 @@
-        if( [messageString length] ) {
-                [[display window] disableFlushWindow]; // prevent any draw (white) flashing that might occur
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                [[display window] enableFlushWindow];
-        }
@@ -1463 +1453 @@
-        else xmlAddChild( xmlDocGetRootElement( _xmlLog ), xmlDocCopyNode( root, _xmlLog, 1 ) );
-
-Mutable
+
-        NSMutableDictionary *params = _styleParams;
-        if( parent ) {
@@ -1473 +1463 @@
-
-        @try {
-[[_chatStyle transformXMLDocument:doc withParameters:params] mutableCopy] autorelease
+_chatStyle transformXMLDocument:doc withParameters:params
-        } @catch ( NSException *exception ) {
-                transformedMessage = nil;
@@ -1482 +1472 @@
-                [[display window] disableFlushWindow]; // prevent any draw (white) flashing that might occur
-
-                unsigned int messageCount = [[display stringByEvaluatingJavaScriptFromString:@"scrollBackMessageCount();"] intValue];
-                unsigned int scrollbackLimit = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatScrollbackLimit"];
-                NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
-
-                if( ( messageCount + 1 ) > scrollbackLimit ) {
-                        float loc = [[display stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"locationOfElementByIndex( %d );", ( ( messageCount + 1 ) - scrollbackLimit )]] floatValue];
-                        if( loc > 0. && [scroller isKindOfClass:[JVMarkedScroller class]] )
-                                [(JVMarkedScroller *)scroller shiftMarksAndShadedAreasBy:( loc * -1. )];
-                }
-
-                BOOL subsequent = ( [transformedMessage rangeOfString:@"<?message type=\"subsequent\"?>"].location != NSNotFound );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                }
-
@@ -1521 +1499 @@
-
-        [_windowController reloadListItem:self andChildren:NO];
+}
+
+- (int) locationOfMessage:(unsigned int) identifier {
+        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];
+#endif
+        } else { // old JavaScript method
+                return [[display stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"locationOfMessage( \"%d\" );", identifier]] intValue];
+        }
+}
+
+- (int) locationOfElementByIndex:(unsigned int) index {
+        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;
+#endif
+        } else { // old JavaScript method
+                return [[display stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"locationOfElementByIndex( %d );", index]] intValue];
+        }
+}
+
+- (void) scrollToBottom {
+        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"];
+#endif
+        } else {
+                [display stringByEvaluatingJavaScriptFromString:@"scrollToBottom();"];
+        }
+}
+
+- (void) appendMessage:(NSString *) html subsequent:(BOOL) subsequent {
+        unsigned int messageCount = 0;
+        unsigned int scrollbackLimit = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatScrollbackLimit"];
+        NSScroller *scroller = [[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
+
+        if( [[display mainFrame] respondsToSelector:@selector( DOMDocument )] ) {
+#ifdef _WEB_SCRIPT_OBJECT_H_
+                messageCount = [[[(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body] children] length];
+#endif
+        } else messageCount = [[display stringByEvaluatingJavaScriptFromString:@"scrollBackMessageCount();"] intValue];
+
+        if( ( messageCount + 1 ) > scrollbackLimit ) {
+                int loc = [self locationOfElementByIndex:( ( messageCount + 1 ) - scrollbackLimit )];
+                if( loc > 0 && [scroller isKindOfClass:[JVMarkedScroller class]] )
+                        [(JVMarkedScroller *)scroller shiftMarksAndShadedAreasBy:( loc * -1 )];
+        }
+
+        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"];
+                if( ! replaceElement ) subsequent = NO;
+
+                NSMutableString *transformedMessage = [html mutableCopy];
+                [transformedMessage replaceOccurrencesOfString:@"  " withString:@"&nbsp; " options:NSLiteralSearch range:NSMakeRange( 0, [transformedMessage length] )];
+                [transformedMessage replaceOccurrencesOfString:@"<?message type=\"subsequent\"?>" withString:@"" options:NSLiteralSearch range:NSMakeRange( 0, [transformedMessage length] )];
+
+                // parses the message so we can get the DOM tree
+                [element setInnerHTML:transformedMessage];
+
+                [transformedMessage release];
+                transformedMessage = nil;
+
+                // check if we are near the bottom of the chat area, and if we should scroll down later
+                NSNumber *scrollNeeded = [[[display mainFrame] DOMDocument] evaluateWebScript:@"( document.body.scrollTop >= ( document.body.offsetHeight - ( window.innerHeight * 1.1 ) ) )"];
+                DOMHTMLElement *body = [(DOMHTMLDocument *)[[display mainFrame] DOMDocument] body];
+
+                unsigned int i = 0;
+                if( ! subsequent ) { // append message normally
+                        [[replaceElement parentNode] removeChild:replaceElement];
+                        while( [[element children] length] ) // append all children
+                                [body appendChild:[element firstChild]];
+                } else if( [[element children] length] >= 1 ) { // append as a subsequent message
+                        DOMNode *parent = [replaceElement parentNode];
+                        DOMNode *nextSib = [replaceElement nextSibling];
+                        [parent replaceChild:[element firstChild] :replaceElement]; // replaces the consecutiveInsert node
+                        while( [[element children] length] ) { // append all remaining children (in reverse order)
+                                if( nextSib ) [parent insertBefore:[element firstChild] :nextSib];
+                                else [parent appendChild:[element firstChild]];
+                        }
+                }
+
+                // enforce the scrollback limit
+                if( scrollbackLimit > 0 && [[body children] length] > scrollbackLimit )
+                        for( i = 0; [[body children] length] > scrollbackLimit && i < ( [[body children] length] - scrollbackLimit ); i++ )
+                                [body removeChild:[[body children] item:0]];            
+
+                // scroll down if we need to
+                if( [scrollNeeded boolValue] ) [self scrollToBottom];
+#endif
+        } else { // old JavaScript method
+                NSMutableString *transformedMessage = [html mutableCopy];
+                [transformedMessage escapeCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\\\"'"]];
+                [transformedMessage replaceOccurrencesOfString:@"\n" withString:@"\\n" options:NSLiteralSearch range:NSMakeRange( 0, [transformedMessage length] )];
+                [transformedMessage replaceOccurrencesOfString:@"  " withString:@"&nbsp; " options:NSLiteralSearch range:NSMakeRange( 0, [transformedMessage length] )];
+                [transformedMessage replaceOccurrencesOfString:@"<?message type=\"subsequent\"?>" withString:@"" options:NSLiteralSearch range:NSMakeRange( 0, [transformedMessage length] )];
+                if( subsequent ) [display stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"scrollBackLimit = %d; appendConsecutiveMessage( \"%@\" );", scrollbackLimit, transformedMessage]];
+                else [display stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"scrollBackLimit = %d; appendMessage( \"%@\" );", scrollbackLimit, transformedMessage]];
+                [transformedMessage release];
+        }
-}
-
@@ -1755 +1839 @@
-                [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]];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [(JVMarkedScroller *)[[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller] startShadedAreaAt:loc];
-        } else {
-                [self addEventMessageToDisplay:NSLocalizedString( @"You have returned from away.", "self away status removed message" ) withName:@"awayRemoved" andAttributes:nil];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [(JVMarkedScroller *)[[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller] stopShadedAreaAt:loc];
-        }