Changeset 3238

Timestamp:

05/31/06 02:34:22 (2 years ago)

Author:

timothy

Message:

Landed the patch for #644. This allows pressing TAB without starting a word to complete the nickname of the last user to send a message to the room with a highlight word, or the last completed nick. This only works if you are at the beginning of the line.

Files:

• trunk/Panels/JVChatRoomPanel.m (modified) (1 diff)
• trunk/Views/MVTextView.m (modified) (12 diffs)

trunk/Panels/JVChatRoomPanel.m

@@ -602 +602 @@
-        NSMutableArray *possibleNicks = [NSMutableArray array];
-        NSString *name = nil;
+
+        if( [prefix isEqualToString:@""] ) {
+                if( [_preferredTabCompleteNicknames count] )
+                        [possibleNicks addObject:[_preferredTabCompleteNicknames objectAtIndex:0]];
+                return possibleNicks;
+        }
-
-        enumerator = [_preferredTabCompleteNicknames objectEnumerator];

trunk/Views/MVTextView.m

@@ -12 +12 @@
-- (id)initWithFrame:(NSRect)frameRect textContainer:(NSTextContainer *)aTextContainer {
-        if( (self = [super initWithFrame:frameRect textContainer:aTextContainer] ) )
-
+WithZone:nil
-        return self;
-}
@@ -32 +32 @@
-
-- (void) interpretKeyEvents:(NSArray *) eventArray {
-NSMutableArray array
+[NSMutableArray allocWithZone:nil] init
-        NSEnumerator *e = [eventArray objectEnumerator];
-        NSEvent *anEvent = nil;
@@ -56 +56 @@
-        if( [newArray count] > 0 )
-                [super interpretKeyEvents:newArray];
+
+        [newArray release];
-}
-
@@ -124 +126 @@
-        if( ! font ) {
-                font = [NSFont userFontOfSize:0.];
-
-dictionaryWithObject: font forKey: NSFontAttributeName] retain
+WithZone:nil
+allocWithZone:nil] initWithObjectsAndKeys:font, NSFontAttributeName, nil
-        [self setTypingAttributes:defaultTypingAttributes];
-        [self setFont:font];
@@ -160 +162 @@
-        unsigned int count = 0, i = 0;
-        NSRectArray rects = NULL;
-
+WithZone:nil
-
-        [super resetCursorRects];
@@ -207 +209 @@
-                }
-        } else {
-NSMutableDictionary dictionaryWithDictionary:[self typingAttributes]
+[self typingAttributes] mutableCopyWithZone:nil
-                NSFont *font = [attributes objectForKey:NSFontAttributeName];
-                if( ! font ) font = [NSFont userFontOfSize:0.];
@@ -215 +217 @@
-                [attributes setObject:font forKey:NSFontAttributeName];
-                [self setTypingAttributes:attributes];
+                [attributes release];
-        }
-}
@@ -239 +242 @@
-                }
-        } else {
-NSMutableDictionary dictionaryWithDictionary:[self typingAttributes]
+[self typingAttributes] mutableCopyWithZone:nil
-                NSFont *font = [attributes objectForKey:NSFontAttributeName];
-                if( ! font ) font = [NSFont userFontOfSize:0.];
@@ -247 +250 @@
-                [attributes setObject:font forKey:NSFontAttributeName];
-                [self setTypingAttributes:attributes];
+                [attributes release];
-        }
-}
@@ -258 +262 @@
-        if( [color alphaComponent] == 0. ) color = nil;
-        if( ! range.length ) {
-NSMutableDictionary dictionaryWithDictionary:[self typingAttributes]
+[self typingAttributes] mutableCopyWithZone:nil
-                [attributes setObject:color forKey:NSBackgroundColorAttributeName];
-                [self setTypingAttributes:attributes];
+                [attributes release];
-        } else [[self textStorage] addAttribute:NSBackgroundColorAttributeName value:color range:range];
-}
@@ -296 +301 @@
-                return YES;
-        }
+        
+        [_lastCompletionMatch release];
+        _lastCompletionMatch = nil;
+
+        [_lastCompletionPrefix release];
+        _lastCompletionPrefix = nil;
-
-        NSMutableCharacterSet *allowedCharacters = (NSMutableCharacterSet *)[NSMutableCharacterSet alphanumericCharacterSet];
@@ -313 +324 @@
-        partialCompletion = [[self string] substringWithRange:theRange];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        name = [possibleNicks objectAtIndex:0];
-                        NSRange replacementRange = NSMakeRange( curPos.location - [partialCompletion length], [partialCompletion length] );
-
-                        _ignoreSelectionChanges = YES;
-                        [self replaceCharactersInRange:replacementRange withString:name];
-
-                        if( suffix && replacementRange.location == 0 ) [self insertText:@": "];
-                        else if( suffix ) [self insertText:@" "];
-                        _tabCompletting = NO;
-                        _ignoreSelectionChanges = NO;
-
-                        if( [[self delegate] respondsToSelector:@selector( textView:selectedCompletion:fromPrefix: )] )
-                                [[self delegate] textView:self selectedCompletion:name fromPrefix:partialCompletion];
-                } else if( [possibleNicks count] > 1 ) {
-                        // since several are available, we highlight the modified text
-                        NSRange wordRange;
-                        BOOL full = YES;
-
-                        [_lastCompletionPrefix release];
-                        _lastCompletionPrefix = [partialCompletion retain];
-
-                        if( curPos.location == [[self string] length] || [illegalCharacters characterIsMember:[[self string] characterAtIndex:curPos.location]] ) {
-                                wordRange = NSMakeRange( curPos.location - [partialCompletion length], [partialCompletion length] );
-                                name = [possibleNicks objectAtIndex:0];
-                        } else {
-                                wordRange = [[self string] rangeOfCharacterFromSet:illegalCharacters options:0 range:NSMakeRange( curPos.location, [[self string] length] - curPos.location )];
-                                if( wordRange.location == NSNotFound )
-                                        wordRange = NSMakeRange( NSMaxRange( wordStart ), [[self string] length] - NSMaxRange( wordStart )) ;
-                                else wordRange = NSMakeRange( NSMaxRange( wordStart ), wordRange.location - NSMaxRange( wordStart ));
-
-                                NSString *tempWord = [[self string] substringWithRange:wordRange];
-                                BOOL keepSearching = YES;
-                                int count = 0;
-
-                                do {
-                                        keepSearching = ! [[possibleNicks objectAtIndex:count] isEqualToString:tempWord];
-                                } while ( ++count < [possibleNicks count] && keepSearching );
-
-                                if( count == [possibleNicks count] ) count = 0;
-
-                                name = [possibleNicks objectAtIndex:count];
-                                full = NO;
-                        }
-
-                        [_lastCompletionMatch release];
-                        _lastCompletionMatch = [name retain];
-
-                        if( suffix && wordRange.location == 0 ) name = [name stringByAppendingString:@": "];
-                        else if( suffix ) name = [name stringByAppendingString:@" "];
-
-                        _ignoreSelectionChanges = YES;
-                        [self replaceCharactersInRange:wordRange withString:( full ? name : _lastCompletionMatch )];
-                        [self setSelectedRange:NSMakeRange( curPos.location, [name length] - [partialCompletion length] )];
-                        _ignoreSelectionChanges = NO;
-                } else {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
-
-
-
+
+
-        }
-