From 08cf81f164dc5bb116d811258a220fa831043736 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 27 Sep 2009 22:41:34 +0000 Subject: [PATCH] Fixed bug #616 rainer canavan 2009-03-29 12:30:12 PDT add default visual to this->hidden->visuals X11_SetIcon appears to have problems getting the correct bpp for the default visual of my screen. With larger icons, this causes a segfault somewhere in libX11. Instead of adding the default visual to the internal list, I can work around this problem (both the segfault and the distortion) by setting bpp to 32 before sicon = SDL_CreateRGBSurface(...) in X11_SetIcon, although with this patch, it stays at 24. --HG-- branch : SDL-1.2 --- src/video/x11/SDL_x11modes.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c index d3b8fc82f..60d8dc0e6 100644 --- a/src/video/x11/SDL_x11modes.c +++ b/src/video/x11/SDL_x11modes.c @@ -338,6 +338,18 @@ static void move_cursor_to(_THIS, int x, int y) XWarpPointer(SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); } +static int add_default_visual(_THIS) +{ + int i; + int n = this->hidden->nvisuals; + for (i=0; ihidden->visuals[i].visual == DefaultVisual(SDL_Display, SDL_Screen)) return n; + } + this->hidden->visuals[n].depth = DefaultDepth(SDL_Display, SDL_Screen);; + this->hidden->visuals[n].visual = DefaultVisual(SDL_Display, SDL_Screen);; + this->hidden->nvisuals++; + return(this->hidden->nvisuals); +} static int add_visual(_THIS, int depth, int class) { XVisualInfo vi; @@ -801,6 +813,7 @@ int X11_GetVideoModes(_THIS) add_visual(this, depth_list[i], StaticColor); } } + add_default_visual(this); } if ( this->hidden->nvisuals == 0 ) { SDL_SetError("Found no sufficiently capable X11 visuals");