src/video/x11/SDL_x11video.h
changeset 1765 c2c6ff414ef5
parent 1589 34cca785be57
child 1783 c546353b1ad4
     1.1 --- a/src/video/x11/SDL_x11video.h	Thu May 04 13:47:19 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11video.h	Thu May 04 16:51:07 2006 +0000
     1.3 @@ -34,15 +34,18 @@
     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 -#endif
    1.22  
    1.23  #include "SDL_x11dyn.h"
    1.24  
    1.25 @@ -109,6 +112,14 @@
    1.26      int depth;			/* current visual depth (not bpp) */
    1.27  
    1.28      /* Variables used by the X11 video mode code */
    1.29 +#if SDL_VIDEO_DRIVER_X11_XINERAMA
    1.30 +    SDL_NAME(XineramaScreenInfo) xinerama_info;
    1.31 +#endif
    1.32 +#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.33 +    XRRScreenConfiguration* screen_config;
    1.34 +    int saved_size_id;
    1.35 +    Rotation saved_rotation;
    1.36 +#endif
    1.37  #if SDL_VIDEO_DRIVER_X11_VIDMODE
    1.38      SDL_NAME(XF86VidModeModeInfo) saved_mode;
    1.39      struct {
    1.40 @@ -116,19 +127,13 @@
    1.41      } saved_view;
    1.42  #endif
    1.43  #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */
    1.44 -    int use_xme;
    1.45      XiGMiscResolutionInfo saved_res;
    1.46  #endif
    1.47 -#if SDL_VIDEO_DRIVER_X11_XRANDR
    1.48 -    XRRScreenConfiguration* screen_config;
    1.49 -    int saved_size_id;
    1.50 -    Rotation saved_rotation;
    1.51 -#endif
    1.52  
    1.53 -    int xinerama_x;
    1.54 -    int xinerama_y;
    1.55 +    int use_xinerama;
    1.56 +    int use_xrandr;
    1.57      int use_vidmode;
    1.58 -    int use_xrandr;
    1.59 +    int use_xme;
    1.60      int currently_fullscreen;
    1.61  
    1.62      /* Automatic mode switching support (entering/leaving fullscreen) */
    1.63 @@ -174,17 +179,17 @@
    1.64  #define mouse_accel		(this->hidden->mouse_accel)
    1.65  #define mouse_relative		(this->hidden->mouse_relative)
    1.66  #define SDL_modelist		(this->hidden->modelist)
    1.67 +#define xinerama_info		(this->hidden->xinerama_info)
    1.68  #define saved_mode		(this->hidden->saved_mode)
    1.69  #define saved_view		(this->hidden->saved_view)
    1.70 -#define use_xme			(this->hidden->use_xme)
    1.71  #define saved_res		(this->hidden->saved_res)
    1.72 -#define use_xrandr		(this->hidden->use_xrandr)
    1.73  #define screen_config		(this->hidden->screen_config)
    1.74  #define saved_size_id		(this->hidden->saved_size_id)
    1.75  #define saved_rotation		(this->hidden->saved_rotation)
    1.76 -#define xinerama_x		(this->hidden->xinerama_x)
    1.77 -#define xinerama_y		(this->hidden->xinerama_y)
    1.78 +#define use_xinerama		(this->hidden->use_xinerama)
    1.79  #define use_vidmode		(this->hidden->use_vidmode)
    1.80 +#define use_xrandr		(this->hidden->use_xrandr)
    1.81 +#define use_xme			(this->hidden->use_xme)
    1.82  #define currently_fullscreen	(this->hidden->currently_fullscreen)
    1.83  #define switch_waiting		(this->hidden->switch_waiting)
    1.84  #define switch_time		(this->hidden->switch_time)