src/video/x11/SDL_x11video.h
branchSDL-1.3
changeset 1659 14717b52abc0
parent 1589 34cca785be57
child 1662 782fd950bd46
     1.1 --- a/src/video/x11/SDL_x11video.h	Mon May 01 06:58:33 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11video.h	Wed May 17 08:18:28 2006 +0000
     1.3 @@ -34,14 +34,20 @@
     1.4  #if SDL_VIDEO_DRIVER_X11_DGAMOUSE
     1.5  #include "../Xext/extensions/xf86dga.h"
     1.6  #endif
     1.7 +#if SDL_VIDEO_DRIVER_X11_XINERAMA
     1.8 +#include "../Xext/extensions/Xinerama.h"
     1.9 +#endif 
    1.10 +#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.11 +#include <X11/extensions/Xrandr.h>
    1.12 +#endif
    1.13  #if SDL_VIDEO_DRIVER_X11_VIDMODE
    1.14  #include "../Xext/extensions/xf86vmode.h"
    1.15  #endif
    1.16  #if SDL_VIDEO_DRIVER_X11_XME
    1.17  #include "../Xext/extensions/xme.h"
    1.18  #endif
    1.19 -#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.20 -#include <X11/extensions/Xrandr.h>
    1.21 +#if SDL_VIDEO_DRIVER_X11_DPMS
    1.22 +#include <X11/extensions/dpms.h>
    1.23  #endif
    1.24  
    1.25  #include "SDL_x11dyn.h"
    1.26 @@ -109,6 +115,14 @@
    1.27      int depth;			/* current visual depth (not bpp) */
    1.28  
    1.29      /* Variables used by the X11 video mode code */
    1.30 +#if SDL_VIDEO_DRIVER_X11_XINERAMA
    1.31 +    SDL_NAME(XineramaScreenInfo) xinerama_info;
    1.32 +#endif
    1.33 +#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.34 +    XRRScreenConfiguration* screen_config;
    1.35 +    int saved_size_id;
    1.36 +    Rotation saved_rotation;
    1.37 +#endif
    1.38  #if SDL_VIDEO_DRIVER_X11_VIDMODE
    1.39      SDL_NAME(XF86VidModeModeInfo) saved_mode;
    1.40      struct {
    1.41 @@ -116,19 +130,13 @@
    1.42      } saved_view;
    1.43  #endif
    1.44  #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */
    1.45 -    int use_xme;
    1.46      XiGMiscResolutionInfo saved_res;
    1.47  #endif
    1.48 -#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.49 -    XRRScreenConfiguration* screen_config;
    1.50 -    int saved_size_id;
    1.51 -    Rotation saved_rotation;
    1.52 -#endif
    1.53  
    1.54 -    int xinerama_x;
    1.55 -    int xinerama_y;
    1.56 +    int use_xinerama;
    1.57 +    int use_xrandr;
    1.58      int use_vidmode;
    1.59 -    int use_xrandr;
    1.60 +    int use_xme;
    1.61      int currently_fullscreen;
    1.62  
    1.63      /* Automatic mode switching support (entering/leaving fullscreen) */
    1.64 @@ -146,6 +154,10 @@
    1.65      int gamma_changed;		/* flag: has VidMode gamma been modified? */
    1.66  
    1.67      short *iconcolors;		/* List of colors used by the icon */
    1.68 +
    1.69 +    /* Screensaver settings */
    1.70 +    int screensaver_timeout;
    1.71 +    BOOL dpms_enabled;
    1.72  };
    1.73  
    1.74  /* Old variable names */
    1.75 @@ -174,17 +186,17 @@
    1.76  #define mouse_accel		(this->hidden->mouse_accel)
    1.77  #define mouse_relative		(this->hidden->mouse_relative)
    1.78  #define SDL_modelist		(this->hidden->modelist)
    1.79 +#define xinerama_info		(this->hidden->xinerama_info)
    1.80  #define saved_mode		(this->hidden->saved_mode)
    1.81  #define saved_view		(this->hidden->saved_view)
    1.82 -#define use_xme			(this->hidden->use_xme)
    1.83  #define saved_res		(this->hidden->saved_res)
    1.84 -#define use_xrandr		(this->hidden->use_xrandr)
    1.85  #define screen_config		(this->hidden->screen_config)
    1.86  #define saved_size_id		(this->hidden->saved_size_id)
    1.87  #define saved_rotation		(this->hidden->saved_rotation)
    1.88 -#define xinerama_x		(this->hidden->xinerama_x)
    1.89 -#define xinerama_y		(this->hidden->xinerama_y)
    1.90 +#define use_xinerama		(this->hidden->use_xinerama)
    1.91  #define use_vidmode		(this->hidden->use_vidmode)
    1.92 +#define use_xrandr		(this->hidden->use_xrandr)
    1.93 +#define use_xme			(this->hidden->use_xme)
    1.94  #define currently_fullscreen	(this->hidden->currently_fullscreen)
    1.95  #define switch_waiting		(this->hidden->switch_waiting)
    1.96  #define switch_time		(this->hidden->switch_time)
    1.97 @@ -196,6 +208,8 @@
    1.98  #define gamma_saved		(this->hidden->gamma_saved)
    1.99  #define gamma_changed		(this->hidden->gamma_changed)
   1.100  #define SDL_iconcolors		(this->hidden->iconcolors)
   1.101 +#define screensaver_timeout	(this->hidden->screensaver_timeout)
   1.102 +#define dpms_enabled		(this->hidden->dpms_enabled)
   1.103  /* Some versions of XFree86 have bugs - detect if this is one of them */
   1.104  #define BUGGY_XFREE86(condition, buggy_version) \
   1.105  ((SDL_strcmp(ServerVendor(SDL_Display), "The XFree86 Project, Inc") == 0) && \