mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2025-01-12 05:41:10 +01:00
8a6f1aa5f5
Elmar
creating a fullscreen window with SDL_CreateWindow(..SDL_WINDOW_FULLSCREEN_DESKTOP..) in MacOS works fine, except if it was triggered by the user with the green knob in the top left window title bar.
Then "something" is different, and SDL_CreateWindow hangs for 15-20 seconds (tested in MacOS 10.13 and 10.14).
Responsible for the hang is this code in SDL_cocoawindow.m - Cocoa_SetWindowFullscreenSpace:
const int maxattempts = 3;
int attempt = 0;
while (++attempt <= maxattempts) {
/* Wait for the transition to complete, so application changes
take effect properly (e.g. setting the window size, etc.)
*/
const int limit = 10000;
int count = 0;
while ([data->listener isInFullscreenSpaceTransition]) {
if ( ++count == limit ) {
/* Uh oh, transition isn't completing. Should we assert? */
break;
}
SDL_Delay(1);
SDL_PumpEvents();
}
if ([data->listener isInFullscreenSpace] == (state ? YES : NO))
break;
/* Try again, the last attempt was interrupted by user gestures */
if (![data->listener setFullscreenSpace:(state ? YES : NO)])
break; /* ??? */
}
One trivial workaround is to change 'const int limit = 10000' to 500. Then the freeze is so short that it doesn't look like a freeze to the user.
Looking further into the problem, I observed that the function Cocoa_SetWindowFullscreenSpace recursively calls itself via some ObjectiveC messages. I managed to extract a callstack for this (copied below): Note how Cocoa_SetWindowFullscreenSpace in stack line 22 calls SDL_PumpEvents, which eventually arrives at SDL_SendWindowEvent, which calls SDL_UpdateFullscreenMode (stack line 0), which then calls Cocoa_SetWindowFullscreenSpace again (not shown). This recursive second call is the one that hangs.
Another "solution" that worked for me was to add a flag to SDL_Window that is set in Cocoa_SetWindowFullscreenSpace and causes this function to return immediately if called from itself.
Obviously, this is also an ugly hack, but I don't have enough time to dive into this crazy Cocoa/ObjectiveC business deep enough to find a proper solution. But hopefully it's easy for one of the experts around.
Note that there is a "failure to go fullscreen"-message involved, maybe using the green knob causes this failure at first.
I can unfortunately not provide a minimum example.
Best regards,
Elmar
0 com.yasara.View 0x00000001007495af SDL_UpdateFullscreenMode + 207
1 com.yasara.View 0x00000001006e2591 SDL_SendWindowEvent + 401
2 com.yasara.View 0x0000000100775a72 -[Cocoa_WindowListener windowDidResize:] + 370
3 com.yasara.View 0x0000000100776550 -[Cocoa_WindowListener windowDidExitFullScreen:] + 512
4 com.apple.AppKit 0x00007fff3180a2a4 -[_NSWindowEnterFullScreenTransitionController failedToEnterFullScreen] + 692
5 com.apple.AppKit 0x00007fff31c59737 -[_NSEnterFullScreenTransitionController _doFailedToEnterFullScreen] + 349
6 com.apple.AppKit 0x00007fff3172aa53 __NSFullScreenDockConnectionSendEnterForSpace_block_invoke + 135
7 libxpc.dylib 0x00007fff6114b9b1 _xpc_connection_reply_callout + 36
8 libxpc.dylib 0x00007fff6114b938 _xpc_connection_call_reply_async + 82
9 libdispatch.dylib 0x00007fff60ec7e39 _dispatch_client_callout3 + 8
10 libdispatch.dylib 0x00007fff60ede3b0 _dispatch_mach_msg_async_reply_invoke + 322
11 libdispatch.dylib 0x00007fff60ed2e25 _dispatch_main_queue_callback_4CF + 807
12 com.apple.CoreFoundation 0x00007fff33d39e8b __CFRUNLOOP_IS_SERVICING_THE_MAIN_DISPATCH_QUEUE__ + 9
13 com.apple.CoreFoundation 0x00007fff33d3959a __CFRunLoopRun + 2335
14 com.apple.CoreFoundation 0x00007fff33d38a28 CFRunLoopRunSpecific + 463
15 com.apple.HIToolbox 0x00007fff32fd1b35 RunCurrentEventLoopInMode + 293
16 com.apple.HIToolbox 0x00007fff32fd1774 ReceiveNextEventCommon + 371
17 com.apple.HIToolbox 0x00007fff32fd15e8 _BlockUntilNextEventMatchingListInModeWithFilter + 64
18 com.apple.AppKit 0x00007fff3128deb7 _DPSNextEvent + 997
19 com.apple.AppKit 0x00007fff3128cc56 -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 1362
20 com.yasara.View 0x000000010076fab2 Cocoa_PumpEvents + 290
21 com.yasara.View 0x00000001006dd1c7 SDL_PumpEvents_REAL + 23
22 com.yasara.View 0x00000001007795cf Cocoa_SetWindowFullscreenSpace + 223
23 com.yasara.View 0x000000010074970b SDL_UpdateFullscreenMode + 555
24 com.yasara.View 0x00000001006e2476 SDL_SendWindowEvent + 118
25 com.yasara.View 0x0000000100774ff7 -[Cocoa_WindowListener resumeVisibleObservation] + 135
26 com.yasara.View 0x000000010077664c Cocoa_ShowWindow + 188
27 com.yasara.View 0x0000000100749492 SDL_FinishWindowCreation + 546
28 com.yasara.View 0x0000000100748da5 SDL_CreateWindow_REAL + 1573
29 com.yasara.View 0x000000010010d9b1 vga_setvideomode + 1347
30 com.yasara.View 0x00000001003f0d46 mod_initscreen + 2614
31 com.yasara.View 0x00000001003f344b mod_reinitscreen + 460
32 com.yasara.View 0x00000001003f370d mod_resizescreen + 383
33 com.yasara.View 0x0000000100418e39 mod_main + 815
34 com.yasara.View 0x000000010029ca5d main2 + 5766
35 com.yasara.View 0x000000010011d1b7 main.main_cpuok + 19
157 lines
6.2 KiB
Objective-C
157 lines
6.2 KiB
Objective-C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
#include "../../SDL_internal.h"
|
|
|
|
#ifndef SDL_cocoawindow_h_
|
|
#define SDL_cocoawindow_h_
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#if SDL_VIDEO_OPENGL_EGL
|
|
#include "../SDL_egl_c.h"
|
|
#endif
|
|
|
|
typedef struct SDL_WindowData SDL_WindowData;
|
|
|
|
typedef enum
|
|
{
|
|
PENDING_OPERATION_NONE,
|
|
PENDING_OPERATION_ENTER_FULLSCREEN,
|
|
PENDING_OPERATION_LEAVE_FULLSCREEN,
|
|
PENDING_OPERATION_MINIMIZE
|
|
} PendingWindowOperation;
|
|
|
|
@interface Cocoa_WindowListener : NSResponder <NSWindowDelegate> {
|
|
SDL_WindowData *_data;
|
|
BOOL observingVisible;
|
|
BOOL wasCtrlLeft;
|
|
BOOL wasVisible;
|
|
BOOL isFullscreenSpace;
|
|
BOOL inFullscreenTransition;
|
|
PendingWindowOperation pendingWindowOperation;
|
|
BOOL isMoving;
|
|
int pendingWindowWarpX, pendingWindowWarpY;
|
|
BOOL isDragAreaRunning;
|
|
}
|
|
|
|
-(void) listen:(SDL_WindowData *) data;
|
|
-(void) pauseVisibleObservation;
|
|
-(void) resumeVisibleObservation;
|
|
-(BOOL) setFullscreenSpace:(BOOL) state;
|
|
-(BOOL) isInFullscreenSpace;
|
|
-(BOOL) isInFullscreenSpaceTransition;
|
|
-(void) addPendingWindowOperation:(PendingWindowOperation) operation;
|
|
-(void) close;
|
|
|
|
-(BOOL) isMoving;
|
|
-(void) setPendingMoveX:(int)x Y:(int)y;
|
|
-(void) windowDidFinishMoving;
|
|
|
|
/* Window delegate functionality */
|
|
-(BOOL) windowShouldClose:(id) sender;
|
|
-(void) windowDidExpose:(NSNotification *) aNotification;
|
|
-(void) windowDidMove:(NSNotification *) aNotification;
|
|
-(void) windowDidResize:(NSNotification *) aNotification;
|
|
-(void) windowDidMiniaturize:(NSNotification *) aNotification;
|
|
-(void) windowDidDeminiaturize:(NSNotification *) aNotification;
|
|
-(void) windowDidBecomeKey:(NSNotification *) aNotification;
|
|
-(void) windowDidResignKey:(NSNotification *) aNotification;
|
|
-(void) windowDidChangeBackingProperties:(NSNotification *) aNotification;
|
|
-(void) windowWillEnterFullScreen:(NSNotification *) aNotification;
|
|
-(void) windowDidEnterFullScreen:(NSNotification *) aNotification;
|
|
-(void) windowWillExitFullScreen:(NSNotification *) aNotification;
|
|
-(void) windowDidExitFullScreen:(NSNotification *) aNotification;
|
|
-(NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions;
|
|
|
|
/* See if event is in a drag area, toggle on window dragging. */
|
|
-(BOOL) processHitTest:(NSEvent *)theEvent;
|
|
|
|
/* Window event handling */
|
|
-(void) mouseDown:(NSEvent *) theEvent;
|
|
-(void) rightMouseDown:(NSEvent *) theEvent;
|
|
-(void) otherMouseDown:(NSEvent *) theEvent;
|
|
-(void) mouseUp:(NSEvent *) theEvent;
|
|
-(void) rightMouseUp:(NSEvent *) theEvent;
|
|
-(void) otherMouseUp:(NSEvent *) theEvent;
|
|
-(void) mouseMoved:(NSEvent *) theEvent;
|
|
-(void) mouseDragged:(NSEvent *) theEvent;
|
|
-(void) rightMouseDragged:(NSEvent *) theEvent;
|
|
-(void) otherMouseDragged:(NSEvent *) theEvent;
|
|
-(void) scrollWheel:(NSEvent *) theEvent;
|
|
-(void) touchesBeganWithEvent:(NSEvent *) theEvent;
|
|
-(void) touchesMovedWithEvent:(NSEvent *) theEvent;
|
|
-(void) touchesEndedWithEvent:(NSEvent *) theEvent;
|
|
-(void) touchesCancelledWithEvent:(NSEvent *) theEvent;
|
|
|
|
/* Touch event handling */
|
|
-(void) handleTouches:(NSTouchPhase) phase withEvent:(NSEvent*) theEvent;
|
|
|
|
@end
|
|
/* *INDENT-ON* */
|
|
|
|
@class SDLOpenGLContext;
|
|
|
|
struct SDL_WindowData
|
|
{
|
|
SDL_Window *window;
|
|
NSWindow *nswindow;
|
|
NSView *sdlContentView; /* nil if window is created via CreateWindowFrom */
|
|
NSMutableArray *nscontexts;
|
|
SDL_bool created;
|
|
SDL_bool inWindowFullscreenTransition;
|
|
Cocoa_WindowListener *listener;
|
|
struct SDL_VideoData *videodata;
|
|
#if SDL_VIDEO_OPENGL_EGL
|
|
EGLSurface egl_surface;
|
|
#endif
|
|
};
|
|
|
|
extern int Cocoa_CreateWindow(_THIS, SDL_Window * window);
|
|
extern int Cocoa_CreateWindowFrom(_THIS, SDL_Window * window,
|
|
const void *data);
|
|
extern void Cocoa_SetWindowTitle(_THIS, SDL_Window * window);
|
|
extern void Cocoa_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
|
|
extern void Cocoa_SetWindowPosition(_THIS, SDL_Window * window);
|
|
extern void Cocoa_SetWindowSize(_THIS, SDL_Window * window);
|
|
extern void Cocoa_SetWindowMinimumSize(_THIS, SDL_Window * window);
|
|
extern void Cocoa_SetWindowMaximumSize(_THIS, SDL_Window * window);
|
|
extern int Cocoa_SetWindowOpacity(_THIS, SDL_Window * window, float opacity);
|
|
extern void Cocoa_ShowWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_HideWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_RaiseWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_MaximizeWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_MinimizeWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_RestoreWindow(_THIS, SDL_Window * window);
|
|
extern void Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
|
|
extern void Cocoa_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable);
|
|
extern void Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
|
|
extern int Cocoa_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
|
|
extern int Cocoa_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp);
|
|
extern void Cocoa_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
|
|
extern void Cocoa_DestroyWindow(_THIS, SDL_Window * window);
|
|
extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info);
|
|
extern int Cocoa_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
|
|
extern void Cocoa_AcceptDragAndDrop(SDL_Window * window, SDL_bool accept);
|
|
|
|
#endif /* SDL_cocoawindow_h_ */
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|