Adhoc build 1.0.0.20140122_160941

PTYSession.m

@@ -426,10 +426,10 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
     [SCROLLVIEW setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
     // assign the main view
-        [view addSubview:SCROLLVIEW];
-        if (![self isTmuxClient]) {
-                [view setAutoresizesSubviews:YES];
-        }
+    [view addSubview:SCROLLVIEW];
+    if (![self isTmuxClient]) {
+            [view setAutoresizesSubviews:YES];
+    }
     // TODO(georgen): I disabled setCopiesOnScroll because there is a vertical margin in the PTYTextView and
     // we would not want that copied. This is obviously bad for performance when scrolling, but it's unclear
     // whether the difference will ever be noticable. I believe it could be worked around (painfully) by
@@ -470,6 +470,12 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
     // initialize the screen
     int width = (aSize.width - MARGIN*2) / [TEXTVIEW charWidth];
     int height = (aSize.height - VMARGIN*2) / [TEXTVIEW lineHeight];
+    DLog(@"Creating a new screen.");
+    DLog(@"Recursive description of session's view:");
+    DLog(@"%@", [view iterm_recursiveDescription]);
+    DLog(@"View's screen: %@", [NSValue valueWithRect:[[[view window] screen] frame]]);
+    DLog(@"Line height: %d", (int)[TEXTVIEW lineHeight]);
+    DLog(@"number of rows: %d", height);
     if ([SCREEN initScreenWithWidth:width Height:height]) {
         [self setName:@"Shell"];
         [self setDefaultName:@"Shell"];

PTYTab.m

@@ -46,16 +46,7 @@
 #import "TmuxDashboardController.h"
 //#define PTYTAB_VERBOSE_LOGGING
-#ifdef PTYTAB_VERBOSE_LOGGING
-#define PtyLog NSLog
-#else
-#define PtyLog(args...) \
-do { \
-if (gDebugLogging) { \
-DebugLog([NSString stringWithFormat:args]); \
-} \
-} while (0)
-#endif
+#define PtyLog DLog
 // No growl output/idle alerts for a few seconds after a window is resized because there will be bogus bg activity
 const int POST_WINDOW_RESIZE_SILENCE_SEC = 5;
@@ -1750,7 +1741,9 @@ static NSString* FormatRect(NSRect r) {
     BOOL hasScrollbar = ![parentWindow_ anyFullScreen] && ![[PreferencePanel sharedInstance] hideScrollbar];
     [[aSession SCROLLVIEW] setHasVerticalScroller:hasScrollbar];
     NSSize size = [[aSession view] maximumPossibleScrollViewContentSize];
-    DLog(@"Max size is %@", [NSValue valueWithSize:size]);
+    DLog(@"Maximum possible size is %@", [NSValue valueWithSize:size]);
+    DLog(@"Line height is %d", (int)[[aSession TEXTVIEW] lineHeight]);
+    DLog(@"Height minus vertical margins is %d", (int)(size.height - VMARGIN*2));
     int width = (size.width - MARGIN*2) / [[aSession TEXTVIEW] charWidth];
     int height = (size.height - VMARGIN*2) / [[aSession TEXTVIEW] lineHeight];
     PtyLog(@"fitSessionToCurrentViewSize %@ gives %d rows", [NSValue valueWithSize:size], height);
@@ -1772,6 +1765,7 @@ static NSString* FormatRect(NSRect r) {
 - (BOOL)fitSessionToCurrentViewSize:(PTYSession*)aSession
 {
     DLog(@"fitSessionToCurrentViewSize:%@", aSession);
+  DLog(@"%@", [[[root_ window] contentView] iterm_recursiveDescription]);
     if ([aSession isTmuxClient]) {
         return NO;
     }

SessionView.m

@@ -588,10 +588,10 @@ static NSDate* lastResizeDate_;
 - (NSSize)maximumPossibleScrollViewContentSize
 {
     NSSize size = self.frame.size;
-    DLog(@"maximumPossibleScrollViewContentSize. size=%@", [NSValue valueWithSize:size]);
+    DLog(@"maximumPossibleScrollViewContentSize. session view's frame size=%@", [NSValue valueWithSize:size]);
     if (showTitle_) {
         size.height -= kTitleHeight;
-        DLog(@"maximumPossibleScrollViewContentSize: sub title height. size=%@", [NSValue valueWithSize:size]);
+        DLog(@"maximumPossibleScrollViewContentSize: subtract title height. size=%@", [NSValue valueWithSize:size]);
     }
     return [NSScrollView contentSizeForFrameSize:size
                            hasHorizontalScroller:NO

iTerm.plist

@@ -192,8 +192,8 @@
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
 	<key>SUFeedURLForTesting</key>
-	<string>http://iterm2.com/appcasts/legacy_testing.xml</string>
+	<string>http://iterm2.com/appcasts/testing.xml</string>
 	<key>SUFeedURLForFinal</key>
-	<string>http://iterm2.com/appcasts/legacy_final.xml</string>
+	<string>http://iterm2.com/appcasts/final.xml</string>
 </dict>
 </plist>