This code adds support for DirectColor visuals to SDL 1.3. The support uses...

This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is
available and to keep people form having to install yet another library I have added the essential parts of Xmu in
src/video/extensions/XmuStdCmap and an include file in src/video/extensions. The support makes use of standard X11 mechanisms to
create color maps and make sure that an application uses the same color map for each window/visual combination. This should make it
possible for gamma support to be implemented based on a single color map per application.

Hurm... it looks like "make indent" modified a few extra files. Those are getting committed too.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402509

configure.in

@@ -945,6 +945,7 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma
 
             AC_DEFINE(SDL_VIDEO_DRIVER_X11)
             SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
+            SOURCES="$SOURCES $srcdir/src/video/Xext/XmuStdCmap/*.c"
             EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
 
             if test x$enable_x11_shared = xmaybe; then

src/file/SDL_rwops.c

@@ -191,7 +191,8 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
         void *data = (char *) context->hidden.win32io.buffer.data +
             context->hidden.win32io.buffer.size -
             context->hidden.win32io.buffer.left;
-        read_ahead = SDL_min(total_need, (size_t)context->hidden.win32io.buffer.left);
+        read_ahead =
+            SDL_min(total_need, (size_t) context->hidden.win32io.buffer.left);
         SDL_memcpy(ptr, data, read_ahead);
         context->hidden.win32io.buffer.left -= read_ahead;
 

src/video/Xext/XmuStdCmap/AllCmap.c

+/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
+
+/* 
+ 
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include "../extensions/StdCmap.h"
+
+static XVisualInfo *getDeepestVisual(int, XVisualInfo *, int);
+
+/*
+ * To create all of the appropriate standard colormaps for every visual of
+ * every screen on a given display, use XmuAllStandardColormaps.
+ *
+ * Define and retain as permanent resources all standard colormaps which are
+ * meaningful for the visuals of each screen of the display.  Return 0 on
+ * failure, non-zero on success.  If the property of any standard colormap 
+ * is already defined, redefine it.
+ *
+ * This interface is intended to be used by window managers or a client
+ * upon start-up of a session.
+ *
+ * The standard colormaps of a screen are defined by properties associated
+ * with the screen's root window.  Each screen has exactly one root window.
+ * The property names of standard colormaps are predefined, and each property
+ * name may describe at most one colormap.
+ * 
+ * The standard colormaps are
+ *		RGB_BEST_MAP
+ *		RGB_RED_MAP
+ *		RGB_GREEN_MAP
+ *		RGB_BLUE_MAP
+ *		RGB_DEFAULT_MAP
+ *		RGB_GRAY_MAP
+ *
+ * Therefore a screen may have at most 6 standard colormap properties defined.
+ *
+ * A standard colormap is associated with a particular visual of the screen.
+ * A screen may have multiple visuals defined, including visuals of the same
+ * class at different depths.  Note that a visual id might be repeated for
+ * more than one depth, so the visual id and the depth of a visual identify
+ * the visual.  The characteristics of the visual will determine which
+ * standard colormaps are meaningful under that visual, and will determine
+ * how the standard colormap is defined.  Because a standard colormap is
+ * associated with a specific visual, there must be a method of determining
+ * which visuals take precedence in defining standard colormaps.
+ * 
+ * The method used here is: for the visual of greatest depth, define all 
+ * standard colormaps meaningful to that visual class, according to this
+ * order of (descending) precedence:
+ *	1. DirectColor
+ *	2. PseudoColor
+ *	3. TrueColor and GrayScale
+ *	4. StaticColor and StaticGray
+ *
+ * Allows partial success by screenful.  For example, if a map on screen 1
+ * fails, the maps on screen 0, created earlier, will remain.  However,
+ * none on screen 1 will remain.  If a map on 0 fails, none will remain.
+ *
+ * See the comments under XmuVisualStandardColormaps() for notes on which
+ * standard colormaps are meaningful under these classes of visuals.
+ */
+
+Status
+XmuAllStandardColormaps(Display * dpy)
+{
+    int nvisuals, scr;
+    Status status;
+    long vinfo_mask;
+    XVisualInfo template, *vinfo, *v1, *v2;
+
+    status = 0;
+    /* for each screen, determine all visuals of this server */
+    for (scr = 0; scr < ScreenCount(dpy); scr++) {
+        template.screen = scr;
+        vinfo_mask = VisualScreenMask;
+        vinfo = XGetVisualInfo(dpy, vinfo_mask, &template, &nvisuals);
+        if (vinfo == NULL)      /* unexpected: a screen with no visuals */
+            continue;
+
+        v1 = getDeepestVisual(DirectColor, vinfo, nvisuals);
+        v2 = getDeepestVisual(PseudoColor, vinfo, nvisuals);
+
+        if (v2 &&
+            (!v1 || (v2->colormap_size >=
+                     ((v1->red_mask | v1->green_mask | v1->blue_mask) + 1))))
+            status = XmuVisualStandardColormaps(dpy, scr, v2->visualid,
+                                                (unsigned) v2->depth, 1, 1);
+        else if (v1)
+            status = XmuVisualStandardColormaps(dpy, scr, v1->visualid,
+                                                (unsigned) v1->depth, 1, 1);
+
+        else {
+            if (((v1 = getDeepestVisual(TrueColor, vinfo, nvisuals)) != NULL)
+                || ((v1 = getDeepestVisual(StaticColor, vinfo, nvisuals)) !=
+                    NULL))
+                status = XmuVisualStandardColormaps(dpy, scr, v1->visualid,
+                                                    (unsigned) v1->depth, 1,
+                                                    1);
+            if (status
+                &&
+                (((v1 = getDeepestVisual(GrayScale, vinfo, nvisuals)) != NULL)
+                 || ((v1 = getDeepestVisual(StaticGray, vinfo, nvisuals)) !=
+                     NULL)))
+                status =
+                    XmuVisualStandardColormaps(dpy, scr, v1->visualid,
+                                               (unsigned) v1->depth, 1, 1);
+        }
+        XFree((char *) vinfo);
+        if (!status)
+            break;
+    }
+    return status;
+}
+
+static XVisualInfo *
+getDeepestVisual(int visual_class, XVisualInfo * vinfo, int nvisuals)
+{
+    register int i;
+    register int maxdepth = 0;
+    XVisualInfo *v = NULL;
+
+    for (i = 0; i < nvisuals; i++, vinfo++)
+        if (vinfo->class == visual_class && vinfo->depth > maxdepth) {
+            maxdepth = vinfo->depth;
+            v = vinfo;
+        }
+    return (v);
+}

src/video/Xext/XmuStdCmap/DelCmap.c

+/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
+
+/* 
+ 
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
+
+/*
+ * Author:  Donna Converse, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include "../extensions/StdCmap.h"
+
+/* To remove any standard colormap property, use XmuDeleteStandardColormap().
+ * XmuDeleteStandardColormap() will remove the specified property from the
+ * specified screen, releasing any resources used by the colormap(s) of the
+ * property if possible.
+ */
+
+void
+XmuDeleteStandardColormap(Display * dpy, int screen, Atom property)
+     /* dpy;            - specifies the X server to connect to
+      * screen          - specifies the screen of the display
+      * property        - specifies the standard colormap property
+      */
+{
+    XStandardColormap *stdcmaps, *s;
+    int count = 0;
+
+    if (XGetRGBColormaps(dpy, RootWindow(dpy, screen), &stdcmaps, &count,
+                         property)) {
+        for (s = stdcmaps; count > 0; count--, s++) {
+            if ((s->killid == ReleaseByFreeingColormap) &&
+                (s->colormap != None) &&
+                (s->colormap != DefaultColormap(dpy, screen)))
+                XFreeColormap(dpy, s->colormap);
+            else if (s->killid != None)
+                XKillClient(dpy, s->killid);
+        }
+        XDeleteProperty(dpy, RootWindow(dpy, screen), property);
+        XFree((char *) stdcmaps);
+        XSync(dpy, False);
+    }
+}

src/video/Xext/XmuStdCmap/Distinct.c

+/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
+
+/*
+
+Copyright 1990, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */
+
+/*
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xlib.h>
+#include <stdlib.h>
+#include <X11/Xutil.h>
+#include "../extensions/StdCmap.h"
+
+/*
+ * Distinguishable colors routine.  Determines if two colors are
+ * distinguishable or not.  Somewhat arbitrary meaning.
+ */
+
+#define MIN_DISTINGUISH	10000.0
+
+Bool
+XmuDistinguishableColors(XColor * colors, int count)
+{
+    double deltaRed, deltaGreen, deltaBlue;
+    double dist;
+    int i, j;
+
+    for (i = 0; i < count - 1; i++)
+        for (j = i + 1; j < count; j++) {
+            deltaRed = (double) colors[i].red - (double) colors[j].red;
+            deltaGreen = (double) colors[i].green - (double) colors[j].green;
+            deltaBlue = (double) colors[i].blue - (double) colors[j].blue;
+            dist = deltaRed * deltaRed +
+                deltaGreen * deltaGreen + deltaBlue * deltaBlue;
+            if (dist <= MIN_DISTINGUISH * MIN_DISTINGUISH)
+                return False;
+        }
+    return True;
+}
+
+Bool
+XmuDistinguishablePixels(Display * dpy, Colormap cmap,
+                         unsigned long *pixels, int count)
+{
+    XColor *defs;
+    int i, j;
+    Bool ret;
+
+    for (i = 0; i < count - 1; i++)
+        for (j = i + 1; j < count; j++)
+            if (pixels[i] == pixels[j])
+                return False;
+    defs = (XColor *) malloc(count * sizeof(XColor));
+    if (!defs)
+        return False;
+    for (i = 0; i < count; i++)
+        defs[i].pixel = pixels[i];
+    XQueryColors(dpy, cmap, defs, count);
+    ret = XmuDistinguishableColors(defs, count);
+    free((char *) defs);
+    return ret;
+}

src/video/Xext/XmuStdCmap/StdCmap.c

+/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
+
+/* 
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */
+
+/*
+ * Author:  Donna Converse, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include "../extensions/StdCmap.h"
+
+#define lowbit(x) ((x) & (~(x) + 1))
+
+/*
+ * Prototypes
+ */
+/* argument restrictions */
+static Status valid_args(XVisualInfo *, unsigned long, unsigned long,
+                         unsigned long, Atom);
+
+/*
+ * To create any one standard colormap, use XmuStandardColormap().
+ *
+ * Create a standard colormap for the given screen, visualid, and visual
+ * depth, with the given red, green, and blue maximum values, with the
+ * given standard property name.  Return a pointer to an XStandardColormap
+ * structure which describes the newly created colormap, upon success.
+ * Upon failure, return NULL.
+ * 
+ * XmuStandardColormap() calls XmuCreateColormap() to create the map.
+ *
+ * Resources created by this function are not made permanent; that is the
+ * caller's responsibility.
+ */
+
+XStandardColormap *
+XmuStandardColormap(Display * dpy, int screen, VisualID visualid,
+                    unsigned int depth, Atom property, Colormap cmap,
+                    unsigned long red_max, unsigned long green_max,
+                    unsigned long blue_max)
+     /*
+      * dpy                             - specifies X server connection
+      * screen                          - specifies display screen
+      * visualid                        - identifies the visual type
+      * depth                           - identifies the visual type
+      * property                        - a standard colormap property
+      * cmap                            - specifies colormap ID or None
+      * red_max, green_max, blue_max    - allocations
+      */
+{
+    XStandardColormap *stdcmap;
+    Status status;
+    XVisualInfo vinfo_template, *vinfo;
+    long vinfo_mask;
+    int n;
+
+    /* Match the required visual information to an actual visual */
+    vinfo_template.visualid = visualid;
+    vinfo_template.screen = screen;
+    vinfo_template.depth = depth;
+    vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
+    if ((vinfo =
+         XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &n)) == NULL)
+        return 0;
+
+    /* Check the validity of the combination of visual characteristics,
+     * allocation, and colormap property.  Create an XStandardColormap
+     * structure.
+     */
+
+    if (!valid_args(vinfo, red_max, green_max, blue_max, property)
+        || ((stdcmap = XAllocStandardColormap()) == NULL)) {
+        XFree((char *) vinfo);
+        return 0;
+    }
+
+    /* Fill in the XStandardColormap structure */
+
+    if (cmap == DefaultColormap(dpy, screen)) {
+        /* Allocating out of the default map, cannot use XFreeColormap() */
+        Window win = XCreateWindow(dpy, RootWindow(dpy, screen), 1, 1, 1, 1,
+                                   0, 0, InputOnly, vinfo->visual,
+                                   (unsigned long) 0,
+                                   (XSetWindowAttributes *) NULL);
+        stdcmap->killid = (XID) XCreatePixmap(dpy, win, 1, 1, depth);
+        XDestroyWindow(dpy, win);
+        stdcmap->colormap = cmap;
+    } else {
+        stdcmap->killid = ReleaseByFreeingColormap;
+        stdcmap->colormap = XCreateColormap(dpy, RootWindow(dpy, screen),
+                                            vinfo->visual, AllocNone);
+    }
+    stdcmap->red_max = red_max;
+    stdcmap->green_max = green_max;
+    stdcmap->blue_max = blue_max;
+    if (property == XA_RGB_GRAY_MAP)
+        stdcmap->red_mult = stdcmap->green_mult = stdcmap->blue_mult = 1;
+    else if (vinfo->class == TrueColor || vinfo->class == DirectColor) {
+        stdcmap->red_mult = lowbit(vinfo->red_mask);
+        stdcmap->green_mult = lowbit(vinfo->green_mask);
+        stdcmap->blue_mult = lowbit(vinfo->blue_mask);
+    } else {
+        stdcmap->red_mult = (red_max > 0)
+            ? (green_max + 1) * (blue_max + 1) : 0;
+        stdcmap->green_mult = (green_max > 0) ? blue_max + 1 : 0;
+        stdcmap->blue_mult = (blue_max > 0) ? 1 : 0;
+    }
+    stdcmap->base_pixel = 0;    /* base pixel may change */
+    stdcmap->visualid = vinfo->visualid;
+
+    /* Make the colormap */
+
+    status = XmuCreateColormap(dpy, stdcmap);
+
+    /* Clean up */
+
+    XFree((char *) vinfo);
+    if (!status) {
+
+        /* Free the colormap or the pixmap, if we created one */
+        if (stdcmap->killid == ReleaseByFreeingColormap)
+            XFreeColormap(dpy, stdcmap->colormap);
+        else if (stdcmap->killid != None)
+            XFreePixmap(dpy, stdcmap->killid);
+
+        XFree((char *) stdcmap);
+        return (XStandardColormap *) NULL;
+    }
+    return stdcmap;
+}
+
+/****************************************************************************/
+static Status
+valid_args(XVisualInfo * vinfo, unsigned long red_max,
+           unsigned long green_max, unsigned long blue_max, Atom property)
+     /*
+      * vinfo                           - specifies visual
+      * red_max, green_max, blue_max    - specifies alloc
+      * property                        - specifies property name
+      */
+{
+    unsigned long ncolors;      /* number of colors requested */
+
+    /* Determine that the number of colors requested is <= map size */
+
+    if ((vinfo->class == DirectColor) || (vinfo->class == TrueColor)) {
+        unsigned long mask;
+
+        mask = vinfo->red_mask;
+        while (!(mask & 1))
+            mask >>= 1;
+        if (red_max > mask)
+            return 0;
+        mask = vinfo->green_mask;
+        while (!(mask & 1))
+            mask >>= 1;
+        if (green_max > mask)
+            return 0;
+        mask = vinfo->blue_mask;
+        while (!(mask & 1))
+            mask >>= 1;
+        if (blue_max > mask)
+            return 0;
+    } else if (property == XA_RGB_GRAY_MAP) {
+        ncolors = red_max + green_max + blue_max + 1;
+        if (ncolors > vinfo->colormap_size)
+            return 0;
+    } else {
+        ncolors = (red_max + 1) * (green_max + 1) * (blue_max + 1);
+        if (ncolors > vinfo->colormap_size)
+            return 0;
+    }
+
+    /* Determine that the allocation and visual make sense for the property */
+
+    switch (property) {
+    case XA_RGB_DEFAULT_MAP:
+        if (red_max == 0 || green_max == 0 || blue_max == 0)
+            return 0;
+        break;
+    case XA_RGB_RED_MAP:
+        if (red_max == 0)
+            return 0;
+        break;
+    case XA_RGB_GREEN_MAP:
+        if (green_max == 0)
+            return 0;
+        break;
+    case XA_RGB_BLUE_MAP:
+        if (blue_max == 0)
+            return 0;
+        break;
+    case XA_RGB_BEST_MAP:
+        if (red_max == 0 || green_max == 0 || blue_max == 0)
+            return 0;
+        break;
+    case XA_RGB_GRAY_MAP:
+        if (red_max == 0 || blue_max == 0 || green_max == 0)
+            return 0;
+        break;
+    default:
+        return 0;
+    }
+    return 1;
+}

src/video/Xext/XmuStdCmap/VisCmap.c

+/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
+
+/* 
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
+
+/*
+ * Author:  Donna Converse, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <math.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include "../extensions/StdCmap.h"
+
+/*
+ * To create all of the appropriate standard colormaps for a given visual on
+ * a given screen, use XmuVisualStandardColormaps.
+ * 
+ * Define all appropriate standard colormap properties for the given visual.
+ * If replace is true, any previous definition will be removed.
+ * If retain is true, new properties will be retained for the duration of
+ * the server session.  Return 0 on failure, non-zero on success.
+ * On failure, no new properties will be defined, and, old ones may have
+ * been removed if replace was True.
+ *
+ * Not all standard colormaps are meaningful to all visual classes.  This
+ * routine will check and define the following properties for the following
+ * classes, provided that the size of the colormap is not too small.
+ *
+ *	DirectColor and PseudoColor
+ *	    RGB_DEFAULT_MAP
+ *	    RGB_BEST_MAP
+ *	    RGB_RED_MAP
+ *	    RGB_GREEN_MAP
+ * 	    RGB_BLUE_MAP
+ *          RGB_GRAY_MAP
+ *
+ *	TrueColor and StaticColor
+ *	    RGB_BEST_MAP
+ *
+ *	GrayScale and StaticGray
+ *	    RGB_GRAY_MAP
+ */
+
+Status
+XmuVisualStandardColormaps(Display * dpy, int screen, VisualID visualid,
+                           unsigned int depth, Bool replace, Bool retain)
+     /*
+      * dpy                     - specifies server connection
+      * screen                  - specifies screen number
+      * visualid                - specifies the visual
+      * depth                   - specifies the visual
+      * replace specifies       - whether to replace
+      * retain                  - specifies whether to retain
+      */
+{
+    Status status;
+    int n;
+    long vinfo_mask;
+    XVisualInfo vinfo_template, *vinfo;
+
+    status = 0;
+    vinfo_template.screen = screen;
+    vinfo_template.visualid = visualid;
+    vinfo_template.depth = depth;
+    vinfo_mask = VisualScreenMask | VisualIDMask | VisualDepthMask;
+    if ((vinfo =
+         XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &n)) == NULL)
+        return 0;
+
+    if (vinfo->colormap_size <= 2) {
+        /* Monochrome visuals have no standard maps; considered successful */
+        XFree((char *) vinfo);
+        return 1;
+    }
+
+    switch (vinfo->class) {
+    case PseudoColor:
+    case DirectColor:
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_DEFAULT_MAP, replace,
+                                           retain);
+        if (!status)
+            break;
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_GRAY_MAP, replace, retain);
+        if (!status) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            break;
+        }
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_RED_MAP, replace, retain);
+        if (!status) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GRAY_MAP);
+            break;
+        }
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_GREEN_MAP, replace, retain);
+        if (!status) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GRAY_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_RED_MAP);
+            break;
+        }
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_BLUE_MAP, replace, retain);
+        if (!status) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GRAY_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_RED_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GREEN_MAP);
+            break;
+        }
+        /* fall through */
+
+    case StaticColor:
+    case TrueColor:
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_BEST_MAP, replace, retain);
+        if (!status && (vinfo->class == PseudoColor ||
+                        vinfo->class == DirectColor)) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GRAY_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_RED_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_GREEN_MAP);
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_BLUE_MAP);
+        }
+        break;
+        /* the end for PseudoColor, DirectColor, StaticColor, and TrueColor */
+
+    case GrayScale:
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_DEFAULT_MAP, replace,
+                                           retain);
+        if (!status)
+            break;
+     /*FALLTHROUGH*/ case StaticGray:
+
+        status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
+                                           XA_RGB_GRAY_MAP, replace, retain);
+        if (!status && vinfo->class == GrayScale) {
+            XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
+            break;
+        }
+    }
+
+    XFree((char *) vinfo);
+    return status;
+}

src/video/Xext/extensions/StdCmap.h

+/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
+
+/*
+ 
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.8 2001/01/23 17:38:14 keithp Exp $ */
+
+/*
+ * The interfaces described by this header file are for miscellaneous utilities
+ * and are not part of the Xlib standard.
+ */
+
+#ifndef _XMU_STDCMAP_H_
+#define _XMU_STDCMAP_H_
+
+#include <X11/Xfuncproto.h>
+#include "SDL_name.h"
+
+_XFUNCPROTOBEGIN extern Status XmuAllStandardColormaps(Display * dpy);
+
+extern Status XmuCreateColormap(Display * dpy, XStandardColormap * colormap);
+
+extern void XmuDeleteStandardColormap
+    (Display * dpy, int screen, Atom property);
+
+extern Status XmuGetColormapAllocation
+    (XVisualInfo * vinfo,
+     Atom property,
+     unsigned long *red_max_return,
+     unsigned long *green_max_return, unsigned long *blue_max_return);
+
+extern Status XmuLookupStandardColormap
+    (Display * dpy,
+     int screen,
+     VisualID visualid,
+     unsigned int depth, Atom property, Bool replace, Bool retain);
+
+extern XStandardColormap *XmuStandardColormap
+    (Display * dpy,
+     int screen,
+     VisualID visualid,
+     unsigned int depth,
+     Atom property,
+     Colormap cmap,
+     unsigned long red_max, unsigned long green_max, unsigned long blue_max);
+
+extern Status XmuVisualStandardColormaps
+    (Display * dpy,
+     int screen,
+     VisualID visualid, unsigned int depth, Bool replace, Bool retain);
+
+extern Bool XmuDistinguishableColors(XColor * colors, int count);
+
+extern Bool XmuDistinguishablePixels
+    (Display * dpy, Colormap cmap, unsigned long *pixels, int count);
+
+_XFUNCPROTOEND
+#endif /* _XMU_STDCMAP_H_ */

src/video/x11/SDL_x11sym.h

@@ -25,7 +25,9 @@
 SDL_X11_MODULE(BASEXLIB)
 SDL_X11_SYM(XClassHint*,XAllocClassHint,(void),(),return)
 SDL_X11_SYM(Status,XAllocColor,(Display* a,Colormap b,XColor* c),(a,b,c),return)
+SDL_X11_SYM(Status,XAllocColorCells,(Display *a,Colormap b,Bool c,unsigned long d[],unsigned int e,unsigned long f[],unsigned int g),(a,b,c,d,e,f,g),return)
 SDL_X11_SYM(XSizeHints*,XAllocSizeHints,(void),(),return)
+SDL_X11_SYM(XStandardColormap *,XAllocStandardColormap,(void),(),return)
 SDL_X11_SYM(XWMHints*,XAllocWMHints,(void),(),return)
 SDL_X11_SYM(int,XChangePointerControl,(Display* a,Bool b,Bool c,int d,int e,int f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(int,XChangeProperty,(Display* a,Window b,Atom c,Atom d,int e,int f,_Xconst unsigned char* g,int h),(a,b,c,d,e,f,g,h),return)
@@ -46,7 +48,7 @@ SDL_X11_SYM(int,XDeleteProperty,(Display* a,Window b,Atom c),(a,b,c),return)
 SDL_X11_SYM(int,XDestroyWindow,(Display* a,Window b),(a,b),return)
 SDL_X11_SYM(char*,XDisplayName,(_Xconst char* a),(a),return)
 SDL_X11_SYM(int,XEventsQueued,(Display* a,int b),(a,b),return)
-SDL_X11_SYM(Bool,XFilterEvent,(XEvent *event, Window w),(event,w),return)
+SDL_X11_SYM(Bool,XFilterEvent,(XEvent *event,Window w),(event,w),return)
 SDL_X11_SYM(int,XFlush,(Display* a),(a),return)
 SDL_X11_SYM(int,XFree,(void*a),(a),return)
 SDL_X11_SYM(int,XFreeColormap,(Display* a,Colormap b),(a,b),return)
@@ -58,15 +60,18 @@ SDL_X11_SYM(int,XFreePixmap,(Display* a,Pixmap b),(a,b),return)
 SDL_X11_SYM(int,XGetErrorDatabaseText,(Display* a,_Xconst char* b,_Xconst char* c,_Xconst char* d,char* e,int f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(XModifierKeymap*,XGetModifierMapping,(Display* a),(a),return)
 SDL_X11_SYM(int,XGetPointerControl,(Display* a,int* b,int* c,int* d),(a,b,c,d),return)
-SDL_X11_SYM(int,XGetScreenSaver,(Display* a,int* b,int* c,int* d, int* e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XGetRGBColormaps,(Display* a,Window b,XStandardColormap **c,int *d,Atom e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XGetScreenSaver,(Display* a,int* b,int* c,int* d,int* e),(a,b,c,d,e),return)
 SDL_X11_SYM(XVisualInfo*,XGetVisualInfo,(Display* a,long b,XVisualInfo* c,int* d),(a,b,c,d),return)
 SDL_X11_SYM(XWMHints*,XGetWMHints,(Display* a,Window b),(a,b),return)
 SDL_X11_SYM(Status,XGetWindowAttributes,(Display* a,Window b,XWindowAttributes* c),(a,b,c),return)
 SDL_X11_SYM(int,XGrabKeyboard,(Display* a,Window b,Bool c,int d,int e,Time f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(int,XGrabPointer,(Display* a,Window b,Bool c,unsigned int d,int e,int f,Window g,Cursor h,Time i),(a,b,c,d,e,f,g,h,i),return)
+SDL_X11_SYM(int,XGrabServer,(Display* a),(a),return)
 SDL_X11_SYM(Status,XIconifyWindow,(Display* a,Window b,int c),(a,b,c),return)
 SDL_X11_SYM(int,XInstallColormap,(Display* a,Colormap b),(a,b),return)
 SDL_X11_SYM(KeyCode,XKeysymToKeycode,(Display* a,KeySym b),(a,b),return)
+SDL_X11_SYM(int,XKillClient,(Display* a,XID b),(a,b),return)
 SDL_X11_SYM(Atom,XInternAtom,(Display* a,_Xconst char* b,Bool c),(a,b,c),return)
 SDL_X11_SYM(XPixmapFormatValues*,XListPixmapFormats,(Display* a,int* b),(a,b),return)
 SDL_X11_SYM(int,XLookupString,(XKeyEvent* a,char* b,int c,KeySym* d,XComposeStatus* e),(a,b,c,d,e),return)
@@ -91,8 +96,10 @@ SDL_X11_SYM(int,XResizeWindow,(Display* a,Window b,unsigned int c,unsigned int d
 SDL_X11_SYM(int,XSelectInput,(Display* a,Window b,long c),(a,b,c),return)
 SDL_X11_SYM(Status,XSendEvent,(Display* a,Window b,Bool c,long d,XEvent* e),(a,b,c,d,e),return)
 SDL_X11_SYM(int,XSetClassHint,(Display* a,Window b,XClassHint* c),(a,b,c),return)
+SDL_X11_SYM(int,XSetCloseDownMode,(Display *a, int b),(a,b),return)
 SDL_X11_SYM(XErrorHandler,XSetErrorHandler,(XErrorHandler a),(a),return)
 SDL_X11_SYM(XIOErrorHandler,XSetIOErrorHandler,(XIOErrorHandler a),(a),return)
+SDL_X11_SYM(void,XSetRGBColormaps,( Display *a,Window b,XStandardColormap *c,int d,Atom e),(a,b,c,d,e),return)
 SDL_X11_SYM(int,XSetScreenSaver,(Display* a,int b,int c,int d,int e),(a,b,c,d,e),return)
 SDL_X11_SYM(int,XSetTransientForHint,(Display* a,Window b,Window c),(a,b,c),return)
 SDL_X11_SYM(int,XSetWMHints,(Display* a,Window b,XWMHints* c),(a,b,c),return)
@@ -107,8 +114,9 @@ SDL_X11_SYM(Status,XStringListToTextProperty,(char** a,int b,XTextProperty* c),(
 SDL_X11_SYM(int,XSync,(Display* a,Bool b),(a,b),return)
 SDL_X11_SYM(int,XUngrabKeyboard,(Display* a,Time b),(a,b),return)
 SDL_X11_SYM(int,XUngrabPointer,(Display* a,Time b),(a,b),return)
+SDL_X11_SYM(int,XUngrabServer,(Display* a),(a),return)
 SDL_X11_SYM(int,XUnmapWindow,(Display* a,Window b),(a,b),return)
-SDL_X11_SYM(int,XWarpPointer,(Display* a,Window b,Window c,int d,int e,unsigned int f,unsigned int g,int h, int i),(a,b,c,d,e,f,g,h,i),return)
+SDL_X11_SYM(int,XWarpPointer,(Display* a,Window b,Window c,int d,int e,unsigned int f,unsigned int g,int h,int i),(a,b,c,d,e,f,g,h,i),return)
 SDL_X11_SYM(VisualID,XVisualIDFromVisual,(Visual* a),(a),return)
 SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(XExtensionInfo*,XextCreateExtension,(void),(),return)
@@ -174,9 +182,9 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,
 #if defined(__osf__)
 SDL_X11_MODULE(OSF_ENTRY_POINTS)
 SDL_X11_SYM(void,_SmtBufferOverflow,(Display *dpy,register smtDisplayPtr p),(dpy,p),)
-SDL_X11_SYM(void,_SmtIpError,(Display *dpy,register smtDisplayPtr p, int i),(dpy,p,i),)
-SDL_X11_SYM(int,ipAllocateData,(ChannelPtr a, IPCard b, IPDataPtr * c),(a,b,c),return)
-SDL_X11_SYM(int,ipUnallocateAndSendData,(ChannelPtr a, IPCard b),(a,b),return)
+SDL_X11_SYM(void,_SmtIpError,(Display *dpy,register smtDisplayPtr p,int i),(dpy,p,i),)
+SDL_X11_SYM(int,ipAllocateData,(ChannelPtr a,IPCard b,IPDataPtr * c),(a,b,c),return)
+SDL_X11_SYM(int,ipUnallocateAndSendData,(ChannelPtr a,IPCard b),(a,b),return)
 #endif
 
 /* Xrandr support. */
@@ -185,8 +193,8 @@ SDL_X11_MODULE(XRANDR)
 SDL_X11_SYM(Status,XRRQueryVersion,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
 SDL_X11_SYM(XRRScreenConfiguration *,XRRGetScreenInfo,(Display *dpy,Drawable draw),(dpy,draw),return)
 SDL_X11_SYM(SizeID,XRRConfigCurrentConfiguration,(XRRScreenConfiguration *config,Rotation *rotation),(config,rotation),return)
-SDL_X11_SYM(XRRScreenSize *,XRRConfigSizes,(XRRScreenConfiguration *config, int *nsizes),(config,nsizes),return)
-SDL_X11_SYM(Status,XRRSetScreenConfig,(Display *dpy, XRRScreenConfiguration *config, Drawable draw, int size_index, Rotation rotation, Time timestamp),(dpy,config,draw,size_index,rotation,timestamp),return)
+SDL_X11_SYM(XRRScreenSize *,XRRConfigSizes,(XRRScreenConfiguration *config,int *nsizes),(config,nsizes),return)
+SDL_X11_SYM(Status,XRRSetScreenConfig,(Display *dpy,XRRScreenConfiguration *config,Drawable draw,int size_index,Rotation rotation,Time timestamp),(dpy,config,draw,size_index,rotation,timestamp),return)
 SDL_X11_SYM(void,XRRFreeScreenConfigInfo,(XRRScreenConfiguration *config),(config),)
 #endif
 

src/video/x11/SDL_x11window.c

@@ -26,7 +26,7 @@
 #include "../../events/SDL_keyboard_c.h"
 
 #include "SDL_x11video.h"
-
+#include "../Xext/extensions/StdCmap.h"
 
 static int
 SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
@@ -181,11 +181,40 @@ X11_CreateWindow(_THIS, SDL_Window * window)
     }
     xattr.background_pixel = 0;
     xattr.border_pixel = 0;
-    if (visual->class == PseudoColor || visual->class == DirectColor) {
-        xattr.colormap =
-            XCreateColormap(data->display,
-                            RootWindow(data->display, displaydata->screen),
-                            visual, AllocAll);
+    if (visual->class == DirectColor || visual->class == TrueColor) {
+        int nmaps;
+        XStandardColormap *stdmaps;
+        int i;
+        Bool found = False;
+
+        if (0 != XGetRGBColormaps(data->display,
+                                  RootWindow(data->display,
+                                             displaydata->screen), &stdmaps,
+                                  &nmaps, XA_RGB_BEST_MAP)) {
+            for (i = 0; i < nmaps; i++) {
+                if (stdmaps[i].visualid == visual->visualid) {
+                    xattr.colormap = stdmaps[i].colormap;
+                    found = True;
+                    break;
+                }
+            }
+            XFree(stdmaps);
+        }
+        if (!found) {
+            int max = visual->map_entries - 1;
+            XStandardColormap *cmap =
+                XmuStandardColormap(data->display, displaydata->screen,
+                                    visual->visualid, depth,
+                                    XA_RGB_BEST_MAP, None,
+                                    max, max, max);
+            if (cmap->visualid = visual->visualid) {
+                xattr.colormap = cmap->colormap;
+            } else {
+                SDL_SetError
+                    ("Couldn't create window:XA_RGB_BEST_MAP not found");
+                return -1;
+            }
+        }
     } else {
         xattr.colormap =
             XCreateColormap(data->display,

test/common.c

@@ -245,7 +245,7 @@ CommonArg(CommonState * state, int index)
         if (!argv[index]) {
             return -1;
         }
-        state->audiospec.channels = (Uint8)SDL_atoi(argv[index]);
+        state->audiospec.channels = (Uint8) SDL_atoi(argv[index]);
         return 2;
     }
     if (SDL_strcasecmp(argv[index], "--samples") == 0) {
@@ -253,7 +253,7 @@ CommonArg(CommonState * state, int index)
         if (!argv[index]) {
             return -1;
         }
-        state->audiospec.samples = (Uint16)SDL_atoi(argv[index]);
+        state->audiospec.samples = (Uint16) SDL_atoi(argv[index]);
         return 2;
     }
     if ((SDL_strcasecmp(argv[index], "-h") == 0)
@@ -498,7 +498,7 @@ PrintRenderer(SDL_RendererInfo * info)
     fprintf(stderr, ")\n");
 
     fprintf(stderr, "    Texture formats (%d): ", info->num_texture_formats);
-    for (i = 0; i < (int)info->num_texture_formats; ++i) {
+    for (i = 0; i < (int) info->num_texture_formats; ++i) {
         if (i > 0) {
             fprintf(stderr, ", ");
         }

test/testwm.c

@@ -175,7 +175,7 @@ HotKey_Quit(void)
     SDL_PushEvent(&event);
 }
 
-static int (SDLCALL *old_filterfunc) (void *, SDL_Event *);
+static int (SDLCALL * old_filterfunc) (void *, SDL_Event *);
 static void *old_filterdata;
 
 int SDLCALL