Merge pull request #410 from macvim-dev/fix/fullscreen

Runtime 10.12 version check for CGLayer in non-native fullscreen

Author: splhack

src/MacVim/MMCoreTextView.h

@@ -38,8 +38,11 @@
     CGGlyph                     *glyphs;
     CGPoint                     *positions;
     NSMutableArray              *fontCache;
-    CGLayerRef                  layer;
-    CGContextRef                layerContext;
+
+    BOOL                        cgLayerEnabled;
+    CGLayerRef                  cgLayer;
+    CGContextRef                cgLayerContext;
+
     // These are used in MMCoreTextView+ToolTip.m
     id trackingRectOwner_;              // (not retained)
     void *trackingRectUserData_;
@@ -86,6 +89,7 @@
 - (BOOL)convertPoint:(NSPoint)point toRow:(int *)row column:(int *)column;
 - (NSRect)rectForRow:(int)row column:(int)column numRows:(int)nr
           numColumns:(int)nc;
+- (void)setCGLayerEnabled:(BOOL)enabled;
 
 //
 // NSTextView methods

src/MacVim/MMCoreTextView.m

@@ -593,18 +593,22 @@ - (void)drawRect:(NSRect)rect
 
     [drawData removeAllObjects];
 
-    CGLayerRef l = [self getLayer];
-
-    /* during a live resize, we will have around a stale layer until the
-     * refresh messages travel back from the vim process.  we push the old
-     * layer in at an offset to get rid of jitter due to lines changing position.  */
-
-    CGSize layerSize = CGLayerGetSize(l);
-    CGSize frameSize = [self frame].size;
-    NSRect drawRect = NSMakeRect(0, frameSize.height - layerSize.height, layerSize.width, layerSize.height);
-
-    CGContextDrawLayerInRect([context graphicsPort], drawRect, l);
-
+    if (cgLayerEnabled) {
+        // during a live resize, we will have around a stale layer until the
+        // refresh messages travel back from the vim process. We push the old
+        // layer in at an offset to get rid of jitter due to lines changing
+        // position.
+        CGLayerRef l = [self getCGLayer];
+        CGSize cgLayerSize = CGLayerGetSize(l);
+        CGSize frameSize = [self frame].size;
+        NSRect drawRect = NSMakeRect(
+                0,
+                frameSize.height - cgLayerSize.height,
+                cgLayerSize.width,
+                cgLayerSize.height);
+
+        CGContextDrawLayerInRect([context graphicsPort], drawRect, l);
+    }
 }
 
 - (void)performBatchDrawWithData:(NSData *)data
@@ -618,30 +622,44 @@ - (void)performBatchDrawWithData:(NSData *)data
         [self display];
 }
 
-- (void)releaseLayer
+- (void)setCGLayerEnabled:(BOOL)enabled
+{
+    cgLayerEnabled = enabled;
+
+    if (!cgLayerEnabled)
+        [self releaseCGLayer];
+}
+
+- (void)releaseCGLayer
 {
-   if (layer)  {
-      CGLayerRelease(layer);
-      layer = nil;
-      layerContext = nil;
-   }
+    if (cgLayer)  {
+        CGLayerRelease(cgLayer);
+        cgLayer = nil;
+        cgLayerContext = nil;
+    }
 }
-- (CGLayerRef)getLayer
+
+- (CGLayerRef)getCGLayer
 {
-    if (!layer) {
+    NSParameterAssert(cgLayerEnabled);
+    if (!cgLayer) {
         NSGraphicsContext *context = [NSGraphicsContext currentContext];
         NSRect frame = [self frame];
-        layer = CGLayerCreateWithContext([context graphicsPort], frame.size, NULL);
+        cgLayer = CGLayerCreateWithContext(
+            [context graphicsPort], frame.size, NULL);
     }
-    return layer;
+    return cgLayer;
 }
 
-- (CGContextRef)getLayerContext
+- (CGContextRef)getCGContext
 {
-   if (!layerContext)
-      layerContext = CGLayerGetContext([self getLayer]);
-
-   return layerContext;
+    if (cgLayerEnabled) {
+        if (!cgLayerContext)
+            cgLayerContext = CGLayerGetContext([self getCGLayer]);
+        return cgLayerContext;
+    } else {
+        return [[NSGraphicsContext currentContext] graphicsPort];
+    }
 }
 
 
@@ -948,13 +966,18 @@ - (void)batchDrawData:(NSData *)data
                                  column:col
                                 numRows:height
                              numColumns:width];
-
-            CGContextRef context = [self getLayerContext];
-            CGImageRef cgImage = [signImg CGImageForProposedRect:&r
-                                                         context:nil
-                                                           hints:nil];
-
-            CGContextDrawImage(context, r, cgImage);
+            if (cgLayerEnabled) {
+                CGContextRef context = [self getCGContext];
+                CGImageRef cgImage = [signImg CGImageForProposedRect:&r
+                                                             context:nil
+                                                               hints:nil];
+                CGContextDrawImage(context, r, cgImage);
+            } else {
+                [signImg drawInRect:r
+                           fromRect:NSZeroRect
+                          operation:NSCompositingOperationSourceOver
+                           fraction:1.0];
+            }
         } else if (DrawStringDrawType == type) {
             int bg = *((int*)bytes);  bytes += sizeof(int);
             int fg = *((int*)bytes);  bytes += sizeof(int);
@@ -1060,7 +1083,7 @@ - (void)batchDrawData:(NSData *)data
 #endif
 }
 
-   static CTFontRef
+    static CTFontRef
 lookupFont(NSMutableArray *fontCache, const unichar *chars, UniCharCount count,
            CTFontRef currFontRef)
 {
@@ -1337,7 +1360,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
          withFlags:(int)flags foregroundColor:(int)fg
    backgroundColor:(int)bg specialColor:(int)sp
 {
-    CGContextRef context = [self getLayerContext];
+    CGContextRef context = [self getCGContext];
     NSRect frame = [self bounds];
     float x = col*cellSize.width + insetSize.width;
     float y = frame.size.height - insetSize.height - (1+row)*cellSize.height;
@@ -1455,16 +1478,22 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
 
 - (void)scrollRect:(NSRect)rect lineCount:(int)count
 {
-    CGContextRef context = [self getLayerContext];
-    int yOffset = count * cellSize.height;
-    NSRect clipRect = rect;
-    clipRect.origin.y -= yOffset;
-
-    /* draw self on top of self, offset so as to "scroll" lines vertically. */
-    CGContextSaveGState(context);
-    CGContextClipToRect(context, clipRect);
-    CGContextDrawLayerAtPoint(context, CGPointMake(0, -yOffset), [self getLayer]);
-    CGContextRestoreGState(context);
+    if (cgLayerEnabled) {
+        CGContextRef context = [self getCGContext];
+        int yOffset = count * cellSize.height;
+        NSRect clipRect = rect;
+        clipRect.origin.y -= yOffset;
+
+        // draw self on top of self, offset so as to "scroll" lines vertically
+        CGContextSaveGState(context);
+        CGContextClipToRect(context, clipRect);
+        CGContextDrawLayerAtPoint(
+                context, CGPointMake(0, -yOffset), [self getCGLayer]);
+        CGContextRestoreGState(context);
+    } else {
+        NSSize delta={0, -count * cellSize.height};
+        [self scrollRect:rect by:delta];
+    }
 }
 
 - (void)deleteLinesFromRow:(int)row lineCount:(int)count
@@ -1506,7 +1535,7 @@ - (void)insertLinesAtRow:(int)row lineCount:(int)count
 - (void)clearBlockFromRow:(int)row1 column:(int)col1 toRow:(int)row2
                    column:(int)col2 color:(int)color
 {
-    CGContextRef context = [self getLayerContext];
+    CGContextRef context = [self getCGContext];
     NSRect rect = [self rectFromRow:row1 column:col1 toRow:row2 column:col2];
 
     CGContextSetRGBFillColor(context, RED(color), GREEN(color), BLUE(color),
@@ -1519,8 +1548,8 @@ - (void)clearBlockFromRow:(int)row1 column:(int)col1 toRow:(int)row2
 
 - (void)clearAll
 {
-    [self releaseLayer];
-    CGContextRef context = [self getLayerContext];
+    [self releaseCGLayer];
+    CGContextRef context = [self getCGContext];
     NSRect rect = [self bounds];
     float r = [defaultBackgroundColor redComponent];
     float g = [defaultBackgroundColor greenComponent];
@@ -1536,7 +1565,7 @@ - (void)clearAll
 - (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape
                        fraction:(int)percent color:(int)color
 {
-    CGContextRef context = [self getLayerContext];
+    CGContextRef context = [self getCGContext];
     NSRect rect = [self rectForRow:row column:col numRows:1 numColumns:1];
 
     CGContextSaveGState(context);
@@ -1585,7 +1614,7 @@ - (void)drawInvertedRectAtRow:(int)row column:(int)col numRows:(int)nrows
                    numColumns:(int)ncols
 {
     // TODO: THIS CODE HAS NOT BEEN TESTED!
-    CGContextRef cgctx = [self getLayerContext];
+    CGContextRef cgctx = [self getCGContext];
     CGContextSaveGState(cgctx);
     CGContextSetBlendMode(cgctx, kCGBlendModeDifference);
     CGContextSetRGBFillColor(cgctx, 1.0, 1.0, 1.0, 1.0);

src/MacVim/MMFullScreenWindow.m

@@ -172,6 +172,8 @@ - (void)enterFullScreen
     oldPosition = [view frame].origin;
 
     [view removeFromSuperviewWithoutNeedingDisplay];
+    if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12)
+        [[view textView] setCGLayerEnabled:YES];
     [[self contentView] addSubview:view];
     [self setInitialFirstResponder:[view textView]];
 
@@ -284,6 +286,9 @@ - (void)leaveFullScreen
     [view setFrameOrigin:oldPosition];
     [self close];
 
+    if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12)
+        [[view textView] setCGLayerEnabled:NO];
+
     // Set the text view to initial first responder, otherwise the 'plus'
     // button on the tabline steals the first responder status.
     [target setInitialFirstResponder:[view textView]];

src/MacVim/MMTextView.h

@@ -72,4 +72,5 @@
 // NOT IMPLEMENTED (only in Core Text renderer)
 - (void)deleteSign:(NSString *)signName;
 - (void)setToolTipAtMousePoint:(NSString *)string;
+- (void)setCGLayerEnabled:(BOOL)enabled;
 @end

src/MacVim/MMTextView.m

@@ -517,6 +517,11 @@ - (void)setToolTipAtMousePoint:(NSString *)string
     // ONLY in Core Text!
 }
 
+- (void)setCGLayerEnabled:(BOOL)enabled
+{
+    // ONLY in Core Text!
+}
+
 - (BOOL)isOpaque
 {
     return NO;