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

ArrangementPreviewView.m

@@ -29,26 +29,29 @@
     
     NSArray *screens = [NSScreen screens];
     CGFloat xMax = 0, yMax = 0;
+    CGFloat xMin = 0, yMin = 0;
     for (NSScreen *screen in screens) {
         NSRect frame = [screen frame];
         CGFloat x = frame.origin.x + frame.size.width;
         CGFloat y = frame.origin.y + frame.size.height;
         xMax = MAX(xMax, x);
         yMax = MAX(yMax, y);
+        xMin = MIN(xMin, frame.origin.x);
+        yMin = MIN(yMin, frame.origin.y);
     }
     
-    double xScale = [self frame].size.width / xMax;
-    double yScale = [self frame].size.height / yMax;
+    double xScale = [self frame].size.width / (xMax - xMin);
+    double yScale = [self frame].size.height / (yMax - yMin);
     double scale = MIN(xScale, yScale);
-    double yCorrection = MAX(0, ([self frame].size.height - yMax * scale) / 2);
-    double xCorrection = MAX(0, ([self frame].size.width - xMax * scale) / 2);
+    double yCorrection = MAX(0, ([self frame].size.height - (yMax - yMin) * scale) / 2);
+    double xCorrection = MAX(0, ([self frame].size.width - (xMax - xMin) * scale) / 2);
     NSMutableArray *screenFrames = [NSMutableArray array];
     for (NSScreen *screen in screens) {
         NSRect frame = [screen frame];
-        NSRect rect = NSMakeRect(frame.origin.x * scale + xCorrection,
-                                 frame.origin.y * scale + yCorrection,
+        NSRect rect = NSMakeRect((frame.origin.x - xMin) * scale + xCorrection,
+                                 (yMax - frame.size.height - frame.origin.y) * scale + yCorrection,
                                  frame.size.width * scale,
                                  frame.size.height * scale);
         [[NSColor blackColor] set];

FutureMethods.m

@@ -24,7 +24,7 @@
 - (void)futureSetRestorationClass:(Class)class
 {
-    if ([self respondsToSelector:@selector(futureSetRestorationClass:)]) {
+    if ([self respondsToSelector:@selector(setRestorationClass:)]) {
         [self performSelector:@selector(setRestorationClass:) withObject:class];
     }
 }

PTYTextView.m

@@ -6527,7 +6527,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 {
     static NSMutableCharacterSet* urlChars;
     if (!urlChars) {
-        urlChars = [[NSMutableCharacterSet characterSetWithCharactersInString:@".?\\/:;%=&_-,+~#@!*'()"] retain];
+        urlChars = [[NSMutableCharacterSet characterSetWithCharactersInString:@".?\\/:;%=&_-,+~#@!*'()|"] retain];
         [urlChars formUnionWithCharacterSet:[NSCharacterSet alphanumericCharacterSet]];
         [urlChars retain];
     }

SessionTitleView.m

@@ -105,7 +105,7 @@ static const CGFloat kButtonSize = 17;
 - (NSColor *)dimmedColor:(NSColor *)origColor
 {
-    NSColor *color = [origColor colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
+    NSColor *color = [origColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
     double r = [color redComponent];
     double g = [color greenComponent];
     double b = [color blueComponent];
@@ -147,7 +147,7 @@ static const CGFloat kButtonSize = 17;
 {
     dimmingAmount_ = value;
     [self setNeedsDisplay:YES];
-    [label_ setTextColor:[self dimmedColor:[NSColor blackColor]]];
+    [label_ setTextColor:[self dimmedColor:[NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:1]]];
 }
 - (void)mouseDragged:(NSEvent *)theEvent

VT100Screen.m

@@ -1222,7 +1222,10 @@ static char* FormatCont(int c)
         }
         [SESSION clearTriggerLine];
         break;
-    case VT100CC_CR:  [self setCursorX:0 Y:cursorY]; break;
+    case VT100CC_CR:
+        [self setCursorX:0 Y:cursorY];
+        [SESSION clearTriggerLine];
+        break;
     case VT100CC_SO:  break;
     case VT100CC_SI:  break;
     case VT100CC_DC1: break;