| Summary: | SDL_syswm struct under X11 does not give access to GFX_Display | ||
|---|---|---|---|
| Product: | SDL | Reporter: | Eric <sressored> |
| Component: | video | Assignee: | Eric <sressored> |
| Status: | RESOLVED FIXED | QA Contact: | Sam Lantinga <slouken> |
| Severity: | enhancement | ||
| Priority: | P2 | ||
| Version: | 1.2.11 | ||
| Hardware: | x86 | ||
| OS: | Linux | ||
| Attachments: | Adds GFX_Display to SysWMinfo structure | ||
|
Description
Eric
2006-07-12 01:48:56 UTC
Created attachment 146 [details]
Adds GFX_Display to SysWMinfo structure
Added a patch that exposes GFX_Display in the SysWMinfo structure
Comment on attachment 146 [details]
Adds GFX_Display to SysWMinfo structure
Index: SDL-1.2/src/video/x11/SDL_x11wm.c
===================================================================
--- SDL-1.2/src/video/x11/SDL_x11wm.c (revision 2615)
+++ SDL-1.2/src/video/x11/SDL_x11wm.c (working copy)
@@ -398,6 +398,7 @@
XSync(SDL_Display, False);
SDL_Unlock_EventThread();
}
+
int X11_GetWMInfo(_THIS, SDL_SysWMinfo *info)
{
if ( info->version.major <= SDL_MAJOR_VERSION ) {
@@ -410,6 +411,14 @@
info->info.x11.fswindow = FSwindow;
info->info.x11.wmwindow = WMwindow;
}
+
+
+ if ( SDL_VERSIONNUM(info->version.major,
+ info->version.minor,
+ info->version.patch) >= 1212 ) {
+ info->info.x11.gfxdisplay = GFX_Display;
+ }
+
info->info.x11.lock_func = lock_display;
info->info.x11.unlock_func = unlock_display;
return(1);
Index: SDL-1.2/include/SDL_syswm.h
===================================================================
--- SDL-1.2/include/SDL_syswm.h (revision 2615)
+++ SDL-1.2/include/SDL_syswm.h (working copy)
@@ -86,7 +86,8 @@
Display *display; /* The X11 display */
Window window; /* The X11 display window */
/* These locking functions should be called around
- any X11 functions using the display variable.
+ any X11 functions using the display variable,
+ but not the gfxdisplay variable.
They lock the event thread, so should not be
called around event functions or from event filters.
*/
@@ -96,6 +97,9 @@
/* Introduced in SDL 1.0.2 */
Window fswindow; /* The X11 fullscreen window */
Window wmwindow; /* The X11 managed input window */
+
+ /* Introduced in SDL 1.2.11 */
+ Display *gfxdisplay; /*The X11 display to which rendering is done */
} x11;
} info;
} SDL_SysWMinfo;
this is in subversion, thanks! |