Merge branch 'master' of github.com:gnachman/iTerm2

Headers/iTerm/PTYScrollView.h

@@ -61,6 +61,7 @@
 - (id)initWithFrame:(NSRect)frame hasVerticalScroller:(BOOL)hasVerticalScroller;
 - (void)scrollWheel:(NSEvent *)theEvent;
 - (void)detectUserScroll;
+- (BOOL)isLegacyScroller;
 // background image
 - (NSImage *)backgroundImage;

PTYScrollView.m

@@ -107,7 +107,7 @@
     return [super hitPart];
 }
-- (BOOL)_isLegacyScroller
+- (BOOL)isLegacyScroller
 {
     if ([self respondsToSelector:@selector(scrollerStyle)]) {
         return [self scrollerStyle] == NSScrollerStyleLegacy;
@@ -118,7 +118,7 @@
 - (void)drawRect:(NSRect)dirtyRect {
     if (IsLionOrLater() &&
-        ![self _isLegacyScroller] &&
+        ![self isLegacyScroller] &&
         self.hasDarkBackground &&
         dirtyRect.size.width > 0 &&
         dirtyRect.size.height > 0) {
@@ -273,7 +273,7 @@
     timer_ = nil;
 }
-- (BOOL)_isLegacyScroller
+- (BOOL)isLegacyScroller
 {
     if ([self respondsToSelector:@selector(scrollerStyle)]) {
         return [self scrollerStyle] == NSScrollerStyleLegacy;
@@ -293,7 +293,7 @@
 - (void)setHasVerticalScroller:(BOOL)flag inInit:(BOOL)inInit
 {
-    if ([self _isLegacyScroller]) {
+    if ([self isLegacyScroller]) {
         [super setHasVerticalScroller:flag];
         return;
     }

PTYSession.m

@@ -471,10 +471,14 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
 - (NSString *)_autoLogFilenameForTermId:(NSString *)termid
 {
-    return [NSString stringWithFormat:@"%@/%@.%@.%d.%0x.log",
+    // $(LOGDIR)/YYYYMMDD_HHMMSS.$(NAME).wNtNpN.$(PID).$(RANDOM).log
+    return [NSString stringWithFormat:@"%@/%@.%@.%@.%d.%0x.log",
             [addressBookEntry objectForKey:KEY_LOGDIR],
+            [[NSDate date] descriptionWithCalendarFormat:@"%Y%m%d_%H%M%S"
+                                                timeZone:nil
+                                                  locale:nil],
+            [addressBookEntry objectForKey:KEY_NAME],
             termid,
-            [[[NSDate date] description] stringByReplacingOccurrencesOfString:@"/" withString:@"."],
             (int)getpid(),
             (int)arc4random()];
 }

PseudoTerminal.m

@@ -1789,7 +1789,7 @@ NSString *sessionsKey = @"sessions";
     BOOL verticalOnly = NO;
     BOOL maxVerticallyPref;
-    if ([[self ptyWindow] isTogglingLionFullScreen]) {
+    if (togglingLionFullScreen_ || [[self ptyWindow] isTogglingLionFullScreen] || [self lionFullScreen]) {
         // Going into lion fullscreen mode. Disregard the "maximize vertically"
         // preference.
         verticalOnly = NO;
@@ -3583,7 +3583,8 @@ NSString *sessionsKey = @"sessions";
                windowType_ == WINDOW_TYPE_TOP ||
                windowType_ == WINDOW_TYPE_BOTTOM) {
         return NO;
-    } else if (![self scrollbarShouldBeVisible]) {
+    } else if (![[[self currentSession] SCROLLVIEW] isLegacyScroller] ||
+               ![self scrollbarShouldBeVisible]) {
         // hidden scrollbar
         return YES;
     } else {
@@ -3658,7 +3659,7 @@ NSString *sessionsKey = @"sessions";
         }
     }
-    if (!_fullScreen) {
+    if (![self anyFullScreen]) {
         return;
     }
     if (!temporarilyShowingTabs_ && fullscreenTabs_) {
@@ -3696,7 +3697,7 @@ NSString *sessionsKey = @"sessions";
     [fullScreenTabviewTimer_ release];
     fullScreenTabviewTimer_ = nil;
     // Don't show the tabbar if you're holding cmd while doing find cursor
-    if (_fullScreen && ![[[self currentSession] TEXTVIEW] isFindingCursor]) {
+    if ([self anyFullScreen] && ![[[self currentSession] TEXTVIEW] isFindingCursor]) {
         [self showFullScreenTabControl];
     }
 }

iTerm.plist

@@ -82,14 +82,6 @@
 				<string>ftp</string>
 			</array>
 		</dict>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>file URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>file</string>
-			</array>
-		</dict>
 		<dict>
 			<key>CFBundleURLName</key>
 			<string>gopher URL</string>