diff options
| author | kevin_walzer <kevin_walzer@noemail.net> | 2016-01-09 02:58:47 (GMT) |
|---|---|---|
| committer | kevin_walzer <kevin_walzer@noemail.net> | 2016-01-09 02:58:47 (GMT) |
| commit | dae3f11b479a6a05cd4fe7e208473ca370b7a98f (patch) | |
| tree | 0472f8d999250af4e11717652402caac105a3493 /macosx | |
| parent | 44c8cf885bbaaffb3a2c5fc449c4f57ec7dbda15 (diff) | |
| download | tk-dae3f11b479a6a05cd4fe7e208473ca370b7a98f.zip tk-dae3f11b479a6a05cd4fe7e208473ca370b7a98f.tar.gz tk-dae3f11b479a6a05cd4fe7e208473ca370b7a98f.tar.bz2 | |
Additional fixes for memory leaks, window flickering on OS X 10.11; thanks to Marc Culler for patch
FossilOrigin-Name: 43590ff8ed2ca41b5a6ef7ee3610a89742a618ea
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 10 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 997d306..b965a38 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -105,10 +105,9 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt - (void) _setup: (Tcl_Interp *) interp { _eventInterp = interp; - _mainPool = nil; + _mainPool = [NSAutoreleasePool new]; [NSApp setPoolProtected:NO]; _defaultMainMenu = nil; - NSAutoreleasePool *pool = [NSAutoreleasePool new]; [self _setupMenus]; [self setDelegate:self]; #ifdef TK_MAC_DEBUG_NOTIFICATIONS @@ -117,7 +116,6 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt #endif [self _setupWindowNotifications]; [self _setupApplicationNotifications]; - [pool drain]; } - (NSString *) tkFrameworkImagePath: (NSString *) image diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 95ebb25..461a94c 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -165,6 +165,10 @@ extern BOOL opaqueTag; if (winPtr) { TkGenWMDestroyEvent((Tk_Window) winPtr); + if (_windowWithMouse == w) { + _windowWithMouse = nil; + [w release]; + } } /* @@ -858,12 +862,9 @@ ConfigureRestrictProc( /* * 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]; + NSDisableScreenUpdates(); /* Disable Tk drawing until the window has been completely configured.*/ TkMacOSXSetDrawingEnabled(winPtr, 0); @@ -887,6 +888,7 @@ ConfigureRestrictProc( while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {} [w enableFlushWindow]; [w flushWindowIfNeeded]; + NSEnableScreenUpdates(); [NSApp setPoolProtected:NO]; } } diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 308ee11..3ea2f51 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -902,6 +902,8 @@ TkWmDeadWindow( [front makeKeyAndOrderFront:NSApp]; } } + [NSApp _resetAutoreleasePool]; + #if DEBUG_ZOMBIES > 0 fprintf(stderr, "================= Pool dump ===================\n"); [NSAutoreleasePool showPools]; |