Changeset 2609

Timestamp:

05/03/05 01:06:05 (4 years ago)

Author:

eridius

Message:

Add a red mark to the scrollbar for the current scrollback display mark
Add a new Jump to Mark menuitem to jump to the current scrollback display mark

Files:

• trunk/JVChatTranscriptPanel.m (modified) (1 diff)
• trunk/JVMarkedScroller.h (modified) (1 diff)
• trunk/JVMarkedScroller.m (modified) (13 diffs)
• trunk/JVStyleView.h (modified) (1 diff)
• trunk/JVStyleView.m (modified) (3 diffs)
• trunk/Languages/Dutch.lproj/Colloquy.nib/classes.nib (modified) (1 diff)
• trunk/Languages/Dutch.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/English.lproj/Colloquy.nib/classes.nib (modified) (1 diff)
• trunk/Languages/English.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/German.lproj/Colloquy.nib/classes.nib (modified) (1 diff)
• trunk/Languages/German.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)

trunk/JVChatTranscriptPanel.m

@@ -464 +464 @@
-#pragma mark Highlight/Message Jumping
-
+- (IBAction) jumpToMark:(id) sender {
+        [display jumpToMark:sender];
+}
+
-- (IBAction) jumpToPreviousHighlight:(id) sender {
-[display verticalMarkedScroller] jumpToPreviousMark
+display jumpToPreviousHighlight
-}
-
-- (IBAction) jumpToNextHighlight:(id) sender {
-[display verticalMarkedScroller] jumpToNextMark
+display jumpToNextHighlight
-}
-

trunk/JVMarkedScroller.h

@@ -10 +10 @@
-- (IBAction) jumpToPreviousMark:(id) sender;
-- (IBAction) jumpToNextMark:(id) sender;
+- (void) jumpToMarkWithIdentifier:(NSString *) identifier;
-
-- (void) shiftMarksAndShadedAreasBy:(long long) displacement;
-
-- (void) addMarkAt:(unsigned long long) location;
+- (void) addMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier;
+- (void) addMarkAt:(unsigned long long) location withColor:(NSColor *) color;
+- (void) addMarkAt:(unsigned long long) location
+        withIdentifier:(NSString *) identifier
+                 withColor:(NSColor *) color;
-- (void) removeMarkAt:(unsigned long long) location;
+- (void) removeMarkAt:(unsigned long long) location withIdentifier:(NSString *) identifier;
+- (void) removeMarkAt:(unsigned long long) location withColor:(NSColor *) color;
+- (void) removeMarkAt:(unsigned long long) location
+           withIdentifier:(NSString *) identifier
+                        withColor:(NSColor *) color;
+- (void) removeMarkWithIdentifier:(NSString *) identifier;
-- (void) removeMarksGreaterThan:(unsigned long long) location;
-- (void) removeMarksLessThan:(unsigned long long) location;

trunk/JVMarkedScroller.m

@@ -1 +1 @@
-#import "JVMarkedScroller.h"
+
+struct _mark {
+        unsigned long long location;
+        NSString *identifier;
+        NSColor *color;
+};
-
-@implementation JVMarkedScroller
@@ -78 +84 @@
-
-        NSBezierPath *lines = [NSBezierPath bezierPath];
+        NSMutableArray *lineArray = [NSMutableArray array];
-        enumerator = [_marks objectEnumerator];
+        NSValue *currentMark;
-
-        unsigned long long currentPosition = ( _currentMark != NSNotFound ? _currentMark : [self floatValue] * ( NSHeight( [self frame] ) / [self knobProportion] ) );
@@ -84 +92 @@
-        NSRect knobRect = [self rectForPart:NSScrollerKnob];
-
-
-
+
+
+
+
-
-                if( value < currentPosition && ( ! foundPrevious || value > _nearestPreviousMark ) ) {
@@ -101 +111 @@
-                point.x = ( sFlags.isHoriz ? roundf( point.x ) + 0.5 : point.x );
-                point.y = ( sFlags.isHoriz ? point.y : roundf( point.y ) + 0.5 );
-
+
-                if( ! NSPointInRect( point, knobRect ) ) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -115 +135 @@
-        [[NSColor selectedKnobColor] set];
-        [lines stroke];
+        
+        // This is so we can draw the colored lines after the regular lines
+        enumerator = [lineArray objectEnumerator];
+        NSColor *lineColor;
+        while( lineColor = [enumerator nextObject] ) {
+                [lineColor set];
+                [[enumerator nextObject] stroke];
+        }
-}
-
@@ -188 +216 @@
-                float scale = NSHeight( [self rectForPart:NSScrollerKnobSlot] ) / ( NSHeight( [self frame] ) / [self knobProportion] );
-                float shift = ( ( NSHeight( [self rectForPart:NSScrollerKnobSlot] ) * [self knobProportion] ) / 2. ) / scale;
-nearestPrevious
+current
-                _jumpingToMark = NO;
-        }
@@ -199 +227 @@
-                float scale = NSHeight( [self rectForPart:NSScrollerKnobSlot] ) / ( NSHeight( [self frame] ) / [self knobProportion] );
-                float shift = ( ( NSHeight( [self rectForPart:NSScrollerKnobSlot] ) * [self knobProportion] ) / 2. ) / scale;
-nearestNex
+curren
-                _jumpingToMark = NO;
-        }
+}
+
+- (void) jumpToMarkWithIdentifier:(NSString *) identifier {
+        _jumpingToMark = YES;
+        NSEnumerator *e = [_marks objectEnumerator];
+        NSValue *obj;
+        BOOL foundMark = NO;
+        while( obj = [e nextObject] ) {
+                struct _mark mark;
+                [obj getValue:&mark];
+                if( [mark.identifier isEqualToString:identifier] ) {
+                        _currentMark = mark.location;
+                        foundMark = YES;
+                        break;
+                }
+        }
+        if( foundMark ) {
+                float scale = NSHeight( [self rectForPart:NSScrollerKnobSlot] ) / ( NSHeight( [self frame] ) / [self knobProportion] );
+                float shift = ( ( NSHeight( [self rectForPart:NSScrollerKnobSlot] ) * [self knobProportion] ) / 2. ) / scale;
+                [[(NSScrollView *)[self superview] documentView] scrollPoint:NSMakePoint( 0., _currentMark - shift )];          
+        }
+        _jumpingToMark = NO;
-}
-
@@ -209 +259 @@
-        BOOL negative = ( displacement >= 0 ? NO : YES );
-        NSMutableSet *shiftedMarks = [NSMutableSet set];
-Number
+Value
-
-        if( ! ( negative && _nearestPreviousMark < ABS( displacement ) ) ) _nearestPreviousMark += displacement;
@@ -222 +272 @@
-        NSEnumerator *enumerator = [_marks objectEnumerator];
-        while( ( location = [enumerator nextObject] ) ) {
-
-
-
+
+
+
+
+
+
-        }
-
@@ -256 +309 @@
-
-- (void) addMarkAt:(unsigned long long) location {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}
-
-- (void) removeMarkAt:(unsigned long long) location {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-- (void) removeMarksGreaterThan:(unsigned long long) location {
-        NSEnumerator *enumerator = [[[_marks copy] autorelease] objectEnumerator];
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
@@ -278 +376 @@
-- (void) removeMarksLessThan:(unsigned long long) location {
-        NSEnumerator *enumerator = [[[_marks copy] autorelease] objectEnumerator];
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
@@ -289 +390 @@
-- (void) removeMarksInRange:(NSRange) range {
-        NSEnumerator *enumerator = [[[_marks copy] autorelease] objectEnumerator];
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
@@ -306 +410 @@
-
-- (void) setMarks:(NSSet *) marks {
-
-
+
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-}

trunk/JVStyleView.h

@@ -59 +59 @@
-
-- (JVMarkedScroller *) verticalMarkedScroller;
+- (IBAction) jumpToMark:(id) sender;
-- (IBAction) jumpToPreviousHighlight:(id) sender;
-- (IBAction) jumpToNextHighlight:(id) sender;

trunk/JVStyleView.m

@@ -261 +261 @@
-- (void) mark {
-        if( _webViewReady ) {
+                int location;
-#ifdef WebKitVersion146
-                if( _newWebKit ) {
@@ -270 +271 @@
-                        [[[doc getElementsByTagName:@"body"] item:0] appendChild:elt];
-                        [self scrollToBottom];
+                        location = [[elt valueForKey:@"offsetTop"] intValue];
-                } else {
-#endif
-[self stringByEvaluatingJavaScriptFromString:@"mark();"
+location = [[self stringByEvaluatingJavaScriptFromString:@"mark();"] intValue
-#ifdef WebKitVersion146
-                }
+                [[self verticalMarkedScroller] removeMarkWithIdentifier:@"mark"];
+                [[self verticalMarkedScroller] addMarkAt:location
+                                                                  withIdentifier:@"mark"
+                                                                           withColor:[NSColor redColor]];
-#endif
-        } else {
@@ -459 +465 @@
-
-        return scroller;
+}
+
+- (IBAction) jumpToMark:(id) sender {
+        [[self verticalMarkedScroller] jumpToMarkWithIdentifier:@"mark"];
-}
-

trunk/Languages/Dutch.lproj/Colloquy.nib/classes.nib

@@ -13 +13 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToMark = id; 
-                jumpToNextHighlight = id; 
-                jumpToPreviousHighlight = id; 

trunk/Languages/English.lproj/Colloquy.nib/classes.nib

@@ -13 +13 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToMark = id; 
-                jumpToNextHighlight = id; 
-                jumpToPreviousHighlight = id; 

trunk/Languages/German.lproj/Colloquy.nib/classes.nib

@@ -13 +13 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToMark = id; 
-                jumpToNextHighlight = id; 
-                jumpToPreviousHighlight = id;