pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented X11 system window manager info for SDL 1.3. It's simple. Really.

Browse source
This commit is contained in:
Sam Lantinga 2010-07-12 01:20:57 -07:00
parent 18f003c169
commit c792268d84
2 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/SDL_syswm.h
View file

@ -106,24 +106,6 @@ struct SDL_SysWMinfo
{ {
Display *display; /**< The X11 display */ Display *display; /**< The X11 display */
Window window; /**< The X11 display window */ Window window; /**< The X11 display window */
/**
* These locking functions should be called around
* any X11 functions using the display variable.
* They lock the event thread, so should not be
* called around event functions or from event filters.
*/
/*@{*/
void (*lock_func) (void);
void (*unlock_func) (void);
/*@}*/
/**
* Introduced in SDL 1.0.2.
*/
/*@{*/
Window fswindow; /**< The X11 fullscreen window */
Window wmwindow; /**< The X11 managed input window */
/*@}*/
} x11; } x11;
} info; } info;
}; };

10
src/video/x11/SDL_x11window.c
View file

@ -1014,8 +1014,14 @@ X11_DestroyWindow(_THIS, SDL_Window * window)
SDL_bool SDL_bool
X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
{ {
if (info->version.major <= SDL_MAJOR_VERSION) { SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
/* FIXME! */ Display *display = data->videodata->display;
if (info->version.major == SDL_MAJOR_VERSION &&
info->version.minor == SDL_MINOR_VERSION) {
info->subsystem = SDL_SYSWM_X11;
info->info.x11.display = display;
info->info.x11.window = data->xwindow;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d\n",