geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: removed deprecated UpdateSystemActivity() call. 

The non-deprecated approach (IOPMAssertion) already exists in SDL, and is
available in Mac OS X 10.6 and later (although it was incorrectly listed as
10.7 and later in SDL). Since SDL now requires 10.6 or later, this is no
longer conditionally used.
Ryan C. Gordon 2016-11-25 00:13:13 -05:00
parent fb5fd67ccb
commit d1c35febce
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video/cocoa/SDL_cocoaevents.m
View File

@ -394,17 +394,6 @@ void
Cocoa_PumpEvents(_THIS) Cocoa_PumpEvents(_THIS)
{ @autoreleasepool { @autoreleasepool
{ {
/* Update activity every 30 seconds to prevent screensaver */
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)) {
UpdateSystemActivity(UsrActivity);
data->screensaver_activity = now;
}
}
for ( ; ; ) { for ( ; ; ) {
NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ]; NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ];
if ( event == nil ) { if ( event == nil ) {
@ -426,10 +415,6 @@ Cocoa_SuspendScreenSaver(_THIS)
{ {
SDL_VideoData *data = (SDL_VideoData *)_this->driverdata; SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
if (!data->screensaver_use_iopm) {
return;
}
if (data->screensaver_assertion) { if (data->screensaver_assertion) {
IOPMAssertionRelease(data->screensaver_assertion); IOPMAssertionRelease(data->screensaver_assertion);
data->screensaver_assertion = 0; data->screensaver_assertion = 0;

1
src/video/cocoa/SDL_cocoavideo.h
View File

@ -52,7 +52,6 @@ typedef struct SDL_VideoData
SDLTranslatorResponder *fieldEdit; SDLTranslatorResponder *fieldEdit;
NSInteger clipboard_count; NSInteger clipboard_count;
Uint32 screensaver_activity; Uint32 screensaver_activity;
BOOL screensaver_use_iopm;
IOPMAssertionID screensaver_assertion; IOPMAssertionID screensaver_assertion;
} SDL_VideoData; } SDL_VideoData;

3
src/video/cocoa/SDL_cocoavideo.m
View File

@ -152,9 +152,6 @@ Cocoa_VideoInit(_THIS)
data->allow_spaces = ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && SDL_GetHintBoolean(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES, SDL_TRUE)); data->allow_spaces = ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && SDL_GetHintBoolean(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES, SDL_TRUE));
/* The IOPM assertion API can disable the screensaver as of 10.7. */
data->screensaver_use_iopm = floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6;
return 0; return 0;
} }