Mercurial > sdl-ios-xcode

comparison src/video/dga/SDL_dgavideo.h @ 1659:14717b52abc0 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents d910939febfa
children 782fd950bd46
comparison
equal deleted inserted replaced
1658:e49147870aac 1659:14717b52abc0
23 23
24 #ifndef _SDL_dgavideo_h 24 #ifndef _SDL_dgavideo_h
25 #define _SDL_dgavideo_h 25 #define _SDL_dgavideo_h
26 26
27 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
28 #include <X11/Xproto.h>
28 29
29 #include "SDL_mouse.h" 30 #include "SDL_mouse.h"
30 #include "SDL_mutex.h" 31 #include "SDL_mutex.h"
31 #include "../SDL_sysvideo.h" 32 #include "../SDL_sysvideo.h"
33
34 #if SDL_VIDEO_DRIVER_X11_DPMS
35 #include <X11/extensions/dpms.h>
36 #endif
32 37
33 /* Hidden "this" pointer for the video functions */ 38 /* Hidden "this" pointer for the video functions */
34 #define _THIS SDL_VideoDevice *this 39 #define _THIS SDL_VideoDevice *this
35 40
36 /* Define this if you need the DGA driver to be thread-safe */ 41 /* Define this if you need the DGA driver to be thread-safe */
84 /* Used to handle DGA events */ 89 /* Used to handle DGA events */
85 int event_base; 90 int event_base;
86 #ifdef LOCK_DGA_DISPLAY 91 #ifdef LOCK_DGA_DISPLAY
87 SDL_mutex *event_lock; 92 SDL_mutex *event_lock;
88 #endif 93 #endif
94
95 /* Screensaver settings */
96 int screensaver_timeout;
97 BOOL dpms_enabled;
89 }; 98 };
90 /* Old variable names */ 99 /* Old variable names */
91 #define DGA_Display (this->hidden->DGA_Display) 100 #define DGA_Display (this->hidden->DGA_Display)
92 #define DGA_Screen DefaultScreen(DGA_Display) 101 #define DGA_Screen DefaultScreen(DGA_Display)
93 #define DGA_colormap (this->hidden->DGA_colormap) 102 #define DGA_colormap (this->hidden->DGA_colormap)
105 #define surfaces_memtotal (this->hidden->surfaces_memtotal) 114 #define surfaces_memtotal (this->hidden->surfaces_memtotal)
106 #define surfaces_memleft (this->hidden->surfaces_memleft) 115 #define surfaces_memleft (this->hidden->surfaces_memleft)
107 #define hw_lock (this->hidden->hw_lock) 116 #define hw_lock (this->hidden->hw_lock)
108 #define DGA_event_base (this->hidden->event_base) 117 #define DGA_event_base (this->hidden->event_base)
109 #define event_lock (this->hidden->event_lock) 118 #define event_lock (this->hidden->event_lock)
119 #define screensaver_timeout (this->hidden->screensaver_timeout)
120 #define dpms_enabled (this->hidden->dpms_enabled)
110 121
111 #endif /* _SDL_dgavideo_h */ 122 #endif /* _SDL_dgavideo_h */