resolve fork

3 files changed, 26 insertions, 60 deletions

diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index d6f9ef1..8054c57 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -669,20 +669,25 @@ TkpConfigureMenuEntry(
 		submenu = nil;
 	    } else {
 		[submenu setTitle:title];
+
+    		if ([menuItem isEnabled]) {
+		  /* This menuItem might have been previously disabled (XXX:
+		     track this), which would have disabled entries; we must
+		     re-enable the entries here. */
+		  int i = 0;
+		  NSArray *itemArray = [submenu itemArray];
+		  for (NSMenuItem *item in itemArray) {
+		    TkMenuEntry *submePtr = menuRefPtr->menuPtr->entries[i];
+		    [item setEnabled: !(submePtr->state == ENTRY_DISABLED)];
+		    i++;
+		  }
+		}
+
 	    }
 	}
     }
     [menuItem setSubmenu:submenu];
 
-    /*Disabling parent menu disables entries; we must re-enable the entries here.*/
-    NSArray *itemArray = [submenu itemArray];
-    
-    if ([menuItem isEnabled]) {
-	    for (NSMenuItem *item in itemArray) {
-		    [item setEnabled:YES];
-	    }
-	}
-
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 722ac9d..50c6702 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -417,7 +417,6 @@ GenerateActivateEvents(
 {
     TkGenerateActivateEvents(winPtr, activeFlag);
     TkMacOSXGenerateFocusEvent(winPtr, activeFlag);
-    TkMacOSXEnterExitFullscreen(winPtr, activeFlag);
     return true;
 }
 
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index f2cb572..9ac0369 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6268,6 +6268,7 @@ TkMacOSXMakeFullscreen(
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     int result = TCL_OK, wasFullscreen = (wmPtr->flags & WM_FULLSCREEN);
+    static unsigned long prevMask = 0, prevPres = 0;
 
     if (fullscreen) {
 	int screenWidth =  WidthOfScreen(Tk_Screen(winPtr));
@@ -6305,10 +6306,20 @@ TkMacOSXMakeFullscreen(
 	    }
 	    wmPtr->flags |= WM_FULLSCREEN;
 	}
+
+	prevMask = [window styleMask];
+	prevPres = [NSApp presentationOptions];
+	[window setStyleMask: NSBorderlessWindowMask];
+	[NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock
+	                          | NSApplicationPresentationAutoHideMenuBar];
+
     } else {
 	wmPtr->flags &= ~WM_FULLSCREEN; 
+
+	[NSApp setPresentationOptions: prevPres];
+	[window setStyleMask: prevMask];
     }
-    TkMacOSXEnterExitFullscreen(winPtr, [window isKeyWindow]);
+
     if (wasFullscreen && !(wmPtr->flags & WM_FULLSCREEN)) {
 	UInt64 oldAttributes = wmPtr->attributes;
 	NSRect bounds = NSMakeRect(wmPtr->configX, tkMacOSXZeroScreenHeight -
@@ -6330,55 +6341,6 @@ TkMacOSXMakeFullscreen(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXEnterExitFullscreen --
- *
- *	This procedure enters or exits fullscreen mode if required.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkMacOSXEnterExitFullscreen(
-    TkWindow *winPtr,
-    int active)
-{
-    WmInfo *wmPtr = winPtr->wmInfoPtr;
-    NSWindow *window = TkMacOSXDrawableWindow(winPtr->window);
-    SystemUIMode mode;
-    SystemUIOptions options;
-
-    GetSystemUIMode(&mode, &options);
-    if (window && wmPtr && (wmPtr->flags & WM_FULLSCREEN) && active) {
-	static SystemUIMode fullscreenMode = 0;
-	static SystemUIOptions fullscreenOptions = 0;
-
-	if (!fullscreenMode) {
-	    fullscreenMode = kUIModeAllSuppressed;
-	}
-	if (mode != fullscreenMode) {
-	    ChkErr(SetSystemUIMode, fullscreenMode, fullscreenOptions);
-	    wmPtr->flags |= WM_SYNC_PENDING;
-	    [window setFrame:[window frameRectForContentRect:NSMakeRect(0, 0,
-		    WidthOfScreen(Tk_Screen(winPtr)),
-		    HeightOfScreen(Tk_Screen(winPtr)))] display:YES];
-	    wmPtr->flags &= ~WM_SYNC_PENDING;
-	}
-    } else {
-	if (mode != kUIModeNormal) {
-	    ChkErr(SetSystemUIMode, kUIModeNormal, 0);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * GetMinSize --
  *
  *	This function computes the current minWidth and minHeight values for a