We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Cocoa display hotplugging patch

cocoa-display-hotplug.patch (text/plain), 3.25 KB, created by Eric Wasylishen on 2017-07-27 20:15:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Wasylishen

Created: 2017-07-27 20:15:40 UTC

Size: 3.25 KB

patch

obsolete

>diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
>index d1f5658c4..e79f37d6d 100644
>--- a/src/video/SDL_sysvideo.h
>+++ b/src/video/SDL_sysvideo.h
>@@ -395,6 +395,7 @@ extern VideoBootStrap QNX_bootstrap;
> extern SDL_VideoDevice *SDL_GetVideoDevice(void);
> extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);
> extern int SDL_AddVideoDisplay(const SDL_VideoDisplay * display);
>+extern int SDL_ClearVideoDisplays(void);
> extern SDL_bool SDL_AddDisplayMode(SDL_VideoDisplay *display, const SDL_DisplayMode * mode);
> extern SDL_VideoDisplay *SDL_GetDisplayForWindow(SDL_Window *window);
> extern void *SDL_GetDisplayDriverData( int displayIndex );
>diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
>index ab3a8efb5..d571517f8 100644
>--- a/src/video/SDL_video.c
>+++ b/src/video/SDL_video.c
>@@ -632,6 +632,18 @@ SDL_AddVideoDisplay(const SDL_VideoDisplay * display)
> }
> 
> int
>+SDL_ClearVideoDisplays(void)
>+{
>+    if (!_this) {
>+        return SDL_UninitializedVideo();
>+    }
>+    SDL_free(_this->displays);
>+    _this->displays = NULL;
>+    _this->num_displays = 0;
>+    return 0;
>+}
>+
>+int
> SDL_GetNumVideoDisplays(void)
> {
>     if (!_this) {
>diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m
>index 592367aca..60d439b3f 100644
>--- a/src/video/cocoa/SDL_cocoamodes.m
>+++ b/src/video/cocoa/SDL_cocoamodes.m
>@@ -210,14 +210,16 @@ Cocoa_GetDisplayName(CGDirectDisplayID displayID)
>     return displayName;
> }
> 
>-void
>-Cocoa_InitModes(_THIS)
>+static void
>+Cocoa_AddDisplays(_THIS)
> { @autoreleasepool
> {
>     CGDisplayErr result;
>     CGDirectDisplayID *displays;
>     CGDisplayCount numDisplays;
>     int pass, i;
>+    
>+    SDL_assert(_this->num_displays == 0);
> 
>     result = CGGetOnlineDisplayList(0, NULL, &numDisplays);
>     if (result != kCGErrorSuccess) {
>@@ -293,6 +295,41 @@ Cocoa_InitModes(_THIS)
>     SDL_stack_free(displays);
> }}
> 
>+static void
>+Cocoa_DisplayReconfigurationCallback(CGDirectDisplayID display,
>+                                     CGDisplayChangeSummaryFlags flags,
>+                                     void * userInfo)
>+{ @autoreleasepool
>+{
>+    SDL_VideoDevice *device = (SDL_VideoDevice *) userInfo;
>+    
>+    if (device != SDL_GetVideoDevice())
>+        return; /* Shouldn't happen */
>+    
>+    if ((flags & kCGDisplayBeginConfigurationFlag) == kCGDisplayBeginConfigurationFlag) {
>+        /* We get two notifications for each change, once before with this flag
>+           set, and one after. Ignore the notifications before the change */
>+        return;
>+    }
>+    
>+    /* Cocoa tells us which display was added/removed. For now, just
>+       clear the list of displays and enumerate all of them */
>+    
>+    if (SDL_ClearVideoDisplays() != 0)
>+        return; /* Shouldn't happen */
>+    
>+    Cocoa_AddDisplays(device);
>+}}
>+
>+void
>+Cocoa_InitModes(_THIS)
>+{ @autoreleasepool
>+{
>+    Cocoa_AddDisplays(_this);
>+    
>+    CGDisplayRegisterReconfigurationCallback(Cocoa_DisplayReconfigurationCallback, _this);
>+}}
>+
> int
> Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
> {
>@@ -512,6 +549,8 @@ Cocoa_QuitModes(_THIS)
> 
>     }
>     Cocoa_ToggleMenuBar(YES);
>+    
>+    CGDisplayRemoveReconfigurationCallback(Cocoa_DisplayReconfigurationCallback, _this);
> }
> 
> #endif /* SDL_VIDEO_DRIVER_COCOA */

Actions: View | Diff

Attachments on bug 3716: 2808 | 2814

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.