Mercurial > sdl-ios-xcode

diff src/video/x11/SDL_x11video.h @ 1662:782fd950bd46 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revamp of the video system in progress - adding support for multiple displays, multiple windows, and a full video mode selection API. WARNING: None of the video drivers have been updated for the new API yet! The API is still under design and very fluid. The code is now run through a consistent indent format: indent -i4 -nut -nsc -br -ce The headers are being converted to automatically generate doxygen documentation.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 28 May 2006 13:04:16 +0000
parents 14717b52abc0
children 4da1ee79c9af
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.h	Sun May 21 17:27:13 2006 +0000
+++ b/src/video/x11/SDL_x11video.h	Sun May 28 13:04:16 2006 +0000
@@ -36,7 +36,7 @@
 #endif
 #if SDL_VIDEO_DRIVER_X11_XINERAMA
 #include "../Xext/extensions/Xinerama.h"
-#endif 
+#endif
 #if SDL_VIDEO_DRIVER_X11_XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -56,20 +56,21 @@
 #define _THIS	SDL_VideoDevice *this
 
 /* Private display data */
-struct SDL_PrivateVideoData {
-    int local_X11;		/* Flag: true if local display */
-    Display *X11_Display;	/* Used for events and window management */
-    Display *GFX_Display;	/* Used for graphics and colormap stuff */
-    Visual *SDL_Visual;		/* The visual used by our window */
-    Window WMwindow;		/* Input window, managed by window manager */
-    Window FSwindow;		/* Fullscreen window, completely unmanaged */
-    Window SDL_Window;		/* Shared by both displays (no X security?) */
-    Atom WM_DELETE_WINDOW;	/* "close-window" protocol atom */
-    WMcursor *BlankCursor;	/* The invisible cursor */
-    XIM X11_IM;		/* Used to communicate with the input method (IM) server */
-    XIC X11_IC;		/* Used for retaining the state, properties, and semantics of communication with                                                  the input method (IM) server */
+struct SDL_PrivateVideoData
+{
+    int local_X11;              /* Flag: true if local display */
+    Display *X11_Display;       /* Used for events and window management */
+    Display *GFX_Display;       /* Used for graphics and colormap stuff */
+    Visual *SDL_Visual;         /* The visual used by our window */
+    Window WMwindow;            /* Input window, managed by window manager */
+    Window FSwindow;            /* Fullscreen window, completely unmanaged */
+    Window SDL_Window;          /* Shared by both displays (no X security?) */
+    Atom WM_DELETE_WINDOW;      /* "close-window" protocol atom */
+    WMcursor *BlankCursor;      /* The invisible cursor */
+    XIM X11_IM;                 /* Used to communicate with the input method (IM) server */
+    XIC X11_IC;                 /* Used for retaining the state, properties, and semantics of communication with                                                  the input method (IM) server */
 
-    char *SDL_windowid;		/* Flag: true if we have been passed a window */
+    char *SDL_windowid;         /* Flag: true if we have been passed a window */
 
     /* Direct Graphics Access extension information */
     int using_dga;
@@ -81,55 +82,56 @@
 #endif
 
     /* The variables used for displaying graphics */
-    XImage *Ximage;		/* The X image for our window */
-    GC	gc;			/* The graphic context for drawing */
+    XImage *Ximage;             /* The X image for our window */
+    GC gc;                      /* The graphic context for drawing */
 
     /* The current width and height of the fullscreen mode */
     int window_w;
     int window_h;
 
     /* Support for internal mouse warping */
-    struct {
+    struct
+    {
         int x;
         int y;
     } mouse_last;
-    struct {
+    struct
+    {
         int numerator;
         int denominator;
         int threshold;
     } mouse_accel;
     int mouse_relative;
 
-    /* The current list of available video modes */
-    SDL_Rect **modelist;
-
     /* available visuals of interest to us, sorted deepest first */
-    struct {
-	Visual *visual;
-	int depth;		/* number of significant bits/pixel */
-	int bpp;		/* pixel quantum in bits */
-    } visuals[2*5];		/* at most 2 entries for 8, 15, 16, 24, 32 */
+    struct
+    {
+        Visual *visual;
+        int depth;              /* number of significant bits/pixel */
+        int bpp;                /* pixel quantum in bits */
+    } visuals[2 * 5];           /* at most 2 entries for 8, 15, 16, 24, 32 */
     int nvisuals;
 
-    Visual *vis;		/* current visual in use */
-    int depth;			/* current visual depth (not bpp) */
+    Visual *vis;                /* current visual in use */
+    int depth;                  /* current visual depth (not bpp) */
 
     /* Variables used by the X11 video mode code */
 #if SDL_VIDEO_DRIVER_X11_XINERAMA
-    SDL_NAME(XineramaScreenInfo) xinerama_info;
+      SDL_NAME (XineramaScreenInfo) * xinerama;
 #endif
 #if SDL_VIDEO_DRIVER_X11_XRANDR
-    XRRScreenConfiguration* screen_config;
+    XRRScreenConfiguration *screen_config;
     int saved_size_id;
     Rotation saved_rotation;
 #endif
 #if SDL_VIDEO_DRIVER_X11_VIDMODE
-    SDL_NAME(XF86VidModeModeInfo) saved_mode;
-    struct {
+      SDL_NAME (XF86VidModeModeInfo) saved_mode;
+    struct
+    {
         int x, y;
     } saved_view;
 #endif
-#if SDL_VIDEO_DRIVER_X11_XME /* XiG XME fullscreen */
+#if SDL_VIDEO_DRIVER_X11_XME    /* XiG XME fullscreen */
     XiGMiscResolutionInfo saved_res;
 #endif
 
@@ -147,13 +149,13 @@
     int blit_queued;
 
     /* Colormap handling */
-    Colormap DisplayColormap;	/* The default display colormap */
-    Colormap XColorMap;		/* The current window colormap */
-    int *XPixels;		/* pixels value allocation counts */
-    float gamma_saved[3];	/* Saved gamma values for VidMode gamma */
-    int gamma_changed;		/* flag: has VidMode gamma been modified? */
+    Colormap DisplayColormap;   /* The default display colormap */
+    Colormap XColorMap;         /* The current window colormap */
+    int *XPixels;               /* pixels value allocation counts */
+    float gamma_saved[3];       /* Saved gamma values for VidMode gamma */
+    int gamma_changed;          /* flag: has VidMode gamma been modified? */
 
-    short *iconcolors;		/* List of colors used by the icon */
+    short *iconcolors;          /* List of colors used by the icon */
 
     /* Screensaver settings */
     int screensaver_timeout;
@@ -186,7 +188,7 @@
 #define mouse_accel		(this->hidden->mouse_accel)
 #define mouse_relative		(this->hidden->mouse_relative)
 #define SDL_modelist		(this->hidden->modelist)
-#define xinerama_info		(this->hidden->xinerama_info)
+#define xinerama		(this->hidden->xinerama)
 #define saved_mode		(this->hidden->saved_mode)
 #define saved_view		(this->hidden->saved_view)
 #define saved_res		(this->hidden->saved_res)
@@ -216,3 +218,4 @@
  (VendorRelease(SDL_Display) condition buggy_version))
 
 #endif /* _SDL_x11video_h */
+/* vi: set ts=4 sw=4 expandtab: */