Mercurial > sdl-ios-xcode
diff src/video/dga/SDL_dgavideo.h @ 1659:14717b52abc0 SDL-1.3
Merge trunk-1.3-3
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 17 May 2006 08:18:28 +0000 |
parents | d910939febfa |
children | 782fd950bd46 |
line wrap: on
line diff
--- a/src/video/dga/SDL_dgavideo.h Mon May 01 06:58:33 2006 +0000 +++ b/src/video/dga/SDL_dgavideo.h Wed May 17 08:18:28 2006 +0000 @@ -25,11 +25,16 @@ #define _SDL_dgavideo_h #include <X11/Xlib.h> +#include <X11/Xproto.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #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 @@ -86,6 +91,10 @@ #ifdef LOCK_DGA_DISPLAY SDL_mutex *event_lock; #endif + + /* Screensaver settings */ + int screensaver_timeout; + BOOL dpms_enabled; }; /* Old variable names */ #define DGA_Display (this->hidden->DGA_Display) @@ -107,5 +116,7 @@ #define hw_lock (this->hidden->hw_lock) #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 */