src/video/x11/SDL_x11video.h
changeset 1361 19418e4422cb
parent 1336 3692456e7b0f
child 1402 d910939febfa
equal deleted inserted replaced
1360:70a9cfb4cf1b 1361:19418e4422cb
    25 
    25 
    26 #include <X11/Xlib.h>
    26 #include <X11/Xlib.h>
    27 #include <X11/Xutil.h>
    27 #include <X11/Xutil.h>
    28 #include <X11/Xatom.h>
    28 #include <X11/Xatom.h>
    29 
    29 
    30 #ifdef XFREE86_DGAMOUSE
    30 #include "SDL_mouse.h"
    31 #include <Xext/extensions/xf86dga.h>
    31 #include "../SDL_sysvideo.h"
       
    32 
       
    33 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE
       
    34 #include "../Xext/extensions/xf86dga.h"
    32 #endif
    35 #endif
    33 #ifdef XFREE86_VM
    36 #if SDL_VIDEO_DRIVER_X11_VIDMODE
    34 #include <Xext/extensions/xf86vmode.h>
    37 #include "../Xext/extensions/xf86vmode.h"
    35 #endif
    38 #endif
    36 #ifdef HAVE_XIGXME
    39 #if SDL_VIDEO_DRIVER_X11_XME
    37 #include <Xext/extensions/xme.h>
    40 #include "../Xext/extensions/xme.h"
    38 #endif
    41 #endif
    39 
    42 
    40 #include <string.h>
       
    41 
       
    42 #include "SDL_mouse.h"
       
    43 #include "SDL_sysvideo.h"
       
    44 #include "SDL_x11dyn.h"
    43 #include "SDL_x11dyn.h"
    45 
    44 
    46 /* Hidden "this" pointer for the video functions */
    45 /* Hidden "this" pointer for the video functions */
    47 #define _THIS	SDL_VideoDevice *this
    46 #define _THIS	SDL_VideoDevice *this
    48 
    47 
   104 
   103 
   105     Visual *vis;		/* current visual in use */
   104     Visual *vis;		/* current visual in use */
   106     int depth;			/* current visual depth (not bpp) */
   105     int depth;			/* current visual depth (not bpp) */
   107 
   106 
   108     /* Variables used by the X11 video mode code */
   107     /* Variables used by the X11 video mode code */
   109 #ifdef XFREE86_VM
   108 #if SDL_VIDEO_DRIVER_X11_VIDMODE
   110     SDL_NAME(XF86VidModeModeInfo) saved_mode;
   109     SDL_NAME(XF86VidModeModeInfo) saved_mode;
   111     struct {
   110     struct {
   112         int x, y;
   111         int x, y;
   113     } saved_view;
   112     } saved_view;
   114 #endif
   113 #endif
   115 #ifdef HAVE_XIGXME /* XiG XME fullscreen */
   114 #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */
   116     int use_xme;
   115     int use_xme;
   117     XiGMiscResolutionInfo saved_res;
   116     XiGMiscResolutionInfo saved_res;
   118 #endif
   117 #endif
   119 
   118 
   120     int xinerama_x;
   119     int xinerama_x;