Fix broken nightly build

FutureMethods.h

@@ -72,6 +72,8 @@ extern const int FutureNSWindowCollectionBehaviorStationary;
 @interface NSView (Future)
 - (void)futureSetAcceptsTouchEvents:(BOOL)value;
 - (void)futureSetWantsRestingTouches:(BOOL)value;
+- (NSRect)futureConvertRectToScreen:(NSRect)rect;
+- (NSRect)futureConvertRectFromScreen:(NSRect)rect;
 @end
 
 @interface NSEvent (Future)

FutureMethods.m

@@ -63,6 +63,44 @@ - (void)futureSetWantsRestingTouches:(BOOL)value
         [inv invoke];
     }
 }
+
+- (NSRect)futureConvertRectToScreen:(NSRect)rect
+{
+    if ([[self window] respondsToSelector:@selector(convertRectToScreen:)]) {
+        NSMethodSignature *sig = [[[self window] class] instanceMethodSignatureForSelector:@selector(convertRectToScreen:)];
+        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:sig];
+        [inv setTarget:[self window]];
+        [inv setSelector:@selector(convertRectToScreen:)];
+        [inv setArgument:&rect atIndex:2];
+        [inv invoke];
+        NSRect result;
+        [inv getReturnValue:&result];
+        return result;
+    } else {
+        NSPoint p1 = [self convertPointToBase:rect.origin];
+        NSPoint p2 = [self convertPointToBase:NSMakePoint(rect.origin.x + rect.size.width, rect.origin.y + rect.size.width)];
+        return NSMakeRect(MIN(p1.x, p2.x), MIN(p1.y, p2.y), fabs(p1.x - p2.x), fabs(p1.y - p2.y));
+    }
+}
+
+- (NSRect)futureConvertRectFromScreen:(NSRect)rect {
+    if ([[self window] respondsToSelector:@selector(convertRectFromScreen:)]) {
+        NSMethodSignature *sig = [[[self window] class] instanceMethodSignatureForSelector:@selector(convertRectFromScreen:)];
+        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:sig];
+        [inv setTarget:[self window]];
+        [inv setSelector:@selector(convertRectFromScreen:)];
+        [inv setArgument:&rect atIndex:2];
+        [inv invoke];
+        NSRect result;
+        [inv getReturnValue:&result];
+        return result;
+    } else {
+        NSPoint p1 = [self convertPointFromBase:rect.origin];
+        NSPoint p2 = [self convertPointFromBase:NSMakePoint(rect.origin.x + rect.size.width, rect.origin.y + rect.size.width)];
+        return NSMakeRect(MIN(p1.x, p2.x), MIN(p1.y, p2.y), fabs(p1.x - p2.x), fabs(p1.y - p2.y));
+    }
+}
+
 @end
 
 @implementation NSEvent (Future)
@@ -167,4 +205,4 @@ - (void)futureSetKnobStyle:(NSInteger)newKnobStyle {
     }
 }
 
-@end
+@end

PSMTabBarControl/source/PSMTabBarCell.m

@@ -11,6 +11,7 @@
 #import "PSMTabStyle.h"
 #import "PSMProgressIndicator.h"
 #import "PSMTabDragAssistant.h"
+#import "FutureMethods.h"
 
 @interface PSMTabBarControl (Private)
 - (void)update;
@@ -488,7 +489,7 @@ - (id)accessibilityAttributeValue:(NSString *)attribute {
     } else if ([attribute isEqualToString:NSAccessibilityPositionAttribute] || [attribute isEqualToString:NSAccessibilitySizeAttribute]) {
         NSRect rect = [self frame];
         rect = [[self controlView] convertRect:rect toView:nil];
-        rect = [[[self controlView] window] convertRectToScreen:rect];
+        rect = [[self controlView] futureConvertRectToScreen:rect];
         if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) {
             attributeValue = [NSValue valueWithPoint:rect.origin];
         } else {

PTYFontInfo.h

@@ -13,6 +13,7 @@
     NSFont *font_;
     double baselineOffset_;
     PTYFontInfo *boldVersion_;
+    PTYFontInfo *italicVersion_;
 }
 
 @property (nonatomic, retain) NSFont *font;

PTYTextView.m

@@ -1362,7 +1362,7 @@ - (id)_accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parame
                                    MAX(0, (xMax - xMin) * charWidth),
                                    MAX(0, (yMax - yMin + 1) * lineHeight));
         result = [self convertRect:result toView:nil];
-        result = [[self window] convertRectToScreen:result];
+        result = [self futureConvertRectToScreen:result];
         return [NSValue valueWithRect:result];
     } else if ([attribute isEqualToString:NSAccessibilityAttributedStringForRangeParameterizedAttribute]) {
         //(NSAttributedString *) - substring; param:(NSValue * - rangeValue)
@@ -1658,8 +1658,8 @@ - (BOOL)refresh
         accX = [dataSource cursorX];
         accY = absCursorY;
         if (UAZoomEnabled()) {
-            CGRect viewRect = NSRectToCGRect([[self window] convertRectToScreen:[self convertRect:[self visibleRect] toView:nil]]);
-            CGRect selectedRect = NSRectToCGRect([[self window] convertRectToScreen:[self convertRect:[self cursorRect] toView:nil]]);
+            CGRect viewRect = NSRectToCGRect([self futureConvertRectToScreen:[self convertRect:[self visibleRect] toView:nil]]);
+            CGRect selectedRect = NSRectToCGRect([self futureConvertRectToScreen:[self convertRect:[self cursorRect] toView:nil]]);
             viewRect.origin.y = [[NSScreen mainScreen] frame].size.height - (viewRect.origin.y + viewRect.size.height);
             selectedRect.origin.y = [[NSScreen mainScreen] frame].size.height - (selectedRect.origin.y + selectedRect.size.height);
             UAZoomChangeFocus(&viewRect, &selectedRect, kUAZoomFocusTypeInsertionPoint);

ProcessCache.m

@@ -173,7 +173,7 @@ + (NSArray *)allPids
 + (pid_t)ppidForPid:(pid_t)thePid
 {
   if (IsLionOrLater()) {
-    struct proc_bsdshortinfo taskShortInfo;
+    struct future_proc_bsdshortinfo taskShortInfo;
     memset(&taskShortInfo, 0, sizeof(taskShortInfo));
     int rc;
     @synchronized ([ProcessCache class]) {

SessionView.m

@@ -34,6 +34,7 @@
 #import "MovePaneController.h"
 #import "PSMTabDragAssistant.h"
 #import "SessionTitleView.h"
+#import "FutureMethods.h"
 
 static const float kTargetFrameRate = 1.0/60.0;
 static int nextViewId;
@@ -290,7 +291,7 @@ - (void)mouseDown:(NSEvent*)event
     NSPoint p = [NSEvent mouseLocation];
     NSPoint pointInSessionView;
     if (IsLionOrLater()) {
-        NSRect windowRect = [[self window] convertRectFromScreen:NSMakeRect(p.x, p.y, 0, 0)];
+        NSRect windowRect = [self futureConvertRectFromScreen:NSMakeRect(p.x, p.y, 0, 0)];
         pointInSessionView = [self convertRect:windowRect fromView:nil].origin;
         NSLog(@"Point in screen coords=%@, point in window coords=%@, point in session view=%@",
               NSStringFromPoint(p),

TmuxGateway.m

@@ -555,7 +555,7 @@ - (NSDictionary *)dictionaryForCommand:(NSString *)command
     return [NSDictionary dictionaryWithObjectsAndKeys:
             command, kCommandString,
             target ? target : [NSNull null], kCommandTarget,
-            selector ? NSStringFromSelector(selector) : [NSNull null], kCommandSelector,
+            selector ? (id) NSStringFromSelector(selector) : (id) [NSNull null], kCommandSelector,
             obj ? obj : [NSNull null], kCommandObject,
             [NSNumber numberWithInt:flags], kCommandFlags,
             nil];