Commit 51faf449bbc219fafee58b825f8ac845ba5fcc15
2014-03-02T12:45:51
Reworked fullscreen policy on Mac OS X. - 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170
diff --git a/include/SDL_hints.h b/include/SDL_hints.h
index 9fd9dae..540f0d8 100644
--- a/include/SDL_hints.h
+++ b/include/SDL_hints.h
@@ -201,17 +201,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.
*
* When an iOS app does not receive touches for some time, the screen is
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index c1c0caa..f6b5843 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -121,7 +121,9 @@ GetWindowStyle(SDL_Window * window)
{
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) {
@@ -256,20 +258,17 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
}
}
--(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) {
@@ -282,13 +281,8 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
}
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;
}
@@ -443,6 +437,11 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
- (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;
@@ -453,11 +452,6 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
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);
}
@@ -538,7 +532,6 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
{
SDL_Window *window = _data->window;
- window->flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
SetWindowStyle(window, (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask));
isFullscreenSpace = YES;
@@ -548,6 +541,7 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
- (void)windowDidEnterFullScreen:(NSNotification *)aNotification
{
SDL_Window *window = _data->window;
+ NSWindow *nswindow = _data->nswindow;
inFullscreenTransition = NO;
@@ -555,6 +549,12 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
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.
@@ -569,7 +569,6 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
{
SDL_Window *window = _data->window;
- window->flags &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
SetWindowStyle(window, GetWindowStyle(window));
isFullscreenSpace = NO;
@@ -590,6 +589,12 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
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.
@@ -1007,9 +1012,11 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window)
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];
}
}