--- ray/src/px/x11raster.c	1992/05/28 09:39:22	2.6
+++ ray/src/px/x11raster.c	1994/11/23 14:24:32	2.9
@@ -14,9 +14,12 @@ static char SCCSid[] = "$SunId$ LBL";
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "color.h"
 #include "x11raster.h"
 
+extern char  *malloc(), *realloc(), *calloc();
 
+
 XRASTER *
 make_raster(disp, vis, npixbits, data, width, height, bm_pad)
 Display	*disp;
@@ -59,14 +62,14 @@ int	bm_pad;
 
 
 int
-init_rcolors(xr, rmap, gmap, bmap)		/* initialize colors */
+init_rcolors(xr, cmap)			/* initialize colors */
 register XRASTER	*xr;
-int	rmap[256], gmap[256], bmap[256];
+BYTE	cmap[][3];
 {
 	register unsigned char	*p;
 	register int	i;
 
-	if (xr->image->depth > 8 || xr->ncolors != 0)
+	if (xr->image->depth > 8 | xr->ncolors != 0)
 		return(xr->ncolors);
 	xr->pmap = (short *)malloc(256*sizeof(short));
 	if (xr->pmap == NULL)
@@ -80,9 +83,9 @@ int	rmap[256], gmap[256], bmap[256];
 			i = xr->image->width*xr->image->height;
 			i--; p++)
 		if (xr->pmap[*p] == -1) {
-			xr->cdefs[xr->ncolors].red = rmap[*p] << 8;
-			xr->cdefs[xr->ncolors].green = gmap[*p] << 8;
-			xr->cdefs[xr->ncolors].blue = bmap[*p] << 8;
+			xr->cdefs[xr->ncolors].red = cmap[*p][RED] << 8;
+			xr->cdefs[xr->ncolors].green = cmap[*p][GRN] << 8;
+			xr->cdefs[xr->ncolors].blue = cmap[*p][BLU] << 8;
 			xr->cdefs[xr->ncolors].pixel = *p;
 			xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue;
 			xr->pmap[*p] = xr->ncolors++;
@@ -96,10 +99,9 @@ int	rmap[256], gmap[256], bmap[256];
 
 
 Colormap
-newcmap(disp, scrn, w, vis)		/* get colormap and fix b & w */
+newcmap(disp, scrn, vis)		/* get colormap and fix b & w */
 Display	*disp;
 int	scrn;
-Window	w;
 Visual	*vis;
 {
 	XColor	thiscolor;
@@ -108,9 +110,9 @@ Visual	*vis;
 	int	n;
 	register int	i, j;
 
-	cmap = XCreateColormap(disp, w, vis, AllocNone);
-	if (cmap == 0)
-		return(0);
+	cmap = XCreateColormap(disp, RootWindow(disp,scrn), vis, AllocNone);
+	if (cmap == 0 || vis->class != PseudoColor)
+		return(cmap);
 	pixels=(unsigned long *)malloc(vis->map_entries*sizeof(unsigned long));
 	if (pixels == NULL)
 		return(0);
@@ -140,7 +142,7 @@ Visual	*vis;
 
 
 unsigned long *
-map_rcolors(xr, w)				/* get and assign pixels */
+map_rcolors(xr, w)			/* get and assign pixels */
 register XRASTER	*xr;
 Window	w;
 {
@@ -157,11 +159,11 @@ Window	w;
 	if (xr->visual == DefaultVisual(xr->disp, xr->screen))
 		xr->cmap = DefaultColormap(xr->disp, xr->screen);
 	else
-		xr->cmap = newcmap(xr->disp, xr->screen, w, xr->visual);
+		xr->cmap = newcmap(xr->disp, xr->screen, xr->visual);
 	while (XAllocColorCells(xr->disp, xr->cmap, 0,
 			NULL, 0, xr->pixels, xr->ncolors) == 0)
 		if (xr->cmap == DefaultColormap(xr->disp, xr->screen))
-			xr->cmap = newcmap(xr->disp, xr->screen, w, xr->visual);
+			xr->cmap = newcmap(xr->disp, xr->screen, xr->visual);
 		else {
 			free((char *)xr->pixels);
 			xr->pixels = NULL;