ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-26 00:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fullscreen space naming cleanup to avoid confusion with normal fullscreen mode

Browse source
This commit is contained in:
Sam Lantinga 2013-11-12 00:32:29 -08:00
parent 7459b159e0
commit 5f8a0b18d3
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video/cocoa/SDL_cocoawindow.h
View file

@ -40,7 +40,7 @@ typedef enum
BOOL observingVisible; BOOL observingVisible;
BOOL wasCtrlLeft; BOOL wasCtrlLeft;
BOOL wasVisible; BOOL wasVisible;
BOOL isFullscreen; BOOL isFullscreenSpace;
BOOL inFullscreenTransition; BOOL inFullscreenTransition;
PendingWindowOperation pendingWindowOperation; PendingWindowOperation pendingWindowOperation;
} }
@ -48,7 +48,7 @@ typedef enum
-(void) listen:(SDL_WindowData *) data; -(void) listen:(SDL_WindowData *) data;
-(void) pauseVisibleObservation; -(void) pauseVisibleObservation;
-(void) resumeVisibleObservation; -(void) resumeVisibleObservation;
-(BOOL) setFullscreenState:(BOOL) state; -(BOOL) setFullscreenSpace:(BOOL) state;
-(BOOL) isInFullscreenTransition; -(BOOL) isInFullscreenTransition;
-(void) addPendingWindowOperation:(PendingWindowOperation) operation; -(void) addPendingWindowOperation:(PendingWindowOperation) operation;
-(void) close; -(void) close;

42
src/video/cocoa/SDL_cocoawindow.m
View file

@ -101,7 +101,7 @@ GetWindowStyle(SDL_Window * window)
observingVisible = YES; observingVisible = YES;
wasCtrlLeft = NO; wasCtrlLeft = NO;
wasVisible = [window isVisible]; wasVisible = [window isVisible];
isFullscreen = NO; isFullscreenSpace = NO;
inFullscreenTransition = NO; inFullscreenTransition = NO;
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
@ -184,34 +184,38 @@ GetWindowStyle(SDL_Window * window)
} }
} }
-(BOOL) setFullscreenState:(BOOL) state; -(BOOL) setFullscreenSpace:(BOOL) state;
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
SDL_Window *window = _data->window; SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow; NSWindow *nswindow = _data->nswindow;
BOOL canSetState = NO; BOOL canSetSpace = NO;
/* Make sure we can support this fullscreen style */ /* Make sure the window supports switching to fullscreen spaces */
if (![nswindow respondsToSelector: @selector(toggleFullScreen:)]) { if (![nswindow respondsToSelector: @selector(collectionBehavior)]) {
return NO;
}
if ([nswindow collectionBehavior] != NSWindowCollectionBehaviorFullScreenPrimary) {
return NO; return NO;
} }
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
/* We can enter new style fullscreen mode for "fullscreen desktop" */ /* We can enter fullscreen spaces for "fullscreen desktop" */
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) { if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
canSetState = YES; canSetSpace = YES;
} }
/* We can always leave new style fullscreen mode */ /* We can always leave fullscreen spaces */
if (!state && isFullscreen) { if (!state && isFullscreenSpace) {
canSetState = YES; canSetSpace = YES;
} }
if (!canSetState) { if (!canSetSpace) {
return NO; return NO;
} }
if (state == isFullscreen) { if (state == isFullscreenSpace) {
return YES; return YES;
} }
@ -226,6 +230,9 @@ GetWindowStyle(SDL_Window * window)
[nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO]; [nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO];
return YES; return YES;
#else
return NO
#endif /* SDK >= 10.7 */
} }
-(BOOL) isInFullscreenTransition -(BOOL) isInFullscreenTransition
@ -430,19 +437,20 @@ GetWindowStyle(SDL_Window * window)
} }
} }
isFullscreen = YES; isFullscreenSpace = YES;
inFullscreenTransition = YES; inFullscreenTransition = YES;
} }
- (void)windowDidEnterFullScreen:(NSNotification *)aNotification - (void)windowDidEnterFullScreen:(NSNotification *)aNotification
{ {
SDL_Window *window = _data->window; SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow;
inFullscreenTransition = NO; inFullscreenTransition = NO;
if (pendingWindowOperation == PENDING_OPERATION_LEAVE_FULLSCREEN) { if (pendingWindowOperation == PENDING_OPERATION_LEAVE_FULLSCREEN) {
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
[self setFullscreenState:NO]; [self setFullscreenSpace:NO];
} else { } else {
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
/* Force the size change event in case it was delivered earlier /* Force the size change event in case it was delivered earlier
@ -466,7 +474,7 @@ GetWindowStyle(SDL_Window * window)
window->flags = flags; window->flags = flags;
} }
isFullscreen = NO; isFullscreenSpace = NO;
inFullscreenTransition = YES; inFullscreenTransition = YES;
} }
@ -479,7 +487,7 @@ GetWindowStyle(SDL_Window * window)
if (pendingWindowOperation == PENDING_OPERATION_ENTER_FULLSCREEN) { if (pendingWindowOperation == PENDING_OPERATION_ENTER_FULLSCREEN) {
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
[self setFullscreenState:YES]; [self setFullscreenSpace:YES];
} else if (pendingWindowOperation == PENDING_OPERATION_MINIMIZE) { } else if (pendingWindowOperation == PENDING_OPERATION_MINIMIZE) {
pendingWindowOperation = PENDING_OPERATION_NONE; pendingWindowOperation = PENDING_OPERATION_NONE;
[nswindow miniaturize:nil]; [nswindow miniaturize:nil];
@ -1272,7 +1280,7 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
if (![data->listener setFullscreenState:(fullscreen ? YES : NO)]) { if (![data->listener setFullscreenSpace:(fullscreen ? YES : NO)]) {
Cocoa_SetWindowFullscreen_OldStyle(_this, window, display, fullscreen); Cocoa_SetWindowFullscreen_OldStyle(_this, window, display, fullscreen);
} }