Merge pull request #486 from s4y/s4y/resize_flicker

Fix flashing during window resizing.

Author: splhack

src/MacVim/MMCoreTextView.h

@@ -31,6 +31,7 @@
     BOOL                        antialias;
     BOOL                        ligatures;
     BOOL                        thinStrokes;
+    BOOL                        drawPending;
     NSMutableArray              *drawData;
 
     MMTextViewHelper            *helper;
@@ -96,6 +97,7 @@
 //
 // NSTextView methods
 //
+- (void)setFrameSize:(NSSize)newSize;
 - (void)keyDown:(NSEvent *)event;
 - (void)insertText:(id)string;
 - (void)doCommandBySelector:(SEL)selector;

src/MacVim/MMCoreTextView.m

@@ -446,6 +446,14 @@ - (BOOL)_wantsKeyDownForEvent:(id)event
     return YES;
 }
 
+- (void)setFrameSize:(NSSize)newSize {
+    if (!drawPending && !NSEqualSizes(newSize, self.frame.size) && drawData.count == 0) {
+        [NSAnimationContext beginGrouping];
+        drawPending = YES;
+    }
+    [super setFrameSize:newSize];
+}
+
 - (void)keyDown:(NSEvent *)event
 {
     [helper keyDown:event];
@@ -650,11 +658,10 @@ - (void)performBatchDrawWithData:(NSData *)data
     } else {
         [drawData addObject:data];
         [self setNeedsDisplay:YES];
-
-        // NOTE: During resizing, Cocoa only sends draw messages before Vim's rows
-        // and columns are changed (due to ipc delays). Force a redraw here.
-        if ([self inLiveResize])
-           [self display];
+    }
+    if (drawPending) {
+        [NSAnimationContext endGrouping];
+        drawPending = NO;
     }
 }
 

src/MacVim/MMVimController.m

@@ -554,15 +554,9 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
 {
     if (OpenWindowMsgID == msgid) {
         [windowController openWindow];
-
-        // HACK: Delay actually presenting the window onscreen until after
-        // processing the queue since it contains drawing commands that need to
-        // be issued before presentation; otherwise the window may flash white
-        // just as it opens.
-        if (!isPreloading)
-            [windowController performSelector:@selector(presentWindow:)
-                                   withObject:nil
-                                   afterDelay:0];
+        if (!isPreloading) {
+            [windowController presentWindow:nil];
+        }
     } else if (BatchDrawMsgID == msgid) {
         [[[windowController vimView] textView] performBatchDrawWithData:data];
     } else if (SelectTabMsgID == msgid) {

src/MacVim/MMVimView.m

@@ -909,7 +909,7 @@ - (void)frameSizeMayHaveChanged
                    "%dx%d (%s)", cols, rows, constrained[1], constrained[0],
                    MessageStrings[msgid]);
 
-        [vimController sendMessage:msgid data:data];
+        [vimController sendMessageNow:msgid data:data timeout:1];
 
         // We only want to set the window title if this resize came from
         // a live-resize, not (for example) setting 'columns' or 'lines'.

src/MacVim/MMWindowController.m

@@ -697,37 +697,6 @@ - (void)liveResizeDidEnd
     NSConnection *connection = [(NSDistantObject*)proxy connectionForProxy];
     [connection removeRequestMode:NSEventTrackingRunLoopMode];
 
-    // NOTE: During live resize messages from MacVim to Vim are often dropped
-    // (because too many messages are sent at once).  This may lead to
-    // inconsistent states between Vim and MacVim; to avoid this we send a
-    // synchronous resize message to Vim now (this is not fool-proof, but it
-    // does seem to work quite well).
-    // Do NOT send a SetTextDimensionsMsgID message (as opposed to
-    // LiveResizeMsgID) since then the view is constrained to not be larger
-    // than the screen the window mostly occupies; this makes it impossible to
-    // resize the window across multiple screens.
-
-    int constrained[2];
-    NSSize textViewSize = [[vimView textView] frame].size;
-    [[vimView textView] constrainRows:&constrained[0] columns:&constrained[1]
-                               toSize:textViewSize];
-
-    ASLogDebug(@"End of live resize, notify Vim that text dimensions are %dx%d",
-               constrained[1], constrained[0]);
-
-    NSData *data = [NSData dataWithBytes:constrained length:2*sizeof(int)];
-    BOOL sendOk = [vimController sendMessageNow:LiveResizeMsgID
-                                           data:data
-                                        timeout:.5];
-
-    if (!sendOk) {
-        // Sending of synchronous message failed.  Force the window size to
-        // match the last dimensions received from Vim, otherwise we end up
-        // with inconsistent states.
-        [self resizeWindowToFitContentSize:[vimView desiredSize]
-                              keepOnScreen:NO];
-    }
-
     // If we saved the original title while resizing, restore it.
     if (lastSetTitle != nil) {
         [decoratedWindow setTitle:lastSetTitle];