Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 212 insertions, 0 deletions

diff --git a/xorg-server/hw/dmx/dmxcmap.c b/xorg-server/hw/dmx/dmxcmap.c
new file mode 100644
index 000000000..4aa586aff
--- /dev/null
+++ b/xorg-server/hw/dmx/dmxcmap.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation on the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Colormap support. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxlog.h"
+#include "dmxsync.h"
+#include "dmxcmap.h"
+#include "dmxvisual.h"
+
+#include "micmap.h"
+
+static Bool dmxAllocateColormapPrivates(ColormapPtr pColormap)
+{
+    dmxColormapPrivPtr   pCmapPriv;
+
+    pCmapPriv = (dmxColormapPrivPtr)xalloc(sizeof(*pCmapPriv));
+    if (!pCmapPriv)
+	return FALSE;
+    pCmapPriv->cmap = (Colormap)0;
+
+    DMX_SET_COLORMAP_PRIV(pColormap, pCmapPriv);
+
+    return TRUE;
+}
+
+/** Create \a pColormap on the back-end server. */
+Bool dmxBECreateColormap(ColormapPtr pColormap)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+    VisualPtr           pVisual   = pColormap->pVisual;
+    Visual             *visual    = dmxLookupVisual(pScreen, pVisual);
+
+    if (visual) {
+       pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,
+                                         dmxScreen->scrnWin,
+                                         visual,
+                                         (pVisual->class & DynamicClass ?
+                                          AllocAll : AllocNone));
+       return (pCmapPriv->cmap != 0);
+    }
+    else {
+       dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n");
+       return 0;
+    }
+}
+
+/** Create colormap on back-end server associated with \a pColormap's
+ *  screen. */
+Bool dmxCreateColormap(ColormapPtr pColormap)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool                ret       = TRUE;
+
+    if (!dmxAllocateColormapPrivates(pColormap))
+	return FALSE;
+
+    if (dmxScreen->beDisplay) {
+	if (!dmxBECreateColormap(pColormap))
+	    return FALSE;
+    }
+
+    DMX_UNWRAP(CreateColormap, dmxScreen, pScreen);
+    if (pScreen->CreateColormap)
+	ret = pScreen->CreateColormap(pColormap);
+    DMX_WRAP(CreateColormap, dmxCreateColormap, dmxScreen, pScreen);
+
+    return ret;
+}
+
+/** Destroy \a pColormap on the back-end server. */
+Bool dmxBEFreeColormap(ColormapPtr pColormap)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (pCmapPriv->cmap) {
+	XFreeColormap(dmxScreen->beDisplay, pCmapPriv->cmap);
+	pCmapPriv->cmap = (Colormap)0;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy colormap on back-end server associated with \a pColormap's
+ *  screen. */
+void dmxDestroyColormap(ColormapPtr pColormap)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (dmxScreen->beDisplay)
+	dmxBEFreeColormap(pColormap);
+    xfree(pCmapPriv);
+    DMX_SET_COLORMAP_PRIV(pColormap, NULL);
+
+    DMX_UNWRAP(DestroyColormap, dmxScreen, pScreen);
+    if (pScreen->DestroyColormap)
+	pScreen->DestroyColormap(pColormap);
+    DMX_WRAP(DestroyColormap, dmxDestroyColormap, dmxScreen, pScreen);
+}
+
+/** Install colormap on back-end server associated with \a pColormap's
+ *  screen. */
+void dmxInstallColormap(ColormapPtr pColormap)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    DMX_UNWRAP(InstallColormap, dmxScreen, pScreen);
+    if (pScreen->InstallColormap)
+	pScreen->InstallColormap(pColormap);
+    DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);
+
+    if (dmxScreen->beDisplay) {
+	XInstallColormap(dmxScreen->beDisplay, pCmapPriv->cmap);
+	dmxSync(dmxScreen, FALSE);
+    }
+}
+
+/** Store colors in \a pColormap on back-end server associated with \a
+ *  pColormap's screen. */
+void dmxStoreColors(ColormapPtr pColormap, int ndef, xColorItem *pdef)
+{
+    ScreenPtr           pScreen   = pColormap->pScreen;
+    DMXScreenInfo      *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxColormapPrivPtr  pCmapPriv = DMX_GET_COLORMAP_PRIV(pColormap);
+
+    if (dmxScreen->beDisplay && (pColormap->pVisual->class & DynamicClass)) {
+        XColor *color = xalloc(sizeof(*color) * ndef);
+        int    i;
+        
+        if (color) {
+            for (i = 0; i < ndef; i++) {
+                color[i].pixel = pdef[i].pixel;
+                color[i].red   = pdef[i].red;
+                color[i].blue  = pdef[i].blue;
+                color[i].green = pdef[i].green;
+                color[i].flags = pdef[i].flags;
+                color[i].pad   = pdef[i].pad;
+            }
+            XStoreColors(dmxScreen->beDisplay, pCmapPriv->cmap, color, ndef);
+            xfree(color);
+        } else {                /* xalloc failed, so fallback */
+            XColor c;
+            for (i = 0; i < ndef; i++) {
+                c.pixel = pdef[i].pixel;
+                c.red   = pdef[i].red;
+                c.blue  = pdef[i].blue;
+                c.green = pdef[i].green;
+                c.flags = pdef[i].flags;
+                c.pad   = pdef[i].pad;
+                XStoreColor(dmxScreen->beDisplay, pCmapPriv->cmap, &c);
+            }
+        }
+	dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_UNWRAP(StoreColors, dmxScreen, pScreen);
+    if (pScreen->StoreColors)
+	pScreen->StoreColors(pColormap, ndef, pdef);
+    DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);
+}
+
+/** Create the DMX server's default colormap. */
+Bool dmxCreateDefColormap(ScreenPtr pScreen)
+{
+    return miCreateDefColormap(pScreen);
+}