Skip to content

Commit

Permalink
Reworked fullscreen policy on Mac OS X.
Browse files Browse the repository at this point in the history 
- SDL_WINDOW_FULLSCREEN works as always (change resolution, lock to window).
- SDL_WINDOW_FULLSCREEN_DESKTOP now puts the window in its own Space, and
  hides the menu bar, but you can slide between Spaces and Command-Tab between
  apps without the window minimizing, etc.
- SDL_WINDOW_RESIZABLE windows will get the new 10.7+ "toggle fullscreen"
  window decoration and menubar item. As far as the app is concerned, this is
  no different than resizing a window, but it gives the end-user more power.
- The hint for putting fullscreen windows into the Spaces system is gone,
  since Spaces can't enforce the requested resolution. It's a perfect match
  for FULLSCREEN_DESKTOP, though, so this is all automated now.
  • Loading branch information
@icculus
icculus committed Mar 2, 2014
1 parent afc74d9 commit 51faf44
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 39 deletions.
11 changes: 0 additions & 11 deletions include/SDL_hints.h
View file
Expand Up @@ -200,17 +200,6 @@ extern "C" {
*/
#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"

/**
* \brief Set whether windows go fullscreen in their own spaces on Mac OS X
*
* This variable can be set to the following values:
* "0" - Fullscreen windows will use the classic fullscreen mode
* "1" - Fullscreen windows will use fullscreen spaces
*
* By default SDL will use the classic fullscreen mode.
*/
#define SDL_HINT_VIDEO_FULLSCREEN_SPACES "SDL_VIDEO_FULLSCREEN_SPACES"

/**
* \brief A variable controlling whether the idle timer is disabled on iOS.
*
Expand Down
63 changes: 35 additions & 28 deletions src/video/cocoa/SDL_cocoawindow.m
View file
Expand Up @@ -121,7 +121,9 @@ static void ConvertNSRect(NSRect *r)
{
unsigned int style;

if (window->flags & SDL_WINDOW_FULLSCREEN) {
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
style = (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask);
} else if (window->flags & SDL_WINDOW_FULLSCREEN) {
style = NSBorderlessWindowMask;
} else {
if (window->flags & SDL_WINDOW_BORDERLESS) {
Expand Down Expand Up @@ -256,20 +258,17 @@ -(void) resumeVisibleObservation
}
}

-(BOOL) setFullscreenSpace:(BOOL) state;
-(BOOL) setFullscreenSpace:(BOOL) state
{
SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow;

if (![nswindow respondsToSelector: @selector(collectionBehavior)]) {
return NO;
}
if ([nswindow collectionBehavior] != NSWindowCollectionBehaviorFullScreenPrimary) {
return NO;
}

if (state == isFullscreenSpace) {
return YES;
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP) {
return NO; /* we only allow this on FULLSCREEN_DESKTOP windows. */
} else if (![nswindow respondsToSelector: @selector(setCollectionBehavior:)]) {
return NO; /* No Spaces support? Older Mac OS X? */
} else if (state == isFullscreenSpace) {
return YES; /* already there. */
}

if (inFullscreenTransition) {
Expand All @@ -282,13 +281,8 @@ -(BOOL) setFullscreenSpace:(BOOL) state;
}
inFullscreenTransition = YES;

/* Update the flags here so the state change is available immediately */
if (state) {
window->flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
} else {
window->flags &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
}

/* you need to be FullScreenPrimary, or toggleFullScreen doesn't work. Unset it again in windowDid[Enter|Exit]FullScreen. */
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
[nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO];
return YES;
}
Expand Down Expand Up @@ -443,6 +437,11 @@ - (void)windowDidMove:(NSNotification *)aNotification

- (void)windowDidResize:(NSNotification *)aNotification
{
if (inFullscreenTransition) {
/* We'll take care of this at the end of the transition */
return;
}

SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow;
int x, y, w, h;
Expand All @@ -453,11 +452,6 @@ - (void)windowDidResize:(NSNotification *)aNotification
w = (int)rect.size.width;
h = (int)rect.size.height;

if (inFullscreenTransition) {
/* We'll take care of this at the end of the transition */
return;
}

if (SDL_IsShapedWindow(window)) {
Cocoa_ResizeWindowShape(window);
}
Expand Down Expand Up @@ -538,7 +532,6 @@ - (void)windowWillEnterFullScreen:(NSNotification *)aNotification
{
SDL_Window *window = _data->window;

window->flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
SetWindowStyle(window, (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask));

isFullscreenSpace = YES;
Expand All @@ -548,13 +541,20 @@ - (void)windowWillEnterFullScreen:(NSNotification *)aNotification
- (void)windowDidEnterFullScreen:(NSNotification *)aNotification
{
SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow;

inFullscreenTransition = NO;

if (pendingWindowOperation == PENDING_OPERATION_LEAVE_FULLSCREEN) {
pendingWindowOperation = PENDING_OPERATION_NONE;
[self setFullscreenSpace:NO];
} else {
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
/* Remove the fullscreen toggle button and menu now that we're here. */
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorManaged];
[NSMenu setMenuBarVisible:NO];
}

pendingWindowOperation = PENDING_OPERATION_NONE;
/* Force the size change event in case it was delivered earlier
while the window was still animating into place.
Expand All @@ -569,7 +569,6 @@ - (void)windowWillExitFullScreen:(NSNotification *)aNotification
{
SDL_Window *window = _data->window;

window->flags &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
SetWindowStyle(window, GetWindowStyle(window));

isFullscreenSpace = NO;
Expand All @@ -590,6 +589,12 @@ - (void)windowDidExitFullScreen:(NSNotification *)aNotification
pendingWindowOperation = PENDING_OPERATION_NONE;
[nswindow miniaturize:nil];
} else {
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
/* Remove the fullscreen toggle button and readd menu now that we're here. */
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorManaged];
[NSMenu setMenuBarVisible:YES];
}

pendingWindowOperation = PENDING_OPERATION_NONE;
/* Force the size change event in case it was delivered earlier
while the window was still animating into place.
Expand Down Expand Up @@ -1007,9 +1012,11 @@ - (void)resetCursorRects
return -1;
}
[nswindow setBackgroundColor:[NSColor blackColor]];
if ([nswindow respondsToSelector:@selector(setCollectionBehavior:)]) {
const char *hint = SDL_GetHint(SDL_HINT_VIDEO_FULLSCREEN_SPACES);
if (hint && SDL_atoi(hint) > 0) {

if ([nswindow respondsToSelector: @selector(setCollectionBehavior:)]) {
/* we put FULLSCREEN_DESKTOP windows in their own Space, without a toggle button or menubar, later */
if (window->flags & SDL_WINDOW_RESIZABLE) {
/* resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar. */
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
}
}
Expand Down

0 comments on commit 51faf44

Please sign in to comment.