[patch] Patch that removes the offending code from SDL-1.2.13.

libsdl-1.2.13-no-tamper-screensaver.patch (text/plain), 13.37 KB, created by Erik on 2008-02-25 01:29:49 UTC

diff -rNU2 ../SDL-1.2.13-vanilla/src/video/dga/SDL_dgavideo.c src/video/dga/SDL_dgavideo.c
--- ../SDL-1.2.13-vanilla/src/video/dga/SDL_dgavideo.c	2007-12-31 05:48:01.000000000 +0100
+++ src/video/dga/SDL_dgavideo.c	2008-02-25 01:43:29.000000000 +0100
@@ -44,9 +44,4 @@
 /*#define DGA_DEBUG*/
 
-/* Heheh we're using X11 event code */
-extern void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms);
-extern void X11_DisableScreenSaver(Display *display);
-extern void X11_RestoreScreenSaver(Display *display, int saved_timeout, BOOL dpms);
-
 /* Initialization/Query functions */
 static int DGA_VideoInit(_THIS, SDL_PixelFormat *vformat);
@@ -402,8 +397,4 @@
 	}
 
-	/* Save DPMS and screensaver settings */
-	X11_SaveScreenSaver(DGA_Display, &screensaver_timeout, &dpms_enabled);
-	X11_DisableScreenSaver(DGA_Display);
-
 	/* Query for the list of available video modes */
 	modes = SDL_NAME(XDGAQueryModes)(DGA_Display, DGA_Screen, &num_modes);
@@ -1092,7 +1083,4 @@
 		DGA_FreeHWSurfaces(this);
 
-		/* Restore DPMS and screensaver settings */
-		X11_RestoreScreenSaver(DGA_Display, screensaver_timeout, dpms_enabled);
-
 		/* Close up the display */
 		XCloseDisplay(DGA_Display);
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/dga/SDL_dgavideo.h src/video/dga/SDL_dgavideo.h
--- ../SDL-1.2.13-vanilla/src/video/dga/SDL_dgavideo.h	2007-12-31 05:48:01.000000000 +0100
+++ src/video/dga/SDL_dgavideo.h	2008-02-25 02:00:47.000000000 +0100
@@ -33,8 +33,4 @@
 #include "../SDL_sysvideo.h"
 
-#if SDL_VIDEO_DRIVER_X11_DPMS
-#include <X11/extensions/dpms.h>
-#endif
-
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_VideoDevice *this
@@ -93,8 +89,4 @@
 	SDL_mutex *event_lock;
 #endif
-
-	/* Screensaver settings */
-	int screensaver_timeout;
-	BOOL dpms_enabled;
 };
 /* Old variable names */
@@ -118,6 +110,4 @@
 #define DGA_event_base		(this->hidden->event_base)
 #define event_lock		(this->hidden->event_lock)
-#define screensaver_timeout	(this->hidden->screensaver_timeout)
-#define dpms_enabled		(this->hidden->dpms_enabled)
 
 #endif /* _SDL_dgavideo_h */
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzEvents.m src/video/quartz/SDL_QuartzEvents.m
--- ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzEvents.m	2007-12-31 07:16:32.000000000 +0100
+++ src/video/quartz/SDL_QuartzEvents.m	2008-02-25 01:53:15.000000000 +0100
@@ -718,6 +718,4 @@
 void QZ_PumpEvents (_THIS)
 {
-    static Uint32 screensaverTicks = 0;
-    Uint32 nowTicks;
     CGMouseDelta dx, dy;
 
@@ -730,14 +728,4 @@
         return;  /* don't do anything if there's no screen surface. */
 
-    /* Update activity every five seconds to prevent screensaver. --ryan. */
-    if (!allow_screensaver) {
-        nowTicks = SDL_GetTicks();
-        if ((nowTicks - screensaverTicks) > 5000)
-        {
-            UpdateSystemActivity(UsrActivity);
-            screensaverTicks = nowTicks;
-        }
-    }
-
     pool = [ [ NSAutoreleasePool alloc ] init ];
     distantPast = [ NSDate distantPast ];
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzVideo.h src/video/quartz/SDL_QuartzVideo.h
--- ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzVideo.h	2007-12-31 05:48:04.000000000 +0100
+++ src/video/quartz/SDL_QuartzVideo.h	2008-02-25 01:52:15.000000000 +0100
@@ -81,5 +81,4 @@
 typedef struct SDL_PrivateVideoData {
 
-    BOOL               allow_screensaver;  /* 0 == disable screensaver */
     CGDirectDisplayID  display;            /* 0 == main display (only support single display) */
     CFDictionaryRef    mode;               /* current mode of the display */
@@ -130,5 +129,4 @@
 #define mode (this->hidden->mode)
 #define save_mode (this->hidden->save_mode)
-#define allow_screensaver (this->hidden->allow_screensaver)
 #define mode_list (this->hidden->mode_list)
 #define palette (this->hidden->palette)
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzVideo.m src/video/quartz/SDL_QuartzVideo.m
--- ../SDL-1.2.13-vanilla/src/video/quartz/SDL_QuartzVideo.m	2007-12-31 05:48:04.000000000 +0100
+++ src/video/quartz/SDL_QuartzVideo.m	2008-02-25 01:52:32.000000000 +0100
@@ -189,7 +189,4 @@
     palette    = CGPaletteCreateDefaultColorPalette ();
 
-    env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
-    allow_screensaver = ( env && SDL_atoi(env) ) ? YES : NO;
-
     /* Gather some information that is useful to know about the display */
     CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayBitsPerPixel),
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibevents.c src/video/windib/SDL_dibevents.c
--- ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibevents.c	2007-12-31 05:48:05.000000000 +0100
+++ src/video/windib/SDL_dibevents.c	2008-02-25 01:57:34.000000000 +0100
@@ -224,18 +224,4 @@
 		return(0);
 
-#if defined(SC_SCREENSAVE) && defined(SC_MONITORPOWER)
-		case WM_SYSCOMMAND: {
-			const DWORD val = (DWORD) (wParam & 0xFFF0);
-			if ((val == SC_SCREENSAVE) || (val == SC_MONITORPOWER)) {
-				if (!this->hidden->allow_screensaver) {
-					/* Note that this doesn't stop anything on Vista
-					   if the screensaver has a password. */
-					return(0);
-				}
-			}
-		}
-		/* Fall through to default processing */
-#endif /* SC_SCREENSAVE && SC_MONITORPOWER */
-
 		default: {
 			/* Only post the event if we're watching for it */
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibvideo.c src/video/windib/SDL_dibvideo.c
--- ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibvideo.c	2007-12-31 05:48:05.000000000 +0100
+++ src/video/windib/SDL_dibvideo.c	2008-02-25 02:04:28.000000000 +0100
@@ -375,8 +375,4 @@
 #endif
 
-	/* Allow environment override of screensaver disable. */
-	env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
-	this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
-
 	/* We're done! */
 	return(0);
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibvideo.h src/video/windib/SDL_dibvideo.h
--- ../SDL-1.2.13-vanilla/src/video/windib/SDL_dibvideo.h	2007-12-31 05:48:05.000000000 +0100
+++ src/video/windib/SDL_dibvideo.h	2008-02-25 01:53:31.000000000 +0100
@@ -44,6 +44,4 @@
     BOOL grab_palette;
 
-    int allow_screensaver;
-
 #define NUM_MODELISTS	4		/* 8, 16, 24, and 32 bits-per-pixel */
     int SDL_nummodes[NUM_MODELISTS];
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11events.c src/video/x11/SDL_x11events.c
--- ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11events.c	2007-12-31 05:48:13.000000000 +0100
+++ src/video/x11/SDL_x11events.c	2008-02-25 01:49:43.000000000 +0100
@@ -1389,67 +1389,2 @@
 	X11_InitKeymap();
 }
-
-void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms)
-{
-	int timeout, interval, prefer_blank, allow_exp;
-	XGetScreenSaver(display, &timeout, &interval, &prefer_blank, &allow_exp);
-	*saved_timeout = timeout;
-
-#if SDL_VIDEO_DRIVER_X11_DPMS
-	if ( SDL_X11_HAVE_DPMS ) {
-		int dummy;
-	  	if ( DPMSQueryExtension(display, &dummy, &dummy) ) {
-			CARD16 state;
-			DPMSInfo(display, &state, dpms);
-		}
-	}
-#else
-	*dpms = 0;
-#endif /* SDL_VIDEO_DRIVER_X11_DPMS */
-}
-
-void X11_DisableScreenSaver(_THIS, Display *display)
-{
-	int timeout, interval, prefer_blank, allow_exp;
-
-	if (this->hidden->allow_screensaver) {
-		return;
-	}
-
-	XGetScreenSaver(display, &timeout, &interval, &prefer_blank, &allow_exp);
-	timeout = 0;
-	XSetScreenSaver(display, timeout, interval, prefer_blank, allow_exp);
-
-#if SDL_VIDEO_DRIVER_X11_DPMS
-	if ( SDL_X11_HAVE_DPMS ) {
-		int dummy;
-	  	if ( DPMSQueryExtension(display, &dummy, &dummy) ) {
-			DPMSDisable(display);
-		}
-	}
-#endif /* SDL_VIDEO_DRIVER_X11_DPMS */
-}
-
-void X11_RestoreScreenSaver(_THIS, Display *display, int saved_timeout, BOOL dpms)
-{
-	int timeout, interval, prefer_blank, allow_exp;
-
-	if (this->hidden->allow_screensaver) {
-		return;
-	}
-
-	XGetScreenSaver(display, &timeout, &interval, &prefer_blank, &allow_exp);
-	timeout = saved_timeout;
-	XSetScreenSaver(display, timeout, interval, prefer_blank, allow_exp);
-
-#if SDL_VIDEO_DRIVER_X11_DPMS
-	if ( SDL_X11_HAVE_DPMS ) {
-		int dummy;
-	  	if ( DPMSQueryExtension(display, &dummy, &dummy) ) {
-			if ( dpms ) {
-				DPMSEnable(display);
-			}
-		}
-	}
-#endif /* SDL_VIDEO_DRIVER_X11_DPMS */
-}
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11events_c.h src/video/x11/SDL_x11events_c.h
--- ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11events_c.h	2007-12-31 05:48:13.000000000 +0100
+++ src/video/x11/SDL_x11events_c.h	2008-02-25 02:01:36.000000000 +0100
@@ -28,6 +28,2 @@
 extern void X11_PumpEvents(_THIS);
 extern void X11_SetKeyboardState(Display *display, const char *key_vec);
-
-extern void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms);
-extern void X11_DisableScreenSaver(_THIS, Display *display);
-extern void X11_RestoreScreenSaver(_THIS, Display *display, int saved_timeout, BOOL dpms);
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11sym.h src/video/x11/SDL_x11sym.h
--- ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11sym.h	2007-12-31 05:48:13.000000000 +0100
+++ src/video/x11/SDL_x11sym.h	2008-02-25 01:43:56.000000000 +0100
@@ -57,5 +57,4 @@
 SDL_X11_SYM(XModifierKeymap*,XGetModifierMapping,(Display* a),(a),return)
 SDL_X11_SYM(int,XGetPointerControl,(Display* a,int* b,int* c,int* d),(a,b,c,d),return)
-SDL_X11_SYM(int,XGetScreenSaver,(Display* a,int* b,int* c,int* d, int* e),(a,b,c,d,e),return)
 SDL_X11_SYM(XVisualInfo*,XGetVisualInfo,(Display* a,long b,XVisualInfo* c,int* d),(a,b,c,d),return)
 SDL_X11_SYM(XWMHints*,XGetWMHints,(Display* a,Window b),(a,b),return)
@@ -92,5 +91,4 @@
 SDL_X11_SYM(XErrorHandler,XSetErrorHandler,(XErrorHandler a),(a),return)
 SDL_X11_SYM(XIOErrorHandler,XSetIOErrorHandler,(XIOErrorHandler a),(a),return)
-SDL_X11_SYM(int,XSetScreenSaver,(Display* a,int b,int c,int d,int e),(a,b,c,d,e),return)
 SDL_X11_SYM(int,XSetTransientForHint,(Display* a,Window b,Window c),(a,b,c),return)
 SDL_X11_SYM(int,XSetWMHints,(Display* a,Window b,XWMHints* c),(a,b,c),return)
@@ -193,13 +191,4 @@
 #endif
 
-/* DPMS support */
-#if SDL_VIDEO_DRIVER_X11_DPMS
-SDL_X11_MODULE(DPMS)
-SDL_X11_SYM(Status,DPMSQueryExtension,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
-SDL_X11_SYM(Status,DPMSInfo,(Display *dpy,CARD16 *state,BOOL *onoff),(dpy,state,onoff),return)
-SDL_X11_SYM(Status,DPMSEnable,(Display *dpy),(dpy),return)
-SDL_X11_SYM(Status,DPMSDisable,(Display *dpy),(dpy),return)
-#endif
-
 /* end of SDL_x11sym.h ... */
 
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11video.c src/video/x11/SDL_x11video.c
--- ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11video.c	2007-12-31 05:48:13.000000000 +0100
+++ src/video/x11/SDL_x11video.c	2008-02-25 02:02:13.000000000 +0100
@@ -668,12 +668,4 @@
 	X11_SaveVidModeGamma(this);
 
-	/* Allow environment override of screensaver disable. */
-	env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
-	this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
-
-	/* Save DPMS and screensaver settings */
-	X11_SaveScreenSaver(SDL_Display, &screensaver_timeout, &dpms_enabled);
-	X11_DisableScreenSaver(this, SDL_Display);
-
 	/* See if we have been passed a window to use */
 	SDL_windowid = SDL_getenv("SDL_WINDOWID");
@@ -1507,7 +1499,4 @@
 		}
 
-		/* Restore DPMS and screensaver settings */
-		X11_RestoreScreenSaver(this, SDL_Display, screensaver_timeout, dpms_enabled);
-
 		/* Free that blank cursor */
 		if ( SDL_BlankCursor != NULL ) {
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11video.h src/video/x11/SDL_x11video.h
--- ../SDL-1.2.13-vanilla/src/video/x11/SDL_x11video.h	2007-12-31 05:48:13.000000000 +0100
+++ src/video/x11/SDL_x11video.h	2008-02-25 02:03:48.000000000 +0100
@@ -47,7 +47,4 @@
 #include "../Xext/extensions/xme.h"
 #endif
-#if SDL_VIDEO_DRIVER_X11_DPMS
-#include <X11/extensions/dpms.h>
-#endif
 
 #include "SDL_x11dyn.h"
@@ -140,6 +137,4 @@
     int currently_fullscreen;
 
-    int allow_screensaver;
-
     /* Automatic mode switching support (entering/leaving fullscreen) */
     Uint32 switch_waiting;
@@ -157,8 +152,4 @@
 
     short *iconcolors;		/* List of colors used by the icon */
-
-    /* Screensaver settings */
-    int screensaver_timeout;
-    BOOL dpms_enabled;
 };
 
@@ -211,6 +202,4 @@
 #define gamma_changed		(this->hidden->gamma_changed)
 #define SDL_iconcolors		(this->hidden->iconcolors)
-#define screensaver_timeout	(this->hidden->screensaver_timeout)
-#define dpms_enabled		(this->hidden->dpms_enabled)
 /* Some versions of XFree86 have bugs - detect if this is one of them */
 #define BUGGY_XFREE86(condition, buggy_version) \
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/xbios/SDL_xbios.c src/video/xbios/SDL_xbios.c
--- ../SDL-1.2.13-vanilla/src/video/xbios/SDL_xbios.c	2007-12-31 05:48:01.000000000 +0100
+++ src/video/xbios/SDL_xbios.c	2008-02-25 01:51:03.000000000 +0100
@@ -466,9 +466,4 @@
 #endif
 
-	/* Disable screensavers */
-	if (SDL_XBIOS_TveillePresent(this)) {
-		SDL_XBIOS_TveilleDisable(this);
-	}
-
 	/* We're done! */
 	return(0);
@@ -935,9 +930,4 @@
 
 	this->screen->pixels = NULL;	
-
-	/* Restore screensavers */
-	if (SDL_XBIOS_TveillePresent(this)) {
-		SDL_XBIOS_TveilleRestore(this);
-	}
 }
 
diff -rNU2 ../SDL-1.2.13-vanilla/src/video/xbios/SDL_xbios_centscreen.c src/video/xbios/SDL_xbios_centscreen.c
--- ../SDL-1.2.13-vanilla/src/video/xbios/SDL_xbios_centscreen.c	2007-12-31 05:48:01.000000000 +0100
+++ src/video/xbios/SDL_xbios_centscreen.c	2008-02-25 01:50:40.000000000 +0100
@@ -85,9 +85,4 @@
 	newmode.plan = planes;
 	Vwrite(0, &newmode, &curmode);
-
-	/* Disable screensaver */
-	Vread(&newmode);
-	newmode.mode &= ~(CSCREEN_SAVER|CSCREEN_ENERGYSTAR);
-	Vwrite(0, &newmode, &curmode);
 }