From 6a737cada6541971437d0f86c8fd6184dac5fc5b Mon Sep 17 00:00:00 2001 From: Julian Eberius Date: Fri, 12 Feb 2010 23:26:40 +0100 Subject: [PATCH] more drawing in the background, better alignment of minimap and scroller --- MinimapView.h | 11 +- MinimapView.m | 243 +++--- NSView+Minimap.h | 9 +- NSView+Minimap.m | 76 +- NSWindow+Minimap.m | 3 +- NSWindowController+Minimap.h | 1 + NSWindowController+Minimap.m | 36 +- TextMateMinimap.h | 8 +- TextMateMinimap.m | 31 +- Textmate-Minimap.xcodeproj/ebi.mode1v3 | 118 +-- Textmate-Minimap.xcodeproj/ebi.pbxuser | 876 ++++++++++++++++----- Textmate-Minimap.xcodeproj/project.pbxproj | 7 +- 12 files changed, 990 insertions(+), 429 deletions(-) diff --git a/MinimapView.h b/MinimapView.h index 276c764..3f5607c 100644 --- a/MinimapView.h +++ b/MinimapView.h @@ -9,9 +9,8 @@ #import @interface MinimapView : NSView { - + NSLock* theLock; NSView* _textView; - int _numLines; NSRange _viewableRange; NSImage* _nextImage; @@ -23,18 +22,16 @@ Boolean _refreshViewableRange; float _pixelPerLine; - Boolean _needsNewImage; } #pragma mark public-properties @property(retain) NSWindowController* windowController; +@property(retain, readonly) NSLock* theLock; #pragma mark public-api - (id)initWithTextView:(NSView*) textView; -- (BOOL)needsNewImage; -- (void)setNeedsNewImage:(BOOL)flag; -- (void)setMinimapImage:(NSImage *)image; - +- (NSRange)viewableRange; - (void)refreshDisplay; - (void)refreshViewableRange; +- (NSView*)textView; @end diff --git a/MinimapView.m b/MinimapView.m index 6e13c6f..b8c5cfa 100644 --- a/MinimapView.m +++ b/MinimapView.m @@ -13,56 +13,86 @@ #import "TextmateMinimap.h" @interface MinimapView (Private_TextHelp) -- (NSImage*)doDrawRect:(NSRect)rect withImage:(NSImage*)image; -- (int)getGutterSize:(NSImage *)screenshot; -- (void) updateViewableRange; +- (void)updateViewableRange; - (int)getNumberOfLines; - (void)drawFinished:(NSImage*) bitmap; +- (void)setPixelPerLine:(int)ppl; @end @interface DrawOperation : NSOperation { - MinimapView *minimapView; - NSImage* image; - NSRect rect; + MinimapView* minimapView; } -- (id)initWithMinimapView:(MinimapView*)mv andRect:(NSRect) rect andImage:(NSImage*)image; +- (id)initWithMinimapView:(MinimapView*)mv; @end @implementation DrawOperation -- (id)initWithMinimapView:(MinimapView*)mv andRect:(NSRect)r andImage:(NSImage*)img +- (id)initWithMinimapView:(MinimapView*)mv { if (![super init]) return nil; minimapView = [mv retain]; - rect = r; - image = [img retain]; return self; } - (void)dealloc { [minimapView release], minimapView = nil; - [image release], image = nil; [super dealloc]; } +- (NSBitmapImageRep*)cropImageRep:(NSBitmapImageRep*)rep ToRect:(NSRect)rect { + CGImageRef cgImg = CGImageCreateWithImageInRect([rep CGImage], NSRectToCGRect(rect)); NSBitmapImageRep *result = [[NSBitmapImageRep alloc] initWithCGImage:cgImg]; + + CGImageRelease(cgImg); + return [result autorelease]; +} + - (void)main { - if (![self isCancelled]) - { - NSImage* bitmap; - bitmap = [minimapView doDrawRect:rect withImage:image]; - if (![self isCancelled] && bitmap != nil) - { - [minimapView performSelectorOnMainThread:@selector(drawFinished:) withObject:bitmap waitUntilDone:FALSE]; - } - else { - //NSLog(@"got cancelled 1"); - } - } else { - //NSLog(@"got cancelled 2"); + if ([self isCancelled]) + return; + + NSRect bounds = [minimapView bounds]; + NSView* textView = [minimapView textView]; + NSBitmapImageRep* screenshot = [textView screenshot]; + + NSColor* refColor = [[screenshot colorAtX:0 y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + int i = 1; + NSColor* color = [[screenshot colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + while ([color isEqual:refColor]) { + i++; + color = [[screenshot colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; } + + if ([self isCancelled]) + return; + + NSBitmapImageRep* croppedScreenshot = [self cropImageRep:screenshot ToRect:NSMakeRect(i+1, 0, [screenshot size].width-(i+1), [screenshot size].height)]; + + if ([self isCancelled]) + return; + + NSImage* image = [[[NSImage alloc] initWithSize:bounds.size] autorelease]; + [image setFlipped:YES]; + + [image lockFocus]; + NSRect rectToDrawTo = bounds; + float numLines = [minimapView getNumberOfLines]; + + int _pixelPerLine = bounds.size.height / numLines; + if (_pixelPerLine > 6) { + float newHeight = 6*numLines; + rectToDrawTo.size.height = newHeight; + rectToDrawTo.origin.y = bounds.size.height-newHeight; + } + [croppedScreenshot drawInRect:rectToDrawTo]; + [image unlockFocus]; + + if ([self isCancelled] || image == nil) + return; + + [minimapView performSelectorOnMainThread:@selector(drawFinished:) withObject:image waitUntilDone:FALSE]; } @end @@ -77,7 +107,7 @@ - (unsigned int)lineHeight; @implementation MinimapView -@synthesize windowController; +@synthesize windowController, theLock; - (id)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; @@ -86,14 +116,13 @@ - (id)initWithFrame:(NSRect)frame { [_queue setMaxConcurrentOperationCount:1]; _refreshViewableRange = FALSE; _refreshAll = TRUE; - _needsNewImage = FALSE; + theLock = [[NSLock alloc] init]; } return self; } - (void) viewDidEndLiveResize { - _pixelPerLine = [self bounds].size.height / [self getNumberOfLines]; [self refreshDisplay]; } @@ -112,6 +141,10 @@ - (void)dealloc [_queue release]; _queue = nil; [_textView release]; + if (theLock) + { + [theLock release];theLock = nil; + } } #pragma mark drawing routines @@ -126,47 +159,33 @@ - (BOOL)isOpaque return YES; } -- (BOOL)needsNewImage -{ - return _needsNewImage; -} - - (void)drawRect:(NSRect)rect { - NSLog(@"drawing..."); if (![self inLiveResize] && _refreshAll) { - _needsNewImage = YES; - [_textView setNeedsDisplay:YES]; - } - NSRect rectToDrawTo = [self bounds]; - BOOL fillWithBlack = NO; - _pixelPerLine = [self bounds].size.height / [self getNumberOfLines]; - if (_pixelPerLine > 6) { - float newHeight = 6*[self getNumberOfLines]; - rectToDrawTo.size.height = newHeight; - fillWithBlack = YES; - _pixelPerLine = 6; + [_queue cancelAllOperations]; + DrawOperation* op = [[DrawOperation alloc] initWithMinimapView:self]; + [_queue addOperation:op]; + [op release]; + // for snow leopard + //[self gcdDraw]; + _refreshAll = FALSE; } - [self updateViewableRange]; - - [_nextImage drawInRect:rectToDrawTo fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0]; - if (fillWithBlack) - NSRectFill(NSMakeRect(rectToDrawTo.origin.x, - rectToDrawTo.origin.y+rectToDrawTo.size.height, - rectToDrawTo.size.width, [self bounds].size.height-rectToDrawTo.size.height)); + [_nextImage drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0]; - + // drawing the vis rect + [self updateViewableRange]; NSRect visibleHighlightRect = NSMakeRect(0, _viewableRange.location*_pixelPerLine, rect.size.width-1, _viewableRange.length*_pixelPerLine); + [NSGraphicsContext saveGraphicsState]; [[NSColor colorWithCalibratedRed:0.549 green:0.756 blue:1 alpha:0.7] set]; [NSBezierPath setDefaultLineWidth:1]; [NSBezierPath strokeRect:visibleHighlightRect]; [NSGraphicsContext restoreGraphicsState]; - _refreshAll = FALSE; + _refreshViewableRange = FALSE; } @@ -202,58 +221,11 @@ - (void) drawFinished: (NSImage*) bitmap _nextImage = [bitmap retain]; _pixelPerLine = [self bounds].size.height / [self getNumberOfLines]; - + if (_pixelPerLine > 6) + _pixelPerLine = 6; [self setNeedsDisplay:YES]; } -- (void)setMinimapImage:(NSImage *)image -{ - _needsNewImage = NO; - DrawOperation* op = [[DrawOperation alloc] initWithMinimapView:self andRect:[self bounds] andImage:image]; - [_queue cancelAllOperations]; - [_queue addOperation:op]; - [op release]; - [image release]; -} - -- (NSImage*)doDrawRect:(NSRect) rect withImage:(NSImage*) screenshot -{ - NSImage* bitmap = [[NSImage alloc] initWithSize: rect.size]; - - [bitmap lockFocus]; - - [screenshot drawInRect:rect - fromRect:NSMakeRect([self getGutterSize:screenshot], 0, [screenshot size].width, [screenshot size].height) - operation:NSCompositeCopy - fraction:1.0]; - [bitmap unlockFocus]; - [bitmap autorelease]; - return bitmap; -} - -- (int)getGutterSize:(NSImage*)screenshot -{ - int w = [screenshot size].width; - NSImage* firstLine = [[NSImage alloc] initWithSize: NSMakeSize(w, 1)]; - [firstLine lockFocus]; - [screenshot drawInRect:NSMakeRect(0, 0, w, 1) - fromRect:NSMakeRect(0, 0, w, 1) - operation:NSCompositeCopy fraction:1.0]; - [firstLine unlockFocus]; - - NSBitmapImageRep* raw_img = [NSBitmapImageRep imageRepWithData:[firstLine TIFFRepresentation]]; - [firstLine release]; - NSColor* refColor = [[raw_img colorAtX:0 y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; - - int i = 1; - NSColor* color = [[raw_img colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; - while ([color isEqual:refColor]) { - i++; - color = [[raw_img colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; - } - return i+1; -} - - (void)mouseDown:(NSEvent *)theEvent { BOOL keepOn = YES; @@ -296,9 +268,17 @@ - (void)refreshViewableRange{ [self setNeedsDisplayInRect:[self visibleRect]]; } -- (void)setNeedsNewImage:(BOOL)flag +- (NSRange)viewableRange +{ + return _viewableRange; +} +- (NSView*)textView +{ + return _textView; +} +- (void)setPixelPerLine:(int)ppl { - _needsNewImage = flag; + _pixelPerLine = ppl; } - (int) getNumberOfLines @@ -310,4 +290,59 @@ - (int) getNumberOfLines return totalLines; } + + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +//FOR SNOW LEOPARD +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/* +- (NSBitmapImageRep*)cropImageRep:(NSBitmapImageRep*)rep ToRect:(NSRect)rect { + CGImageRef cgImg = CGImageCreateWithImageInRect([rep CGImage], NSRectToCGRect(rect)); NSBitmapImageRep *result = [[NSBitmapImageRep alloc] initWithCGImage:cgImg]; + + CGImageRelease(cgImg); + return [result autorelease]; +} + +- (void)gcdDraw { + dispatch_async(dispatch_get_global_queue(0, 0), ^{ + + NSRect bounds = [self bounds]; + NSBitmapImageRep* screenshot = [_textView screenshot]; + + NSColor* refColor = [[screenshot colorAtX:0 y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + int i = 1; + NSColor* color = [[screenshot colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + while ([color isEqual:refColor]) { + i++; + color = [[screenshot colorAtX:i y:0] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + } + + NSBitmapImageRep* croppedScreenshot = [self cropImageRep:screenshot ToRect:NSMakeRect(i+1, 0, [screenshot size].width-(i+1), [screenshot size].height)]; + + NSImage* image = [[[NSImage alloc] initWithSize:bounds.size] autorelease]; + [image setFlipped:YES]; + [image lockFocus]; + NSRect rectToDrawTo = bounds; + float numLines = [self getNumberOfLines]; + + _pixelPerLine = bounds.size.height / numLines; + if (_pixelPerLine > 6) { + float newHeight = 6*numLines; + rectToDrawTo.size.height = newHeight; + rectToDrawTo.origin.y = bounds.size.height-newHeight; + } + [croppedScreenshot drawInRect:rectToDrawTo]; + + [image unlockFocus]; + + dispatch_async(dispatch_get_main_queue(), ^{ + [self drawFinished:image]; + }); + }); + +} + +*/ + + @end diff --git a/NSView+Minimap.h b/NSView+Minimap.h index cf6996a..f76565b 100644 --- a/NSView+Minimap.h +++ b/NSView+Minimap.h @@ -11,14 +11,17 @@ @interface NSView (MM_NSView) -- (NSImage *) allocScreenshotByDrawing; -- (void)MM_drawRect:(NSRect)rect; +- (NSBitmapImageRep *) screenshot; +- (NSBitmapImageRep *) screenshotInRect:(NSRect)rect; + +- (NSImage *)allocScreenshotByDrawing; - (void)MM_selectTab:(id)sender; - (void)MM_keyUp:(NSEvent *)theEvent; -- (void)MM_mouseDragged:(NSEvent *)theEvent; - (void)MM_mouseUp:(NSEvent *)theEvent; - (void)MM_undo:(id)sender; - (void)MM_redo:(id)sender; +- (void)MM_toggleSoftWrap:(id)sender; + @end diff --git a/NSView+Minimap.m b/NSView+Minimap.m index b151454..a66e303 100644 --- a/NSView+Minimap.m +++ b/NSView+Minimap.m @@ -14,8 +14,6 @@ @interface NSView (MM_NSView_Private) - (void)refreshMinimap; -- (BOOL)minimapNeedsNewImage; -- (void)setMinimapImage:(NSImage*)image; - (MinimapView*)getMinimap; - (void)scheduleRefresh; @@ -24,26 +22,35 @@ - (void)scheduleRefresh; @implementation NSView (MM_NSView) -#pragma mark drawing -- (NSImage *)allocScreenshotByDrawing { - NSImage *screenshot = [[NSImage alloc] initWithSize: - [self bounds].size]; +#pragma mark drawing + +- (NSBitmapImageRep *)screenshot +{ + [[[self getMinimap] theLock] lock]; + NSBitmapImageRep *imageRep = [self bitmapImageRepForCachingDisplayInRect:[self bounds]]; + [self cacheDisplayInRect:[self bounds] toBitmapImageRep:imageRep]; + [[[self getMinimap] theLock] unlock]; + return imageRep; +} + +- (NSImage *)allocScreenshotByDrawing +{ + + NSImage *screenshot = [[NSImage alloc] initWithSize: + [self bounds].size]; [screenshot lockFocus]; - [self MM_drawRect: [self frame]]; + [self drawRect: [self frame]]; [screenshot unlockFocus]; return screenshot; } -- (void)MM_drawRect:(NSRect)rect +- (NSBitmapImageRep *) screenshotInRect:(NSRect)rect { - [self MM_drawRect:rect]; - - if ([self minimapNeedsNewImage]) - { - NSLog(@"there is need"); - NSImage* image = [self allocScreenshotByDrawing]; - [self setMinimapImage:image]; - } + [[[self getMinimap] theLock] lock]; + NSBitmapImageRep *imageRep = [self bitmapImageRepForCachingDisplayInRect:rect]; + [self cacheDisplayInRect:rect toBitmapImageRep:imageRep]; + [[[self getMinimap] theLock] unlock]; + return imageRep; } #pragma mark minimap @@ -76,26 +83,14 @@ - (void)refreshMinimap [[self getMinimap] refreshDisplay]; } -- (void)setMinimapNeedsNoImage -{ - [[self getMinimap] setNeedsNewImage:NO]; -} - -- (BOOL)minimapNeedsNewImage -{ - return [[self getMinimap] needsNewImage]; -} - -- (void)setMinimapImage:(NSImage*)image -{ - [[self getMinimap] setMinimapImage:image]; -} - #pragma mark other_swizzled_events - (void)MM_selectTab:(id)sender { + [[[self getMinimap] theLock] lock]; [self MM_selectTab:sender]; + [[[self getMinimap] theLock] unlock]; + [self refreshMinimap]; } - (void)MM_mouseUp:(NSEvent *)theEvent @@ -104,15 +99,21 @@ - (void)MM_mouseUp:(NSEvent *)theEvent [self scheduleRefresh]; } -- (void)MM_mouseDragged:(NSEvent *)theEvent +- (void)MM_keyUp:(NSEvent *)theEvent { - [self MM_mouseDragged:theEvent]; - //[self refreshMinimap]; + [self scheduleRefresh]; } -- (void)MM_keyUp:(NSEvent *)theEvent +- (void)MM_toggleSoftWrap:(id)sender { - [self scheduleRefresh]; + [self MM_toggleSoftWrap:sender]; + NSWindowController* wc = [[self window] windowController]; + if ([wc isKindOfClass:OakProjectController] || [wc isKindOfClass:OakDocumentController]) + for (NSDrawer *drawer in [[wc window] drawers]) + if ([[drawer contentView] isKindOfClass:[MinimapView class]] ) { + [drawer setTrailingOffset:([sender state])?56:40]; + [(MinimapView*)[drawer contentView] refreshDisplay]; + } } - (void)MM_undo:(id)sender @@ -123,7 +124,8 @@ - (void)MM_undo:(id)sender - (void)MM_redo:(id)sender { [self MM_redo:sender]; - [self scheduleRefresh];} + [self scheduleRefresh]; +} @end diff --git a/NSWindow+Minimap.m b/NSWindow+Minimap.m index f61d115..7270cc1 100644 --- a/NSWindow+Minimap.m +++ b/NSWindow+Minimap.m @@ -16,7 +16,7 @@ @implementation NSWindow (MM_NSWindow) // called when the user switches tabs (or load files) - (void)MM_setRepresentedFilename:(NSString*)aPath { - [[self windowController] refreshMinimap]; + //[[self windowController] refreshMinimap]; [self MM_setRepresentedFilename:aPath]; } @@ -24,6 +24,7 @@ - (void)MM_setRepresentedFilename:(NSString*)aPath - (void)MM_setDocumentEdited:(BOOL)flag { [self MM_setDocumentEdited:flag]; + [[self windowController] refreshMinimap]; } - (void)MM_becomeMainWindow diff --git a/NSWindowController+Minimap.h b/NSWindowController+Minimap.h index f1d4ff7..4349e63 100644 --- a/NSWindowController+Minimap.h +++ b/NSWindowController+Minimap.h @@ -16,6 +16,7 @@ - (void)scrollToLine:(unsigned int)newLine; - (void)refreshMinimap; - (void)toggleMinimap; +- (BOOL)isSoftWrapEnabled; #pragma mark swizzled-methods - (void)MM_windowWillClose:(id)aNotification; diff --git a/NSWindowController+Minimap.m b/NSWindowController+Minimap.m index 37b5714..223243f 100644 --- a/NSWindowController+Minimap.m +++ b/NSWindowController+Minimap.m @@ -9,6 +9,8 @@ #import "NSWindowController+Minimap.h" #import "MinimapView.h" #import "TextMate.h" +#import "TextMateMinimap.h" +#import "objc/runtime.h" // stuff that the textmate-windowcontrollers (OakProjectController, OakDocumentControler) implement @interface NSWindowController (Textmate_Additions) @@ -70,6 +72,19 @@ - (void)scrollToLine:(unsigned int)newLine } } +- (BOOL) isSoftWrapEnabled +{ + NSMenu* viewMenu = [[[NSApp mainMenu] itemWithTitle:@"View"] submenu]; + for (NSMenuItem* item in [viewMenu itemArray]) + { + if ([[item title] isEqualToString:@"Soft Wrap"]) + { + return [item state]; + } + } + return NO; +} + #pragma mark swizzled_methods - (void)MM_windowWillClose:(id)aNotification @@ -97,10 +112,18 @@ - (void)MM_windowDidLoad [minimapDrawer setLeadingOffset:24]; } else if ([[self className] isEqualToString:@"OakDocumentController"]) { - [minimapDrawer setTrailingOffset:40]; + [minimapDrawer setTrailingOffset:56]; [minimapDrawer setLeadingOffset:0]; } + //Really hacky solution, but I don't see a way to find out whether softwrap is enabled except the main menu... which is not initialized at this point! + NSTimer* old_timer = [[TextmateMinimap instance] timer]; + if (old_timer != nil && [old_timer isValid]) { + [old_timer invalidate]; + } + NSTimer* timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(setTrailingOffset) userInfo:nil repeats:NO]; + [[TextmateMinimap instance ] setTimer:timer]; + [minimapDrawer setContentView:textshapeView]; [minimapDrawer openOnEdge:NSMaxXEdge]; @@ -108,4 +131,15 @@ - (void)MM_windowDidLoad [textshapeView release]; } +- (void)setTrailingOffset +{ + NSWindow* window = [self window]; + for (NSDrawer *drawer in [window drawers]) + if ([[drawer contentView] isKindOfClass:[MinimapView class]] ) { + int trailingSpace = ([self isSoftWrapEnabled]) ? 56 : 40; + [drawer setTrailingOffset:trailingSpace]; + [(MinimapView*)[drawer contentView] refreshDisplay]; + } +} + @end diff --git a/TextMateMinimap.h b/TextMateMinimap.h index 55a8e6e..c7cc39b 100644 --- a/TextMateMinimap.h +++ b/TextMateMinimap.h @@ -13,14 +13,16 @@ @end @interface TextmateMinimap : NSObject { - NSLock* theLock; + NSTimer* timer; NSMenu* windowMenu; NSMenuItem* showMinimapMenuItem; + + SEL _originalSoftWrapAction; + id _originalSoftWrapTarget; } - @property(retain) NSTimer* timer; -@property(retain, readonly) NSLock* theLock; + + (TextmateMinimap*)instance; - (id)initWithPlugInController:(id )aController; diff --git a/TextMateMinimap.m b/TextMateMinimap.m index 0a29c19..8c9cc98 100644 --- a/TextMateMinimap.m +++ b/TextMateMinimap.m @@ -11,6 +11,9 @@ #import "TextMate.h" #import "JRSwizzle.h" #import "NSWindowController+Minimap.h" +#import "MinimapView.h" +#import "objc/runtime.h" + //TODO: improve performance for longer documents //TODO: (maybe) support for 10.4 @@ -24,7 +27,7 @@ @implementation TextmateMinimap static TextmateMinimap *sharedInstance = nil; -@synthesize timer, theLock; +@synthesize timer; #pragma mark public-api @@ -45,8 +48,6 @@ - (id)initWithPlugInController:(id )aController [self installMenuItem]; - theLock = [[NSLock alloc] init]; - [OakProjectController jr_swizzleMethod:@selector(windowDidLoad) withMethod:@selector(MM_windowDidLoad) error:NULL]; [OakProjectController jr_swizzleMethod:@selector(windowWillClose:) withMethod:@selector(MM_windowWillClose:) error:NULL]; [OakDocumentController jr_swizzleMethod:@selector(windowDidLoad) withMethod:@selector(MM_windowDidLoad) error:NULL]; @@ -59,9 +60,7 @@ - (id)initWithPlugInController:(id )aController [OakTextView jr_swizzleMethod:@selector(mouseUp:) withMethod:@selector(MM_mouseUp:) error:NULL]; [OakTextView jr_swizzleMethod:@selector(undo:) withMethod:@selector(MM_undo:) error:NULL]; [OakTextView jr_swizzleMethod:@selector(redo:) withMethod:@selector(MM_redo:) error:NULL]; - - - [OakTextView jr_swizzleMethod:@selector(drawRect:) withMethod:@selector(MM_drawRect:) error:NULL]; + [OakTextView jr_swizzleMethod:@selector(toggleSoftWrap:) withMethod:@selector(MM_toggleSoftWrap:) error:NULL]; [OakTabBar jr_swizzleMethod:@selector(selectTab:) withMethod:@selector(MM_selectTab:) error:NULL]; } @@ -73,17 +72,21 @@ - (void)installMenuItem { if(windowMenu = [[[[NSApp mainMenu] itemWithTitle:@"View"] submenu] retain]) { - unsigned index = 0; NSArray* items = [windowMenu itemArray]; - int separators ; - for(separators = 0; index != [items count] && separators != 1; index++) - separators += [[items objectAtIndex:index] isSeparatorItem] ? 1 : 0; + int index = 0; + for (NSMenuItem* item in items) + { + if ([[item title] isEqualToString:@"Show/Hide Project Drawer"]) + { + index = [items indexOfObject:item]+1; + } + } showMinimapMenuItem = [[NSMenuItem alloc] initWithTitle:@"Hide Minimap" action:@selector(toggleMinimap:) keyEquivalent:@""]; [showMinimapMenuItem setKeyEquivalent:@"m"]; [showMinimapMenuItem setKeyEquivalentModifierMask:NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask]; [showMinimapMenuItem setTarget:self]; - [windowMenu insertItem:showMinimapMenuItem atIndex:index ? index-1 : 0]; + [windowMenu insertItem:showMinimapMenuItem atIndex:index]; } } @@ -128,12 +131,6 @@ - (void)dealloc [self uninstallMenuItem]; [sharedInstance release]; sharedInstance = nil; - - if ( theLock ) - { - [theLock release]; - theLock = NULL; - } if (timer) { [timer release]; diff --git a/Textmate-Minimap.xcodeproj/ebi.mode1v3 b/Textmate-Minimap.xcodeproj/ebi.mode1v3 index 80975ba..ea01df7 100644 --- a/Textmate-Minimap.xcodeproj/ebi.mode1v3 +++ b/Textmate-Minimap.xcodeproj/ebi.mode1v3 @@ -272,6 +272,7 @@ 089C1671FE841209C02AAC07 19C28FB8FE9D52D311CA2CBB 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 E2644B35053B69B200211256 PBXSmartGroupTreeModuleOutlineStateSelectionKey @@ -318,7 +319,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - NSWindowController+Minimap.m + MinimapView.m PBXSplitModuleInNavigatorKey Split0 @@ -326,11 +327,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - NSWindowController+Minimap.m + MinimapView.m _historyCapacity 0 bookmark - 041FFA291124790500D8C5BD + 04A5B7861126098D0021A25B history 04DB4425110F285900762426 @@ -343,18 +344,22 @@ 0414357411242C7800370416 0458D46311244FFA002550F2 0458D48C1124572C002550F2 - 0458D4F511246AAE002550F2 0458D4F711246AAE002550F2 - 0458D4FA11246AAE002550F2 0458D50F11246B1F002550F2 - 0458D51111246B1F002550F2 - 0458D51D1124736D002550F2 - 0458D51E1124736D002550F2 - 0458D51F1124736D002550F2 - 0458D5201124736D002550F2 - 041FFA12112478EA00D8C5BD - 041FFA13112478EA00D8C5BD - 0458D4FD11246AAE002550F2 + 04B78CEB11258866009189AC + 04B78D4111258C48009189AC + 04B78E2B1125A21B009189AC + 04B78ECE1125AAB5009189AC + 049D7EA61125B4AD0087B7E1 + 04AB5C4D1125DDC5004C4D62 + 04AB5D3B1125EDAA004C4D62 + 04AB5D461125F808004C4D62 + 04A5B6EA1126005B0021A25B + 04A5B71D112602500021A25B + 04A5B763112607AF0021A25B + 04A5B764112607AF0021A25B + 04A5B765112607AF0021A25B + 04A5B766112607AF0021A25B SplitCount @@ -412,9 +417,9 @@ TableOfContents - 041FFA15112478EA00D8C5BD + 04A5B6C01125F82C0021A25B 1CE0B1FE06471DED0097A5F4 - 041FFA16112478EA00D8C5BD + 04A5B6C11125F82C0021A25B 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -552,7 +557,11 @@ 5 WindowOrderList + 04A5B717112602340021A25B + 04A5B719112602340021A25B + 1C78EAAD065D492600B07095 047C7E4B110F278C00CC049E + 1CD10A99069EF8BA00B06720 /Users/ebi/dev/Textmate-Minimap/Textmate-Minimap.xcodeproj WindowString @@ -577,7 +586,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + NSView+Minimap.m StatusBarVisibility @@ -594,6 +603,8 @@ 229pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -633,7 +644,7 @@ TableOfContents 047C7E4B110F278C00CC049E - 041FFA17112478EA00D8C5BD + 04A5B6C21125F82C0021A25B 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -677,8 +688,8 @@ yes sizes - {{0, 0}, {316, 201}} - {{316, 0}, {378, 201}} + {{0, 0}, {316, 203}} + {{316, 0}, {378, 203}} VerticalSplitView @@ -693,8 +704,8 @@ yes sizes - {{0, 0}, {694, 201}} - {{0, 201}, {694, 180}} + {{0, 0}, {694, 203}} + {{0, 203}, {694, 178}} @@ -727,7 +738,7 @@ 148 Frame - {{316, 0}, {378, 201}} + {{316, 0}, {378, 203}} RubberWindowFrame 20 433 694 422 0 0 1440 878 @@ -755,13 +766,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 0414356011242C2400370416 + 04A5B6C31125F82C0021A25B 1C162984064C10D400B95A72 - 0414356111242C2400370416 - 0414356211242C2400370416 - 0414356311242C2400370416 - 0414356411242C2400370416 - 0414356511242C2400370416 + 04A5B6C41125F82C0021A25B + 04A5B6C51125F82C0021A25B + 04A5B6C61125F82C0021A25B + 04A5B6C71125F82C0021A25B + 04A5B6C81125F82C0021A25B ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -770,7 +781,7 @@ WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -851,8 +862,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 0458D45E11244FDD002550F2 - 0458D45F11244FDD002550F2 + 04AB5C9D1125E1C6004C4D62 + 04AB5C9E1125E1C6004C4D62 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -868,8 +879,12 @@ MENUSEPARATOR + FirstTimeWindowDisplayed + Identifier windowTool.debuggerConsole + IsVertical + Layout @@ -877,7 +892,7 @@ BecomeActive - 1 + ContentConfiguration PBXProjectModuleGUID @@ -888,18 +903,18 @@ GeometryConfiguration Frame - {{0, 0}, {650, 250}} + {{0, 0}, {726, 479}} RubberWindowFrame - 516 632 650 250 0 0 1680 1027 + 21 335 726 520 0 0 1440 878 Module PBXDebugCLIModule Proportion - 209pt + 479pt Proportion - 209pt + 479pt Name @@ -909,21 +924,21 @@ PBXDebugCLIModule StatusbarIsVisible - 1 + TableOfContents 1C78EAAD065D492600B07095 - 1C78EAAE065D492600B07095 + 04A5B716112602340021A25B 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 650 41 650 250 0 0 1280 1002 + 21 335 726 520 0 0 1440 878 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - 0 + Identifier @@ -1100,6 +1115,7 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 1C77FABC04509CD000000102 + 1C3E0DCA080725EA00A55177 PBXSmartGroupTreeModuleOutlineStateSelectionKey @@ -1108,7 +1124,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} + {{0, 0}, {168, 362}} PBXTopSmartGroupGIDs @@ -1118,14 +1134,14 @@ GeometryConfiguration Frame - {{0, 0}, {185, 368}} + {{0, 0}, {185, 380}} GroupTreeTableConfiguration MainColumn 168 RubberWindowFrame - 27 439 744 409 0 0 1440 878 + 531 409 886 421 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -1145,18 +1161,18 @@ GeometryConfiguration Frame - {{190, 0}, {554, 368}} + {{190, 0}, {696, 380}} RubberWindowFrame - 27 439 744 409 0 0 1440 878 + 531 409 886 421 0 0 1440 878 Module XCDetailModule Proportion - 554pt + 696pt Proportion - 368pt + 380pt MajorVersion @@ -1174,17 +1190,17 @@ TableOfContents - 041435471123F4B300370416 - 041435481123F4B300370416 + 04AB5CC01125E29A004C4D62 + 04AB5CC11125E29A004C4D62 1CE0B1FE06471DED0097A5F4 1CA1AED706398EBD00589147 ToolbarConfiguration xcode.toolbar.config.breakpointsV3 WindowString - 27 439 744 409 0 0 1440 878 + 531 409 886 421 0 0 1440 878 WindowToolGUID - 041435471123F4B300370416 + 04AB5CC01125E29A004C4D62 WindowToolIsVisible diff --git a/Textmate-Minimap.xcodeproj/ebi.pbxuser b/Textmate-Minimap.xcodeproj/ebi.pbxuser index cd6a055..d69a60f 100644 --- a/Textmate-Minimap.xcodeproj/ebi.pbxuser +++ b/Textmate-Minimap.xcodeproj/ebi.pbxuser @@ -20,46 +20,6 @@ vrLen = 1627; vrLoc = 753; }; - 041FFA12112478EA00D8C5BD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; - name = "TextMateMinimap.m: 36"; - rLen = 0; - rLoc = 834; - rType = 0; - vrLen = 2249; - vrLoc = 372; - }; - 041FFA13112478EA00D8C5BD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; - name = "MinimapView.m: 136"; - rLen = 0; - rLoc = 2483; - rType = 0; - vrLen = 1354; - vrLoc = 4417; - }; - 041FFA14112478EA00D8C5BD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A2112171BE009F7865 /* NSWindowController+Minimap.m */; - name = "NSWindowController+Minimap.m: 54"; - rLen = 0; - rLoc = 1454; - rType = 0; - vrLen = 1360; - vrLoc = 1592; - }; - 041FFA291124790500D8C5BD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A2112171BE009F7865 /* NSWindowController+Minimap.m */; - name = "NSWindowController+Minimap.m: 100"; - rLen = 0; - rLoc = 2758; - rType = 0; - vrLen = 1360; - vrLoc = 1592; - }; 0429C0FC111EFFDA0062C5AE /* JRSwizzle.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {965, 646}}"; @@ -113,9 +73,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 125; - modificationTime = 287361325.7028111; - originalNumberOfMultipleMatches = 0; - state = 1; + modificationTime = 287703777.78389; + originalNumberOfMultipleMatches = 1; + state = 2; }; 0451552D11244E160097261D /* TextMateMinimap_Prefix.pch */ = { uiCtxt = { @@ -145,16 +105,6 @@ vrLen = 504; vrLoc = 0; }; - 0458D4F511246AAE002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D065C11216C0F009F7865 /* MinimapView.h */; - name = "MinimapView.h: 9"; - rLen = 0; - rLoc = 165; - rType = 0; - vrLen = 786; - vrLoc = 0; - }; 0458D4F711246AAE002550F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 048D06A7112171DE009F7865 /* NSScrollView+Minimap.h */; @@ -165,36 +115,6 @@ vrLen = 290; vrLoc = 0; }; - 0458D4FA11246AAE002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A1112171BE009F7865 /* NSWindowController+Minimap.h */; - name = "NSWindowController+Minimap.h: 18"; - rLen = 22; - rLoc = 370; - rType = 0; - vrLen = 502; - vrLoc = 0; - }; - 0458D4FD11246AAE002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A2112171BE009F7865 /* NSWindowController+Minimap.m */; - name = "NSWindowController+Minimap.m: 54"; - rLen = 0; - rLoc = 1454; - rType = 0; - vrLen = 1296; - vrLoc = 656; - }; - 0458D50D11246B1F002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; - name = "TextMateMinimap.m: 83"; - rLen = 0; - rLoc = 3030; - rType = 0; - vrLen = 1125; - vrLoc = 3164; - }; 0458D50F11246B1F002550F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 048D06A4112171D3009F7865 /* NSWindow+Minimap.h */; @@ -205,76 +125,6 @@ vrLen = 459; vrLoc = 0; }; - 0458D51011246B1F002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; - name = "MinimapView.m: 136"; - rLen = 0; - rLoc = 2483; - rType = 0; - vrLen = 1212; - vrLoc = 4487; - }; - 0458D51111246B1F002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A8112171DE009F7865 /* NSScrollView+Minimap.m */; - name = "NSScrollView+Minimap.m: 21"; - rLen = 104; - rLoc = 482; - rType = 0; - vrLen = 947; - vrLoc = 0; - }; - 0458D51D1124736D002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D06A5112171D3009F7865 /* NSWindow+Minimap.m */; - name = "NSWindow+Minimap.m: 40"; - rLen = 0; - rLoc = 1233; - rType = 0; - vrLen = 1249; - vrLoc = 0; - }; - 0458D51E1124736D002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D067B11216DDE009F7865 /* NSView+Minimap.h */; - name = "NSView+Minimap.h: 22"; - rLen = 0; - rLoc = 491; - rType = 0; - vrLen = 503; - vrLoc = 0; - }; - 0458D51F1124736D002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; - name = "NSView+Minimap.m: 43"; - rLen = 0; - rLoc = 867; - rType = 0; - vrLen = 1228; - vrLoc = 739; - }; - 0458D5201124736D002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D064411216B1C009F7865 /* TextMateMinimap.h */; - name = "TextMateMinimap.h: 28"; - rLen = 38; - rLoc = 575; - rType = 0; - vrLen = 689; - vrLoc = 0; - }; - 0458D5251124768D002550F2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; - name = "TextMateMinimap.m: 36"; - rLen = 0; - rLoc = 834; - rType = 0; - vrLen = 2088; - vrLoc = 519; - }; 047C7E4D110F278C00CC049E /* Source Control */ = { isa = PBXSourceControlManager; fallbackIsa = XCSourceControlManager; @@ -333,64 +183,64 @@ }; 048D064411216B1C009F7865 /* TextMateMinimap.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; - sepNavSelRange = "{575, 38}"; - sepNavVisRange = "{0, 689}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 746}}"; + sepNavSelRange = "{405, 0}"; + sepNavVisRange = "{0, 688}"; }; }; 048D064511216B1C009F7865 /* TextMateMinimap.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 2400}}"; - sepNavSelRange = "{834, 0}"; - sepNavVisRange = "{372, 2249}"; - sepNavWindowFrame = "{{15, 9}, {994, 769}}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 2340}}"; + sepNavSelRange = "{1043, 0}"; + sepNavVisRange = "{422, 2213}"; + sepNavWindowFrame = "{{393, 109}, {994, 769}}"; }; }; 048D065C11216C0F009F7865 /* MinimapView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; - sepNavSelRange = "{165, 0}"; - sepNavVisRange = "{0, 786}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 746}}"; + sepNavSelRange = "{575, 0}"; + sepNavVisRange = "{0, 750}"; sepNavWindowFrame = "{{38, 83}, {994, 769}}"; }; }; 048D065D11216C0F009F7865 /* MinimapView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 4635}}"; - sepNavSelRange = "{2483, 0}"; - sepNavVisRange = "{4417, 1354}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 5460}}"; + sepNavSelRange = "{4281, 0}"; + sepNavVisRange = "{3579, 1771}"; sepNavWindowFrame = "{{107, 20}, {994, 769}}"; }; }; 048D067B11216DDE009F7865 /* NSView+Minimap.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; - sepNavSelRange = "{491, 0}"; - sepNavVisRange = "{0, 503}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 746}}"; + sepNavSelRange = "{210, 0}"; + sepNavVisRange = "{0, 552}"; sepNavWindowFrame = "{{15, 104}, {994, 769}}"; }; }; 048D067C11216DDE009F7865 /* NSView+Minimap.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 1830}}"; - sepNavSelRange = "{867, 0}"; - sepNavVisRange = "{739, 1228}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 2025}}"; + sepNavSelRange = "{1748, 0}"; + sepNavVisRange = "{1253, 1300}"; sepNavWindowFrame = "{{15, 104}, {994, 769}}"; }; }; 048D06A1112171BE009F7865 /* NSWindowController+Minimap.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; - sepNavSelRange = "{370, 22}"; - sepNavVisRange = "{0, 502}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 746}}"; + sepNavSelRange = "{419, 0}"; + sepNavVisRange = "{0, 529}"; sepNavWindowFrame = "{{38, 83}, {994, 769}}"; }; }; 048D06A2112171BE009F7865 /* NSWindowController+Minimap.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 1680}}"; - sepNavSelRange = "{2758, 0}"; - sepNavVisRange = "{1592, 1360}"; + sepNavIntBoundsRect = "{{0, 0}, {1090, 2085}}"; + sepNavSelRange = "{3108, 0}"; + sepNavVisRange = "{2856, 420}"; sepNavWindowFrame = "{{38, 83}, {994, 769}}"; }; }; @@ -403,9 +253,9 @@ }; 048D06A5112171D3009F7865 /* NSWindow+Minimap.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; - sepNavSelRange = "{1233, 0}"; - sepNavVisRange = "{0, 1249}"; + sepNavIntBoundsRect = "{{0, 0}, {832, 690}}"; + sepNavSelRange = "{219, 0}"; + sepNavVisRange = "{0, 392}"; sepNavWindowFrame = "{{15, 104}, {994, 769}}"; }; }; @@ -418,11 +268,591 @@ }; 048D06A8112171DE009F7865 /* NSScrollView+Minimap.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1125, 698}}"; + sepNavIntBoundsRect = "{{0, 0}, {1124, 746}}"; sepNavSelRange = "{482, 104}"; sepNavVisRange = "{0, 947}"; }; }; + 049D7EA61125B4AD0087B7E1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D06A8112171DE009F7865 /* NSScrollView+Minimap.m */; + name = "NSScrollView+Minimap.m: 21"; + rLen = 104; + rLoc = 482; + rType = 0; + vrLen = 947; + vrLoc = 0; + }; + 04A5B6BF1125F82C0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 109"; + rLen = 0; + rLoc = 2628; + rType = 0; + vrLen = 1037; + vrLoc = 2147; + }; + 04A5B6D21125FEF30021A25B /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Syntax error before ';' token"; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 71; + rType = 1; + }; + 04A5B6D31125FEF30021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 73"; + rLen = 0; + rLoc = 1749; + rType = 0; + vrLen = 455; + vrLoc = 1533; + }; + 04A5B6EA1126005B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D064411216B1C009F7865 /* TextMateMinimap.h */; + name = "TextMateMinimap.h: 24"; + rLen = 0; + rLoc = 405; + rType = 0; + vrLen = 688; + vrLoc = 0; + }; + 04A5B6EB1126005B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; + name = "TextMateMinimap.m: 28"; + rLen = 0; + rLoc = 671; + rType = 0; + vrLen = 2171; + vrLoc = 224; + }; + 04A5B6EC1126005B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 72"; + rLen = 0; + rLoc = 1723; + rType = 0; + vrLen = 1536; + vrLoc = 1015; + }; + 04A5B6ED1126005B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 27"; + rLen = 0; + rLoc = 437; + rType = 0; + vrLen = 1115; + vrLoc = 0; + }; + 04A5B711112602340021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067B11216DDE009F7865 /* NSView+Minimap.h */; + name = "NSView+Minimap.h: 14"; + rLen = 0; + rLoc = 210; + rType = 0; + vrLen = 573; + vrLoc = 0; + }; + 04A5B712112602340021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065C11216C0F009F7865 /* MinimapView.h */; + name = "MinimapView.h: 13"; + rLen = 0; + rLoc = 243; + rType = 0; + vrLen = 750; + vrLoc = 0; + }; + 04A5B713112602340021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 121"; + rLen = 0; + rLoc = 2986; + rType = 0; + vrLen = 1041; + vrLoc = 3519; + }; + 04A5B714112602340021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 30"; + rLen = 0; + rLoc = 437; + rType = 0; + vrLen = 1554; + vrLoc = 1118; + }; + 04A5B715112602340021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 30"; + rLen = 0; + rLoc = 437; + rType = 0; + vrLen = 1554; + vrLoc = 1118; + }; + 04A5B71D112602500021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; + name = "TextMateMinimap.m: 51"; + rLen = 0; + rLoc = 1043; + rType = 0; + vrLen = 2213; + vrLoc = 422; + }; + 04A5B71E112602500021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + rLen = 0; + rLoc = 71; + rType = 1; + }; + 04A5B71F112602500021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 80"; + rLen = 0; + rLoc = 1749; + rType = 0; + vrLen = 1372; + vrLoc = 2009; + }; + 04A5B7211126026B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 80"; + rLen = 0; + rLoc = 1749; + rType = 0; + vrLen = 445; + vrLoc = 1433; + }; + 04A5B722112602860021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 80"; + rLen = 0; + rLoc = 1749; + rType = 0; + vrLen = 445; + vrLoc = 1433; + }; + 04A5B7231126028C0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 67"; + rLen = 0; + rLoc = 1486; + rType = 0; + vrLen = 1358; + vrLoc = 1409; + }; + 04A5B728112602E60021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 74"; + rLen = 0; + rLoc = 1721; + rType = 0; + vrLen = 1374; + vrLoc = 1391; + }; + 04A5B729112602E60021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 268"; + rLen = 0; + rLoc = 6527; + rType = 0; + vrLen = 994; + vrLoc = 6109; + }; + 04A5B72A112602E60021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 268"; + rLen = 0; + rLoc = 6527; + rType = 0; + vrLen = 994; + vrLoc = 6109; + }; + 04A5B72D1126031B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 258"; + rLen = 0; + rLoc = 6381; + rType = 0; + vrLen = 996; + vrLoc = 6109; + }; + 04A5B7531126067B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065C11216C0F009F7865 /* MinimapView.h */; + name = "MinimapView.h: 29"; + rLen = 0; + rLoc = 575; + rType = 0; + vrLen = 802; + vrLoc = 0; + }; + 04A5B7541126067B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067B11216DDE009F7865 /* NSView+Minimap.h */; + name = "NSView+Minimap.h: 14"; + rLen = 0; + rLoc = 210; + rType = 0; + vrLen = 552; + vrLoc = 0; + }; + 04A5B7551126067B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 166"; + rLen = 147; + rLoc = 3579; + rType = 0; + vrLen = 1144; + vrLoc = 3265; + }; + 04A5B7561126067B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 119"; + rLen = 0; + rLoc = 2388; + rType = 0; + vrLen = 1274; + vrLoc = 2177; + }; + 04A5B7571126067B0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 121"; + rLen = 0; + rLoc = 2256; + rType = 0; + vrLen = 1131; + vrLoc = 2133; + }; + 04A5B75D1126069F0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 124"; + rLen = 0; + rLoc = 2388; + rType = 0; + vrLen = 1382; + vrLoc = 2266; + }; + 04A5B763112607AF0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067B11216DDE009F7865 /* NSView+Minimap.h */; + name = "NSView+Minimap.h: 14"; + rLen = 0; + rLoc = 210; + rType = 0; + vrLen = 552; + vrLoc = 0; + }; + 04A5B764112607AF0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 71"; + rLen = 0; + rLoc = 1748; + rType = 0; + vrLen = 1300; + vrLoc = 1253; + }; + 04A5B765112607AF0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065C11216C0F009F7865 /* MinimapView.h */; + name = "MinimapView.h: 29"; + rLen = 0; + rLoc = 575; + rType = 0; + vrLen = 750; + vrLoc = 0; + }; + 04A5B766112607AF0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 166"; + rLen = 147; + rLoc = 3579; + rType = 0; + vrLen = 1112; + vrLoc = 3265; + }; + 04A5B767112607AF0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 110"; + rLen = 0; + rLoc = 2747; + rType = 0; + vrLen = 1537; + vrLoc = 3458; + }; + 04A5B76B112608470021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 176"; + rLen = 0; + rLoc = 3919; + rType = 0; + vrLen = 1480; + vrLoc = 3458; + }; + 04A5B7861126098D0021A25B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 185"; + rLen = 0; + rLoc = 4281; + rType = 0; + vrLen = 1771; + vrLoc = 3579; + }; + 04AB5C4D1125DDC5004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D06A1112171BE009F7865 /* NSWindowController+Minimap.h */; + name = "NSWindowController+Minimap.h: 19"; + rLen = 0; + rLoc = 419; + rType = 0; + vrLen = 529; + vrLoc = 0; + }; + 04AB5C511125DDC5004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D064411216B1C009F7865 /* TextMateMinimap.h */; + name = "TextMateMinimap.h: 24"; + rLen = 0; + rLoc = 405; + rType = 0; + vrLen = 688; + vrLoc = 0; + }; + 04AB5C961125E15D004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065C11216C0F009F7865 /* MinimapView.h */; + name = "MinimapView.h: 13"; + rLen = 0; + rLoc = 243; + rType = 0; + vrLen = 750; + vrLoc = 0; + }; + 04AB5CA01125E1CF004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067B11216DDE009F7865 /* NSView+Minimap.h */; + name = "NSView+Minimap.h: 21"; + rLen = 0; + rLoc = 411; + rType = 0; + vrLen = 552; + vrLoc = 0; + }; + 04AB5CBD1125E29A004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 110"; + rLen = 0; + rLoc = 2629; + rType = 0; + vrLen = 961; + vrLoc = 2223; + }; + 04AB5CC61125E2E0004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D065D11216C0F009F7865 /* MinimapView.m */; + name = "MinimapView.m: 35"; + rLen = 35; + rLoc = 662; + rType = 0; + vrLen = 1078; + vrLoc = 258; + }; + 04AB5CE91125E495004C4D62 /* TextMate */ = { + isa = PBXExecutable; + activeArgIndices = ( + ); + argumentStrings = ( + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + "PBXLSLaunchAction-0" = { + PBXLSLaunchAction = 0; + PBXLSLaunchStartAction = 1; + PBXLSLaunchStdioStyle = 2; + PBXLSLaunchStyle = 0; + class = PBXLSRunLaunchConfig; + commandLineArgs = ( + ); + displayName = "Executable Runner"; + environment = { + }; + identifier = com.apple.Xcode.launch.runConfig; + remoteHostInfo = ""; + startActionInfo = ""; + }; + }; + customDataFormattersEnabled = 1; + dataTipCustomDataFormattersEnabled = 1; + dataTipShowTypeColumn = 1; + dataTipSortType = 0; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + dylibVariantSuffix = ""; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + launchableReference = 04AB5CEA1125E495004C4D62 /* TextMate.app */; + libgmallocEnabled = 0; + name = TextMate; + savedGlobals = { + }; + showTypeColumn = 0; + sourceDirectories = ( + ); + startupPath = "<>"; + variableFormatDictionary = { + }; + }; + 04AB5CEA1125E495004C4D62 /* TextMate.app */ = { + isa = PBXFileReference; + lastKnownFileType = wrapper.application; + name = TextMate.app; + path = /Applications/TextMate.app; + sourceTree = ""; + }; + 04AB5CF41125E4B1004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D064511216B1C009F7865 /* TextMateMinimap.m */; + name = "TextMateMinimap.m: 51"; + rLen = 0; + rLoc = 1055; + rType = 0; + vrLen = 2218; + vrLoc = 876; + }; + 04AB5D331125ED8E004C4D62 /* objc.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = objc.h; + path = /Developer/SDKs/MacOSX10.4u.sdk/usr/include/objc/objc.h; + sourceTree = ""; + }; + 04AB5D3B1125EDAA004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 04AB5D331125ED8E004C4D62 /* objc.h */; + name = "objc.h: 34"; + rLen = 0; + rLoc = 1173; + rType = 0; + vrLen = 1449; + vrLoc = 0; + }; + 04AB5D461125F808004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D06A2112171BE009F7865 /* NSWindowController+Minimap.m */; + name = "NSWindowController+Minimap.m: 118"; + rLen = 0; + rLoc = 3108; + rType = 0; + vrLen = 1742; + vrLoc = 2326; + }; + 04AB5D471125F808004C4D62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D067C11216DDE009F7865 /* NSView+Minimap.m */; + name = "NSView+Minimap.m: 109"; + rLen = 0; + rLoc = 2628; + rType = 0; + vrLen = 997; + vrLoc = 2187; + }; + 04B78C65112580D0009189AC /* SFNTTypes.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = SFNTTypes.h; + path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Headers/SFNTTypes.h; + sourceTree = ""; + }; + 04B78CEB11258866009189AC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 04B78C65112580D0009189AC /* SFNTTypes.h */; + name = "SFNTTypes.h: 402"; + rLen = 91; + rLoc = 13010; + rType = 0; + vrLen = 1624; + vrLoc = 12198; + }; + 04B78D4111258C48009189AC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 04B78D4211258C48009189AC /* NSView.h */; + name = "NSView.h: 215"; + rLen = 0; + rLoc = 7114; + rType = 0; + vrLen = 1865; + vrLoc = 6050; + }; + 04B78D4211258C48009189AC /* NSView.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = NSView.h; + path = /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSView.h; + sourceTree = ""; + }; + 04B78E2B1125A21B009189AC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 048D06A5112171D3009F7865 /* NSWindow+Minimap.m */; + name = "NSWindow+Minimap.m: 34"; + rLen = 344; + rLoc = 896; + rType = 0; + vrLen = 1249; + vrLoc = 0; + }; + 04B78ECE1125AAB5009189AC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 04B78ECF1125AAB5009189AC /* runtime.h */; + name = "runtime.h: 134"; + rLen = 73; + rLoc = 4680; + rType = 0; + vrLen = 1701; + vrLoc = 0; + }; + 04B78ECF1125AAB5009189AC /* runtime.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = runtime.h; + path = /Developer/SDKs/MacOSX10.5.sdk/usr/include/objc/runtime.h; + sourceTree = ""; + }; 04CA0FA711204A6D006869D1 /* NSView.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -479,7 +909,9 @@ vrLoc = 0; }; 089C1669FE841209C02AAC07 /* Project object */ = { + activeArchitecturePreference = i386; activeBuildConfigurationName = Release; + activeExecutable = 04AB5CE91125E495004C4D62 /* TextMate */; activeSDKPreference = macosx10.5; activeTarget = 8D5B49AC048680CD000E48DA /* TextmateMinimap */; addToTargets = ( @@ -489,6 +921,9 @@ 0429D1471120C92D0048EA21 /* TextShapeView.m:125 */, ); codeSenseManager = 047C7E4E110F278C00CC049E /* Code sense */; + executables = ( + 04AB5CE91125E495004C4D62 /* TextMate */, + ); perUserDictionary = { "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; @@ -496,11 +931,11 @@ PBXFileTableDataSourceColumnWidthsKey = ( 20, 20, - 198, + 241, 20, - 99, - 99, - 29, + 142, + 142, + 42, 20, ); PBXFileTableDataSourceColumnsKey = ( @@ -610,34 +1045,69 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 287602910; - PBXWorkspaceStateSaveDate = 287602910; + PBXPerProjectTemplateStateSaveDate = 287701013; + PBXWorkspaceStateSaveDate = 287701013; }; perUserProjectItems = { 0414357311242C7800370416 = 0414357311242C7800370416 /* PBXTextBookmark */; 0414357411242C7800370416 = 0414357411242C7800370416 /* PBXTextBookmark */; - 041FFA12112478EA00D8C5BD /* PBXTextBookmark */ = 041FFA12112478EA00D8C5BD /* PBXTextBookmark */; - 041FFA13112478EA00D8C5BD /* PBXTextBookmark */ = 041FFA13112478EA00D8C5BD /* PBXTextBookmark */; - 041FFA14112478EA00D8C5BD /* PBXTextBookmark */ = 041FFA14112478EA00D8C5BD /* PBXTextBookmark */; - 041FFA291124790500D8C5BD /* PBXTextBookmark */ = 041FFA291124790500D8C5BD /* PBXTextBookmark */; 0429D03B1120B00E0048EA21 = 0429D03B1120B00E0048EA21 /* PBXTextBookmark */; 0458D46311244FFA002550F2 = 0458D46311244FFA002550F2 /* PBXTextBookmark */; 0458D48C1124572C002550F2 = 0458D48C1124572C002550F2 /* PBXTextBookmark */; - 0458D4F511246AAE002550F2 = 0458D4F511246AAE002550F2 /* PBXTextBookmark */; 0458D4F711246AAE002550F2 = 0458D4F711246AAE002550F2 /* PBXTextBookmark */; - 0458D4FA11246AAE002550F2 = 0458D4FA11246AAE002550F2 /* PBXTextBookmark */; - 0458D4FD11246AAE002550F2 = 0458D4FD11246AAE002550F2 /* PBXTextBookmark */; - 0458D50D11246B1F002550F2 = 0458D50D11246B1F002550F2 /* PBXTextBookmark */; 0458D50F11246B1F002550F2 = 0458D50F11246B1F002550F2 /* PBXTextBookmark */; - 0458D51011246B1F002550F2 = 0458D51011246B1F002550F2 /* PBXTextBookmark */; - 0458D51111246B1F002550F2 = 0458D51111246B1F002550F2 /* PBXTextBookmark */; - 0458D51D1124736D002550F2 = 0458D51D1124736D002550F2 /* PBXTextBookmark */; - 0458D51E1124736D002550F2 = 0458D51E1124736D002550F2 /* PBXTextBookmark */; - 0458D51F1124736D002550F2 = 0458D51F1124736D002550F2 /* PBXTextBookmark */; - 0458D5201124736D002550F2 = 0458D5201124736D002550F2 /* PBXTextBookmark */; - 0458D5251124768D002550F2 = 0458D5251124768D002550F2 /* PBXTextBookmark */; 0486C2A4112323380075832F = 0486C2A4112323380075832F /* PBXTextBookmark */; 0486C2A6112323380075832F = 0486C2A6112323380075832F /* PBXTextBookmark */; + 049D7EA61125B4AD0087B7E1 = 049D7EA61125B4AD0087B7E1 /* PBXTextBookmark */; + 04A5B6BF1125F82C0021A25B /* PBXTextBookmark */ = 04A5B6BF1125F82C0021A25B /* PBXTextBookmark */; + 04A5B6D21125FEF30021A25B /* XCBuildMessageTextBookmark */ = 04A5B6D21125FEF30021A25B /* XCBuildMessageTextBookmark */; + 04A5B6D31125FEF30021A25B /* PBXTextBookmark */ = 04A5B6D31125FEF30021A25B /* PBXTextBookmark */; + 04A5B6EA1126005B0021A25B /* PBXTextBookmark */ = 04A5B6EA1126005B0021A25B /* PBXTextBookmark */; + 04A5B6EB1126005B0021A25B /* PBXTextBookmark */ = 04A5B6EB1126005B0021A25B /* PBXTextBookmark */; + 04A5B6EC1126005B0021A25B /* PBXTextBookmark */ = 04A5B6EC1126005B0021A25B /* PBXTextBookmark */; + 04A5B6ED1126005B0021A25B /* PBXTextBookmark */ = 04A5B6ED1126005B0021A25B /* PBXTextBookmark */; + 04A5B711112602340021A25B /* PBXTextBookmark */ = 04A5B711112602340021A25B /* PBXTextBookmark */; + 04A5B712112602340021A25B /* PBXTextBookmark */ = 04A5B712112602340021A25B /* PBXTextBookmark */; + 04A5B713112602340021A25B /* PBXTextBookmark */ = 04A5B713112602340021A25B /* PBXTextBookmark */; + 04A5B714112602340021A25B /* PBXTextBookmark */ = 04A5B714112602340021A25B /* PBXTextBookmark */; + 04A5B715112602340021A25B /* PBXTextBookmark */ = 04A5B715112602340021A25B /* PBXTextBookmark */; + 04A5B71D112602500021A25B /* PBXTextBookmark */ = 04A5B71D112602500021A25B /* PBXTextBookmark */; + 04A5B71E112602500021A25B /* PBXTextBookmark */ = 04A5B71E112602500021A25B /* PBXTextBookmark */; + 04A5B71F112602500021A25B /* PBXTextBookmark */ = 04A5B71F112602500021A25B /* PBXTextBookmark */; + 04A5B7211126026B0021A25B /* PBXTextBookmark */ = 04A5B7211126026B0021A25B /* PBXTextBookmark */; + 04A5B722112602860021A25B /* PBXTextBookmark */ = 04A5B722112602860021A25B /* PBXTextBookmark */; + 04A5B7231126028C0021A25B /* PBXTextBookmark */ = 04A5B7231126028C0021A25B /* PBXTextBookmark */; + 04A5B728112602E60021A25B /* PBXTextBookmark */ = 04A5B728112602E60021A25B /* PBXTextBookmark */; + 04A5B729112602E60021A25B /* PBXTextBookmark */ = 04A5B729112602E60021A25B /* PBXTextBookmark */; + 04A5B72A112602E60021A25B /* PBXTextBookmark */ = 04A5B72A112602E60021A25B /* PBXTextBookmark */; + 04A5B72D1126031B0021A25B /* PBXTextBookmark */ = 04A5B72D1126031B0021A25B /* PBXTextBookmark */; + 04A5B7531126067B0021A25B /* PBXTextBookmark */ = 04A5B7531126067B0021A25B /* PBXTextBookmark */; + 04A5B7541126067B0021A25B /* PBXTextBookmark */ = 04A5B7541126067B0021A25B /* PBXTextBookmark */; + 04A5B7551126067B0021A25B /* PBXTextBookmark */ = 04A5B7551126067B0021A25B /* PBXTextBookmark */; + 04A5B7561126067B0021A25B /* PBXTextBookmark */ = 04A5B7561126067B0021A25B /* PBXTextBookmark */; + 04A5B7571126067B0021A25B /* PBXTextBookmark */ = 04A5B7571126067B0021A25B /* PBXTextBookmark */; + 04A5B75D1126069F0021A25B /* PBXTextBookmark */ = 04A5B75D1126069F0021A25B /* PBXTextBookmark */; + 04A5B763112607AF0021A25B /* PBXTextBookmark */ = 04A5B763112607AF0021A25B /* PBXTextBookmark */; + 04A5B764112607AF0021A25B /* PBXTextBookmark */ = 04A5B764112607AF0021A25B /* PBXTextBookmark */; + 04A5B765112607AF0021A25B /* PBXTextBookmark */ = 04A5B765112607AF0021A25B /* PBXTextBookmark */; + 04A5B766112607AF0021A25B /* PBXTextBookmark */ = 04A5B766112607AF0021A25B /* PBXTextBookmark */; + 04A5B767112607AF0021A25B /* PBXTextBookmark */ = 04A5B767112607AF0021A25B /* PBXTextBookmark */; + 04A5B76B112608470021A25B /* PBXTextBookmark */ = 04A5B76B112608470021A25B /* PBXTextBookmark */; + 04A5B7861126098D0021A25B /* PBXTextBookmark */ = 04A5B7861126098D0021A25B /* PBXTextBookmark */; + 04AB5C4D1125DDC5004C4D62 = 04AB5C4D1125DDC5004C4D62 /* PBXTextBookmark */; + 04AB5C511125DDC5004C4D62 = 04AB5C511125DDC5004C4D62 /* PBXTextBookmark */; + 04AB5C961125E15D004C4D62 = 04AB5C961125E15D004C4D62 /* PBXTextBookmark */; + 04AB5CA01125E1CF004C4D62 = 04AB5CA01125E1CF004C4D62 /* PBXTextBookmark */; + 04AB5CBD1125E29A004C4D62 = 04AB5CBD1125E29A004C4D62 /* PBXTextBookmark */; + 04AB5CC61125E2E0004C4D62 = 04AB5CC61125E2E0004C4D62 /* PBXTextBookmark */; + 04AB5CF41125E4B1004C4D62 = 04AB5CF41125E4B1004C4D62 /* PBXTextBookmark */; + 04AB5D3B1125EDAA004C4D62 = 04AB5D3B1125EDAA004C4D62 /* PBXTextBookmark */; + 04AB5D461125F808004C4D62 = 04AB5D461125F808004C4D62 /* PBXTextBookmark */; + 04AB5D471125F808004C4D62 = 04AB5D471125F808004C4D62 /* PBXTextBookmark */; + 04B78CEB11258866009189AC = 04B78CEB11258866009189AC /* PBXTextBookmark */; + 04B78D4111258C48009189AC = 04B78D4111258C48009189AC /* PBXTextBookmark */; + 04B78E2B1125A21B009189AC = 04B78E2B1125A21B009189AC /* PBXTextBookmark */; + 04B78ECE1125AAB5009189AC = 04B78ECE1125AAB5009189AC /* PBXTextBookmark */; 04CA0FC111204A89006869D1 = 04CA0FC111204A89006869D1 /* PBXTextBookmark */; 04DB4425110F285900762426 = 04DB4425110F285900762426 /* PlistBookmark */; 04DB4435110F289700762426 = 04DB4435110F289700762426 /* PBXTextBookmark */; diff --git a/Textmate-Minimap.xcodeproj/project.pbxproj b/Textmate-Minimap.xcodeproj/project.pbxproj index 4144f34..b26a770 100644 --- a/Textmate-Minimap.xcodeproj/project.pbxproj +++ b/Textmate-Minimap.xcodeproj/project.pbxproj @@ -248,6 +248,8 @@ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -255,11 +257,12 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TextmateMinimap_Prefix.pch; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; PRODUCT_NAME = TextmateMinimap; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + RUN_CLANG_STATIC_ANALYZER = YES; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; WRAPPER_EXTENSION = tmplugin; ZERO_LINK = YES; };