Fix for some redraw issues on Tk-Cocoa on OS X 10.11; further refinement of memory management; thanks to Marc Culler for patches

1 files changed, 28 insertions, 16 deletions

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 851358d..1150f2e 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -806,7 +806,7 @@ ConfigureRestrictProc(
 {
     const NSRect *rectsBeingDrawn;
     NSInteger rectsBeingDrawnCount;
-
+    
     [self getRectsBeingDrawn:&rectsBeingDrawn count:&rectsBeingDrawnCount];
 
 #ifdef TK_MAC_DEBUG_DRAWING
@@ -840,7 +840,8 @@ ConfigureRestrictProc(
 
 -(void) setFrameSize: (NSSize)newsize
 {
-    if ( [self inLiveResize] ) {
+    [super setFrameSize: newsize];
+    if ([self inLiveResize]) {
 	NSWindow *w = [self window];
 	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 	Tk_Window tkwin = (Tk_Window) winPtr;
@@ -849,17 +850,29 @@ ConfigureRestrictProc(
 	ClientData oldArg;
     	Tk_RestrictProc *oldProc;
 
-	/* Resize the NSView */
-	[super setFrameSize: newsize];
-
-	/* Disable drawing until the window has been completely configured.*/
+	/* This can be called from outside the Tk event loop.
+	 * Since it calls Tcl_DoOneEvent, we need to make sure we
+	 * don't clobber the AutoreleasePool set up by the caller.
+	 */
+	[NSApp setPoolProtected:YES];
+	
+	/*
+	 * Try to prevent flickers and flashes.
+	 *
+	 * This stops the flickers on OSX 10.11. But flashes still occur when
+	 * the width of the window is 16, 32, 48, 64, 80, 96, 112, 256, 512,
+	 * 768, ... :^(
+	 */
+	[w disableFlushWindow];
+	
+	/* Disable Tk drawing until the window has been completely configured.*/
 	TkMacOSXSetDrawingEnabled(winPtr, 0);
 
 	 /* Generate and handle a ConfigureNotify event for the new size.*/
 	TkGenWMConfigureEvent(tkwin, Tk_X(tkwin), Tk_Y(tkwin), width, height,
 			      TK_SIZE_CHANGED | TK_MACOSX_HANDLE_EVENT_IMMEDIATELY);
     	oldProc = Tk_RestrictEvents(ConfigureRestrictProc, NULL, &oldArg);
-	while ( Tk_DoOneEvent(TK_X_EVENTS|TK_DONT_WAIT) ) {}
+	while (Tk_DoOneEvent(TK_X_EVENTS|TK_DONT_WAIT)) {}
     	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
 
 	/* Now that Tk has configured all subwindows we can create the clip regions. */
@@ -871,9 +884,10 @@ ConfigureRestrictProc(
 	HIRect bounds = NSRectToCGRect([self bounds]);
 	HIShapeRef shape = HIShapeCreateWithRect(&bounds);
 	[self generateExposeEvents: shape];
-	while ( Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT) ) {}
-    } else {
-        [super setFrameSize: newsize];
+	while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {}
+	[w enableFlushWindow];
+	[w flushWindowIfNeeded];
+	[NSApp setPoolProtected:NO];
     }
 }
 
@@ -891,12 +905,10 @@ ConfigureRestrictProc(
     [self generateExposeEvents: shape];
 }
 
-/* Core method of this class: generates expose events for redrawing.
- * Whereas drawRect is intended to be called only from the Appkit event
- * loop, this can be called from Tk.  If the Tcl_ServiceMode is set to
- * TCL_SERVICE_ALL then the expose events will be immediately removed
- * from the Tcl event loop and processed.  Typically, they should be queued,
- * however.
+/* Core method of this class: generates expose events for redrawing.  If the
+ * Tcl_ServiceMode is set to TCL_SERVICE_ALL then the expose events will be
+ * immediately removed from the Tcl event loop and processed.  Typically, they
+ * should be queued, however.
  */
 - (void) generateExposeEvents: (HIShapeRef) shape
 {