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] Fix for latest MacOSX versions over latest 1.2 branch

macosx-new-support.patch (text/plain), 4.18 KB, created by Alex Sirota on 2020-04-04 22:23:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Sirota

Created: 2020-04-04 22:23:08 UTC

Size: 4.18 KB

patch

obsolete

>diff -r 9c0fc6e28c5e src/video/quartz/SDL_QuartzVideo.m
>--- a/src/video/quartz/SDL_QuartzVideo.m	Sun Mar 22 22:03:38 2020 -0400
>+++ b/src/video/quartz/SDL_QuartzVideo.m	Sat Apr 04 15:01:10 2020 -0700
>@@ -940,6 +940,10 @@
>     /* Set app state, hide cursor if necessary, ... */
>     QZ_DoActivate(this);
> 
>+    [ window_view setNeedsDisplay:YES ];
>+  	[ [ qz_window contentView ] setNeedsDisplay:YES ];
>+  	[ qz_window displayIfNeeded ];
>+    
>     return current;
> 
>     /* Since the blanking window covers *all* windows (even force quit) correct recovery is crucial */
>@@ -1115,7 +1119,11 @@
> 
>     /* Save flags to ensure correct teardown */
>     mode_flags = current->flags;
>-
>+    
>+    [ window_view setNeedsDisplay:YES ];
>+   	[ [ qz_window contentView ] setNeedsDisplay:YES ];
>+   	[ qz_window displayIfNeeded ];
>+    
>     /* Fade in again (asynchronously) if we came from a fullscreen mode and faded to black */
>     if (fade_token != kCGDisplayFadeReservationInvalidToken) {
>         CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
>@@ -1155,7 +1163,13 @@
> 
>     if (qz_window != nil) {
>         nsgfx_context = [NSGraphicsContext graphicsContextWithWindow:qz_window];
>-        [NSGraphicsContext setCurrentContext:nsgfx_context];
>+        if (nsgfx_context != NULL) {
>+        	[NSGraphicsContext setCurrentContext:nsgfx_context];
>+      	}
>+      	else {
>+      		/* Whoops, looks like Mojave doesn't support this anymore */
>+      		fprintf(stderr,"Unable to obtain graphics context for NSWindow (Mojave behavior)\n");
>+      	}
>     }
> 
>     /* Setup the new pixel format */
>@@ -1500,10 +1514,17 @@
>     }
> }
> 
>-static void QZ_UpdateRects (_THIS, int numRects, SDL_Rect *rects)
>-{
>+static SDL_VideoDevice *last_this = NULL;
>+
>+void QZ_UpdateRectsOnDrawRect(/*TODO: NSRect from drawRect*/) {
>+	// HACK
>+	SDL_VideoDevice *this = last_this;
>+
>+	if (this == NULL) return;
>+  if (SDL_VideoSurface == NULL) return;
>+
>     if (SDL_VideoSurface->flags & SDL_OPENGLBLIT) {
>-        QZ_GL_SwapBuffers (this);
>+// TODO
>     }
>     else if ( [ qz_window isMiniaturized ] ) {
>     
>@@ -1512,8 +1533,9 @@
>     
>     else {
>         NSGraphicsContext *ctx = [NSGraphicsContext currentContext];
>-        if (ctx != nsgfx_context) { /* uhoh, you might be rendering from another thread... */
>-            [NSGraphicsContext setCurrentContext:nsgfx_context];
>+        /* NTS: nsgfx_context == NULL will occur on Mojave, may be non-NULL on older versions of OS X */
>+          if (nsgfx_context != NULL && ctx != nsgfx_context) { /* uhoh, you might be rendering from another thread... */
>+                  [NSGraphicsContext setCurrentContext:nsgfx_context];
>             ctx = nsgfx_context;
>         }
>         CGContextRef cgc = (CGContextRef) [ctx graphicsPort];
>@@ -1528,6 +1550,25 @@
>     }
> }
> 
>+static void QZ_UpdateRects (_THIS, int numRects, SDL_Rect *rects)
>+{
>+	// HACK
>+	last_this = this;
>+
>+    if (SDL_VideoSurface->flags & SDL_OPENGLBLIT) {
>+        QZ_GL_SwapBuffers (this);
>+	// TODO?
>+    }
>+    else if ( [ qz_window isMiniaturized ] ) {
>+        /* Do nothing if miniaturized */
>+    }
>+    else {
>+	[ window_view setNeedsDisplay:YES ];
>+	[ [ qz_window contentView ] setNeedsDisplay:YES ];
>+	[ qz_window displayIfNeeded ];
>+    }
>+}
>+
> static void QZ_VideoQuit (_THIS)
> {
>     CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
>diff -r 9c0fc6e28c5e src/video/quartz/SDL_QuartzWindow.h
>--- a/src/video/quartz/SDL_QuartzWindow.h	Sun Mar 22 22:03:38 2020 -0400
>+++ b/src/video/quartz/SDL_QuartzWindow.h	Sat Apr 04 15:01:10 2020 -0700
>@@ -47,5 +47,6 @@
> 
> /* Subclass of NSView to set cursor rectangle */
> @interface SDL_QuartzView : NSView
>+- (void)drawRect:(NSRect)dirtyRect;
> - (void)resetCursorRects;
> @end
>diff -r 9c0fc6e28c5e src/video/quartz/SDL_QuartzWindow.m
>--- a/src/video/quartz/SDL_QuartzWindow.m	Sun Mar 22 22:03:38 2020 -0400
>+++ b/src/video/quartz/SDL_QuartzWindow.m	Sat Apr 04 15:01:10 2020 -0700
>@@ -220,6 +220,13 @@
> 
> @implementation SDL_QuartzView
> 
>+void QZ_UpdateRectsOnDrawRect(/*TODO: NSRect from drawRect*/);
>+
>+- (void)drawRect:(NSRect)dirtyRect
>+{
>+	QZ_UpdateRectsOnDrawRect();
>+}
>+
> - (void)resetCursorRects
> {
>     SDL_Cursor *sdlc = SDL_GetCursor();

Actions: View | Diff

Attachments on bug 4788: 3965 | 4288

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.