comparison src/video/x11/SDL_x11video.h @ 1589:34cca785be57

Xrandr support in the X11 target. Fixes Bugzilla #109, and as a bonus, Bugzilla #145, too!
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 22 Mar 2006 11:13:58 +0000
parents 8d9bb0cf2c2a
children 14717b52abc0 c2c6ff414ef5
comparison
equal deleted inserted replaced
1588:e20dcef5647c 1589:34cca785be57
37 #if SDL_VIDEO_DRIVER_X11_VIDMODE 37 #if SDL_VIDEO_DRIVER_X11_VIDMODE
38 #include "../Xext/extensions/xf86vmode.h" 38 #include "../Xext/extensions/xf86vmode.h"
39 #endif 39 #endif
40 #if SDL_VIDEO_DRIVER_X11_XME 40 #if SDL_VIDEO_DRIVER_X11_XME
41 #include "../Xext/extensions/xme.h" 41 #include "../Xext/extensions/xme.h"
42 #endif
43 #if SDL_VIDEO_DRIVER_X11_XRANDR
44 #include <X11/extensions/Xrandr.h>
42 #endif 45 #endif
43 46
44 #include "SDL_x11dyn.h" 47 #include "SDL_x11dyn.h"
45 48
46 /* Hidden "this" pointer for the video functions */ 49 /* Hidden "this" pointer for the video functions */
114 #endif 117 #endif
115 #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */ 118 #if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */
116 int use_xme; 119 int use_xme;
117 XiGMiscResolutionInfo saved_res; 120 XiGMiscResolutionInfo saved_res;
118 #endif 121 #endif
122 #if SDL_VIDEO_DRIVER_X11_XRANDR
123 XRRScreenConfiguration* screen_config;
124 int saved_size_id;
125 Rotation saved_rotation;
126 #endif
119 127
120 int xinerama_x; 128 int xinerama_x;
121 int xinerama_y; 129 int xinerama_y;
122 int use_vidmode; 130 int use_vidmode;
131 int use_xrandr;
123 int currently_fullscreen; 132 int currently_fullscreen;
124 133
125 /* Automatic mode switching support (entering/leaving fullscreen) */ 134 /* Automatic mode switching support (entering/leaving fullscreen) */
126 Uint32 switch_waiting; 135 Uint32 switch_waiting;
127 Uint32 switch_time; 136 Uint32 switch_time;
167 #define SDL_modelist (this->hidden->modelist) 176 #define SDL_modelist (this->hidden->modelist)
168 #define saved_mode (this->hidden->saved_mode) 177 #define saved_mode (this->hidden->saved_mode)
169 #define saved_view (this->hidden->saved_view) 178 #define saved_view (this->hidden->saved_view)
170 #define use_xme (this->hidden->use_xme) 179 #define use_xme (this->hidden->use_xme)
171 #define saved_res (this->hidden->saved_res) 180 #define saved_res (this->hidden->saved_res)
181 #define use_xrandr (this->hidden->use_xrandr)
182 #define screen_config (this->hidden->screen_config)
183 #define saved_size_id (this->hidden->saved_size_id)
184 #define saved_rotation (this->hidden->saved_rotation)
172 #define xinerama_x (this->hidden->xinerama_x) 185 #define xinerama_x (this->hidden->xinerama_x)
173 #define xinerama_y (this->hidden->xinerama_y) 186 #define xinerama_y (this->hidden->xinerama_y)
174 #define use_vidmode (this->hidden->use_vidmode) 187 #define use_vidmode (this->hidden->use_vidmode)
175 #define currently_fullscreen (this->hidden->currently_fullscreen) 188 #define currently_fullscreen (this->hidden->currently_fullscreen)
176 #define switch_waiting (this->hidden->switch_waiting) 189 #define switch_waiting (this->hidden->switch_waiting)