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] Patch to use some modern Mac APIs rather than deprecated ones, when available

SDL_mac_deprecations_2.diff (text/plain), 4.28 KB, created by Alex Szpakowski on 2015-01-27 20:44:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Szpakowski

Created: 2015-01-27 20:44:17 UTC

Size: 4.28 KB

patch

obsolete

>diff --git a/src/video/cocoa/SDL_cocoaevents.h b/src/video/cocoa/SDL_cocoaevents.h
>--- a/src/video/cocoa/SDL_cocoaevents.h
>+++ b/src/video/cocoa/SDL_cocoaevents.h
>@@ -25,6 +25,7 @@
> 
> extern void Cocoa_RegisterApp(void);
> extern void Cocoa_PumpEvents(_THIS);
>+extern void Cocoa_SuspendScreenSaver(_THIS);
> 
> #endif /* _SDL_cocoaevents_h */
> 
>diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
>--- a/src/video/cocoa/SDL_cocoaevents.m
>+++ b/src/video/cocoa/SDL_cocoaevents.m
>@@ -27,6 +27,11 @@
> #include "../../events/SDL_events_c.h"
> #include "SDL_assert.h"
> 
>+/* This define was added in the 10.9 SDK. */
>+#ifndef kIOPMAssertPreventUserIdleDisplaySleep
>+#define kIOPMAssertPreventUserIdleDisplaySleep kIOPMAssertionTypePreventUserIdleDisplaySleep
>+#endif
>+
> @interface SDLApplication : NSApplication
> 
> - (void)terminate:(id)sender;
>@@ -251,17 +256,24 @@
> { @autoreleasepool
> {
>     /* This can get called more than once! Be careful what you initialize! */
>-    ProcessSerialNumber psn;
>-
>-    if (!GetCurrentProcess(&psn)) {
>-        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
>-        SetFrontProcess(&psn);
>-    }
> 
>     if (NSApp == nil) {
>         [SDLApplication sharedApplication];
>         SDL_assert(NSApp != nil);
> 
>+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
>+        if ([NSApp respondsToSelector:@selector(setActivationPolicy:)]) {
>+#endif
>+            [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
>+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
>+        } else {
>+            ProcessSerialNumber psn = {0, kCurrentProcess};
>+            TransformProcessType(&psn, kProcessTransformToForegroundApplication);
>+        }
>+#endif
>+
>+        [NSApp activateIgnoringOtherApps:YES];
>+
>         if ([NSApp mainMenu] == nil) {
>             CreateApplicationMenus();
>         }
>@@ -288,12 +300,19 @@
>     }
> }}
> 
>+static SDL_bool
>+Cocoa_ShouldUseIdleIOPMAssertion(void)
>+{
>+    /* IOPMAssertionCreateWithDescription was added in 10.7. */
>+    return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6;
>+}
>+
> void
> Cocoa_PumpEvents(_THIS)
> { @autoreleasepool
> {
>     /* Update activity every 30 seconds to prevent screensaver */
>-    if (_this->suspend_screensaver) {
>+    if (_this->suspend_screensaver && !Cocoa_ShouldUseIdleIOPMAssertion()) {
>         SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
>         Uint32 now = SDL_GetTicks();
>         if (!data->screensaver_activity ||
>@@ -336,6 +355,29 @@
>     }
> }}
> 
>+void
>+Cocoa_SuspendScreenSaver(_THIS)
>+{ @autoreleasepool
>+{
>+    SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
>+
>+    if (!Cocoa_ShouldUseIdleIOPMAssertion()) {
>+        return;
>+    }
>+
>+    if (data->screensaver_assertion) {
>+        IOPMAssertionRelease(data->screensaver_assertion);
>+        data->screensaver_assertion = 0;
>+    }
>+
>+    if (_this->suspend_screensaver) {
>+        IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep,
>+                                           CFSTR("SDL-based app running"),
>+                                           NULL, NULL, NULL, 0, NULL,
>+                                           &data->screensaver_assertion);
>+    }
>+}}
>+
> #endif /* SDL_VIDEO_DRIVER_COCOA */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff --git a/src/video/cocoa/SDL_cocoavideo.h b/src/video/cocoa/SDL_cocoavideo.h
>--- a/src/video/cocoa/SDL_cocoavideo.h
>+++ b/src/video/cocoa/SDL_cocoavideo.h
>@@ -26,6 +26,7 @@
> #include "SDL_opengl.h"
> 
> #include <ApplicationServices/ApplicationServices.h>
>+#include <IOKit/pwr_mgt/IOPMLib.h>
> #include <Cocoa/Cocoa.h>
> 
> #include "SDL_keycode.h"
>@@ -51,6 +52,8 @@
>     SDLTranslatorResponder *fieldEdit;
>     NSInteger clipboard_count;
>     Uint32 screensaver_activity;
>+    IOPMAssertionID screensaver_assertion;
>+
> } SDL_VideoData;
> 
> /* Utility functions */
>diff --git a/src/video/cocoa/SDL_cocoavideo.m b/src/video/cocoa/SDL_cocoavideo.m
>--- a/src/video/cocoa/SDL_cocoavideo.m
>+++ b/src/video/cocoa/SDL_cocoavideo.m
>@@ -76,6 +76,7 @@
>     device->GetDisplayModes = Cocoa_GetDisplayModes;
>     device->SetDisplayMode = Cocoa_SetDisplayMode;
>     device->PumpEvents = Cocoa_PumpEvents;
>+    device->SuspendScreenSaver = Cocoa_SuspendScreenSaver;
> 
>     device->CreateWindow = Cocoa_CreateWindow;
>     device->CreateWindowFrom = Cocoa_CreateWindowFrom;

Actions: View | Diff

Attachments on bug 2858: 2007 | 2008 | 2013 | 2014

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.