x11: add a hint to force the VisualID used when creating a window.

This commit is contained in:
Sam Lantinga 2019-09-04 09:27:58 -07:00
parent f49c07b5c4
commit e5580e18ba
3 changed files with 27 additions and 1 deletions

0
Android.mk Normal file → Executable file
View File

View File

@ -197,6 +197,12 @@ extern "C" {
*/ */
#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" #define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR"
/**
* \brief A variable forcing the visual ID chosen for new X11 windows
*
*/
#define SDL_HINT_VIDEO_X11_WINDOW_VISUALID "SDL_VIDEO_X11_WINDOW_VISUALID"
/** /**
* \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported.
* *

View File

@ -393,7 +393,27 @@ X11_CreateWindow(_THIS, SDL_Window * window)
long fevent = 0; long fevent = 0;
#if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_EGL
if ((window->flags & SDL_WINDOW_OPENGL) && const char *forced_visual_id = SDL_GetHint(SDL_HINT_VIDEO_X11_WINDOW_VISUALID);
if (forced_visual_id != NULL && forced_visual_id[0] != '\0')
{
XVisualInfo *vi, template;
int nvis;
SDL_zero(template);
template.visualid = SDL_strtol(forced_visual_id, NULL, 0);
vi = X11_XGetVisualInfo(display, VisualIDMask, &template, &nvis);
if (vi) {
visual = vi->visual;
depth = vi->depth;
X11_XFree(vi);
}
else
{
return -1;
}
}
else if ((window->flags & SDL_WINDOW_OPENGL) &&
!SDL_getenv("SDL_VIDEO_X11_VISUALID")) { !SDL_getenv("SDL_VIDEO_X11_VISUALID")) {
XVisualInfo *vinfo = NULL; XVisualInfo *vinfo = NULL;