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, 35 insertions, 33 deletions

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index c703297..0737d74 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -49,7 +49,7 @@ static void TkMacOSXEventsCheckProc(ClientData clientData, int flags);
 @end
 
 @implementation TKApplication(TKNotify)
-/* Call super then redisplay all of our windows. */
+/* Display all windows each time an event is removed from the queue.*/
 - (NSEvent *)nextEventMatchingMask:(NSUInteger)mask
 	untilDate:(NSDate *)expiration inMode:(NSString *)mode
 	dequeue:(BOOL)deqFlag {
@@ -57,9 +57,9 @@ static void TkMacOSXEventsCheckProc(ClientData clientData, int flags);
 					untilDate:expiration
 					   inMode:mode
 					  dequeue:deqFlag];
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
+    /* Retain this event for later use. Must be released.*/
+    [event retain];
     [NSApp makeWindowsPerform:@selector(tkDisplayIfNeeded) inOrder:NO];
-    [pool drain];
     return event;
 }
 
@@ -67,10 +67,8 @@ static void TkMacOSXEventsCheckProc(ClientData clientData, int flags);
  * Call super then check the pasteboard.
   */
 - (void)sendEvent:(NSEvent *)theEvent {
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
     [super sendEvent:theEvent];
     [NSApp tkCheckPasteboard];
-    [pool drain];
 }
 @end
 
@@ -191,7 +189,7 @@ TkMacOSXNotifyExitHandler(
  * TkMacOSXEventsSetupProc --
  *
  *	This procedure implements the setup part of the MacOSX event
- *	source. It is invoked by Tcl_DoOneEvent before calling 
+ *	source. It is invoked by Tcl_DoOneEvent before calling
  *      TkMacOSXEventsProc to process all queued NSEvents.  In our
  *      case, all we need to do is to set the Tcl MaxBlockTime to
  *      0 before starting the loop to process all queued NSEvents.
@@ -200,7 +198,7 @@ TkMacOSXNotifyExitHandler(
  *	None.
  *
  * Side effects:
- *      
+ *
  *	If NSEvents are queued, then the maximum block time will be set
  *	to 0 to ensure that control returns immediately to Tcl.
  *
@@ -212,19 +210,21 @@ TkMacOSXEventsSetupProc(
     ClientData clientData,
     int flags)
 {
-    if (flags & TCL_WINDOW_EVENTS &&
-	![[NSRunLoop currentRunLoop] currentMode]) {
+    NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
+    /* runloopMode will be nil if we are in the Tcl event loop. */
+    if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
 	static Tcl_Time zeroBlockTime = { 0, 0 };
-	NSAutoreleasePool *pool = [NSAutoreleasePool new];
- 	/* Call this with dequeue=NO -- just checking if the queue is empty. */ 
+	/* Call this with dequeue=NO -- just checking if the queue is empty. */
 	NSEvent *currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
- 						   untilDate:[NSDate distantPast]
- 						      inMode:GetRunLoopMode(TkMacOSXGetModalSession())
- 						     dequeue:NO];
-	if (currentEvent && currentEvent.type > 0) {
-	    Tcl_SetMaxBlockTime(&zeroBlockTime);
+				       untilDate:[NSDate distantPast]
+				       inMode:GetRunLoopMode(TkMacOSXGetModalSession())
+				       dequeue:NO];
+	if (currentEvent) {
+	    if (currentEvent.type > 0) {
+		Tcl_SetMaxBlockTime(&zeroBlockTime);
+	    }
+	    [currentEvent release];
 	}
-	[pool drain];
     }
 }
 
@@ -251,13 +251,14 @@ TkMacOSXEventsCheckProc(
     int flags)
 {
     NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
+    /* runloopMode will be nil if we are in the Tcl event loop. */
     if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
-
 	NSEvent *currentEvent = nil;
 	NSEvent *testEvent = nil;
 	NSModalSession modalSession;
 
 	do {
+	    [NSApp _resetAutoreleasePool];
 	    modalSession = TkMacOSXGetModalSession();
 	    testEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 					      untilDate:[NSDate distantPast]
@@ -272,25 +273,26 @@ TkMacOSXEventsCheckProc(
 					      untilDate:[NSDate distantPast]
 						 inMode:GetRunLoopMode(modalSession)
 						dequeue:YES];
-	    if (!currentEvent) {
-		break; /* No events are available. */
-	    }
-	    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-	    /* Generate Xevents. */
-	    int oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-	    NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
-	    Tcl_SetServiceMode(oldServiceMode);
-	    if (processedEvent) { /* Should always be non-NULL. */
+	    if (currentEvent) {
+		[NSApp _resetAutoreleasePool];
+		/* Generate Xevents. */
+		int oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
+		NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
+		Tcl_SetServiceMode(oldServiceMode);
+		if (processedEvent) { /* Should always be non-NULL. */
 #ifdef TK_MAC_DEBUG_EVENTS
-		TKLog(@"   event: %@", currentEvent);
+		    TKLog(@"   event: %@", currentEvent);
 #endif
-		if (modalSession) {
-		    [NSApp _modalSession:modalSession sendEvent:currentEvent];
-		} else {
-		    [NSApp sendEvent:currentEvent];
+		    if (modalSession) {
+			[NSApp _modalSession:modalSession sendEvent:currentEvent];
+		    } else {
+			[NSApp sendEvent:currentEvent];
+		    }
 		}
+		[currentEvent release];
+	    } else {
+		break;
 	    }
-	    [pool drain];
 	} while (1);
     }
 }