Cocoa Port:

- Fix full screen behavior when running on OS X Mavericks or later.

desmume/src/cocoa/userinterface/DisplayWindowController.h

@@ -112,6 +112,8 @@ class OGLVideoOutput;
 	BOOL _isMinSizeNormal;
 	NSUInteger _statusBarHeight;
 	BOOL _isUpdatingDisplayScaleValueOnly;
+	BOOL _useMavericksFullScreen;
+	BOOL _willRestoreStatusBarFromFullScreen;
 	
 	OSSpinLock spinlockScale;
 	OSSpinLock spinlockRotation;

desmume/src/cocoa/userinterface/DisplayWindowController.mm

@@ -114,6 +114,8 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 	_isMinSizeNormal = YES;
 	_statusBarHeight = WINDOW_STATUS_BAR_HEIGHT;
 	_isUpdatingDisplayScaleValueOnly = NO;
+	_useMavericksFullScreen = IsOSXVersionSupported(10, 9, 0);
+	_willRestoreStatusBarFromFullScreen = NO;
 	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(saveScreenshotAsFinish:)
@@ -659,6 +661,12 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 
 - (void) respondToScreenChange:(NSNotification *)aNotification
 {
+	if (_useMavericksFullScreen)
+	{
+		return;
+	}
+	else
+	{
 		// This method only applies for displays in full screen mode. For displays in
 		// windowed mode, we don't need to do anything.
 		if ([self assignedScreen] == nil)
@@ -686,6 +694,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 			screenRect.origin.y = 0.0;
 			[view setFrame:screenRect];
 		}
+	}
 }
 
 #pragma mark IBActions
@@ -790,6 +799,14 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 
 - (IBAction) toggleFullScreenDisplay:(id)sender
 {
+#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+	if (_useMavericksFullScreen)
+	{
+		[masterWindow toggleFullScreen:nil];
+	}
+	else
+#endif
+	{
 		if ([self assignedScreen] == nil)
 		{
 			[self enterFullScreen];
@@ -798,6 +815,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 		{
 			[self exitFullScreen];
 		}
+	}
 }
 
 - (IBAction) toggleExecutePause:(id)sender
@@ -1295,6 +1313,53 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 	[view setFrame:newContentFrame];
 }
 
+- (NSRect)windowWillUseStandardFrame:(NSWindow *)window defaultFrame:(NSRect)newFrame
+{
+	if ([self assignedScreen] != nil)
+	{
+		return newFrame;
+	}
+	
+	NSScreen *targetScreen = [window screen];
+	
+	if (newFrame.size.height > [targetScreen visibleFrame].size.height)
+	{
+		newFrame.size.height = [targetScreen visibleFrame].size.height;
+	}
+	
+	if (newFrame.size.width > [targetScreen visibleFrame].size.width)
+	{
+		newFrame.size.width = [targetScreen visibleFrame].size.width;
+	}
+	
+	NSRect currentFrame = [window frame];
+	BOOL isZooming = (newFrame.size.width > currentFrame.size.width) || (newFrame.size.height > currentFrame.size.height);
+	
+	// Get a content Rect so that we can make our comparison.
+	// This will be based on the proposed frameSize.
+	const NSRect frameRect = newFrame;
+	const NSRect contentRect = [window contentRectForFrameRect:frameRect];
+	
+	// Find the maximum scalar we can use for the display view, bounded by the
+	// content Rect.
+	const NSSize normalBounds = [self normalSize];
+	const CGSize checkSize = GetTransformedBounds(normalBounds.width, normalBounds.height, 1.0, [self displayRotation]);
+	const NSSize contentBounds = NSMakeSize(contentRect.size.width, contentRect.size.height - _statusBarHeight);
+	const double maxS = GetMaxScalarInBounds(checkSize.width, checkSize.height, contentBounds.width, contentBounds.height);
+	
+	// Make a new content Rect with our max scalar, and convert it back to a frame Rect.
+	const NSRect finalContentRect = NSMakeRect(0.0f, 0.0f, checkSize.width * maxS, (checkSize.height * maxS) + _statusBarHeight);
+	NSRect finalFrameRect = [window frameRectForContentRect:finalContentRect];
+	
+	if (isZooming)
+	{
+		finalFrameRect.origin.x = ((currentFrame.origin.x) + (currentFrame.size.width / 2.0f)) - (finalFrameRect.size.width / 2.0f);
+	}
+	
+	// Set the final size based on our new frame Rect.
+	return finalFrameRect;
+}
+
 - (BOOL)windowShouldClose:(id)sender
 {
 	BOOL shouldClose = YES;
@@ -1336,6 +1401,48 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 	[emuControl updateDisplayPanelTitles];
 }
 
+#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+
+- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
+{
+	return [[window screen] frame].size;
+}
+
+- (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
+{
+	[[NSApplication sharedApplication] setPresentationOptions:(NSApplicationPresentationHideDock)];
+	
+	NSApplicationPresentationOptions options = (NSApplicationPresentationHideDock |
+												NSApplicationPresentationAutoHideMenuBar |
+												NSApplicationPresentationFullScreen |
+												NSApplicationPresentationAutoHideToolbar);
+	
+#if defined(MAC_OS_X_VERSION_10_11_2) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11)
+	options |= NSApplicationPresentationDisableCursorLocationAssistance;
+#endif
+	
+	return options;
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification
+{
+	_willRestoreStatusBarFromFullScreen = [self isShowingStatusBar];
+	[self setIsShowingStatusBar:NO];
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+	[self setAssignedScreen:[masterWindow screen]];
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification
+{
+	[self setAssignedScreen:nil];
+	[self setIsShowingStatusBar:_willRestoreStatusBarFromFullScreen];
+}
+
+#endif
+
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
 	BOOL enable = YES;