comparison include/SDL_syswm.h @ 3872:be84332e761e SDL-1.2

Fixed bug #278 Added the GFX_Display to the wminfo structure, contributed by Eric
author Sam Lantinga <slouken@libsdl.org>
date Sun, 24 Sep 2006 00:08:28 +0000
parents a9be6a3a51d1
children a1b03ba2fcd0
comparison
equal deleted inserted replaced
3871:4d11f2ae7582 3872:be84332e761e
84 union { 84 union {
85 struct { 85 struct {
86 Display *display; /* The X11 display */ 86 Display *display; /* The X11 display */
87 Window window; /* The X11 display window */ 87 Window window; /* The X11 display window */
88 /* These locking functions should be called around 88 /* These locking functions should be called around
89 any X11 functions using the display variable. 89 any X11 functions using the display variable,
90 but not the gfxdisplay variable.
90 They lock the event thread, so should not be 91 They lock the event thread, so should not be
91 called around event functions or from event filters. 92 called around event functions or from event filters.
92 */ 93 */
93 void (*lock_func)(void); 94 void (*lock_func)(void);
94 void (*unlock_func)(void); 95 void (*unlock_func)(void);
95 96
96 /* Introduced in SDL 1.0.2 */ 97 /* Introduced in SDL 1.0.2 */
97 Window fswindow; /* The X11 fullscreen window */ 98 Window fswindow; /* The X11 fullscreen window */
98 Window wmwindow; /* The X11 managed input window */ 99 Window wmwindow; /* The X11 managed input window */
100
101 /* Introduced in SDL 1.2.12 */
102 Display *gfxdisplay; /* The X11 display to which rendering is done */
99 } x11; 103 } x11;
100 } info; 104 } info;
101 } SDL_SysWMinfo; 105 } SDL_SysWMinfo;
102 106
103 #elif defined(SDL_VIDEO_DRIVER_NANOX) 107 #elif defined(SDL_VIDEO_DRIVER_NANOX)