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 prefer some modern Mac APIs over deprecated ones (v3)

SDL_mac_deprecations_3.diff (text/plain), 4.80 KB, created by Alex Szpakowski on 2015-02-02 07:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Szpakowski

Created: 2015-02-02 07:45:36 UTC

Size: 4.80 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();
>         }
>@@ -293,8 +305,8 @@
> { @autoreleasepool
> {
>     /* Update activity every 30 seconds to prevent screensaver */
>-    if (_this->suspend_screensaver) {
>-        SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
>+    SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
>+    if (_this->suspend_screensaver && !data->screensaver_use_iopm) {
>         Uint32 now = SDL_GetTicks();
>         if (!data->screensaver_activity ||
>             SDL_TICKS_PASSED(now, data->screensaver_activity + 30000)) {
>@@ -336,6 +348,33 @@
>     }
> }}
> 
>+void
>+Cocoa_SuspendScreenSaver(_THIS)
>+{ @autoreleasepool
>+{
>+    SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
>+
>+    if (!data->screensaver_use_iopm) {
>+        return;
>+    }
>+
>+    if (data->screensaver_assertion) {
>+        IOPMAssertionRelease(data->screensaver_assertion);
>+        data->screensaver_assertion = 0;
>+    }
>+
>+    if (_this->suspend_screensaver) {
>+        /* FIXME: this should at least use the actual game's name, and ideally
>+         * describe the real reason why the game is preventing idle sleep.
>+         */
>+        CFStringRef activityName = CFSTR("SDL-based app running");
>+        IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep,
>+                                           activityName,
>+                                           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,9 @@
>     SDLTranslatorResponder *fieldEdit;
>     NSInteger clipboard_count;
>     Uint32 screensaver_activity;
>+    BOOL screensaver_use_iopm;
>+    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;
>@@ -148,6 +149,9 @@
>     const char *hint = SDL_GetHint(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES);
>     data->allow_spaces = ( (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && (!hint || (*hint != '0')) );
> 
>+    /* The IOPM assertion API can disable the screensaver of 10.7. */
>+    data->screensaver_use_iopm = floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6;
>+
>     return 0;
> }
>

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.