--- ray/src/rt/x11.c	1990/07/10 08:47:07	1.15
+++ ray/src/rt/x11.c	1991/11/12 17:10:04	2.1
@@ -21,6 +21,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "color.h"
 #include  "driver.h"
 #include  "x11twind.h"
+#include  "x11icon.h"
 
 #define GAMMA		2.2		/* exponent for color correction */
 
@@ -45,7 +46,7 @@ static char SCCSid[] = "$SunId$ LBL";
 static XEvent  currentevent;		/* current event */
 
 static int  ncolors = 0;		/* color table size */
-static int  *pixval = NULL;		/* allocated pixels */
+static unsigned long  *pixval = NULL;	/* allocated pixels */
 
 static Display  *ourdisplay = NULL;	/* our display */
 
@@ -129,8 +130,10 @@ char  *name, *id;
 	/* create a cursor */
 	pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
 	ourgc = XCreateGC(ourdisplay, gwind, 0, NULL);
-	ourxwmhints.flags = InputHint;
+	ourxwmhints.flags = InputHint|IconPixmapHint;
 	ourxwmhints.input = True;
+	ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay,
+			gwind, x11icon_bits, x11icon_width, x11icon_height);
 	XSetWMHints(ourdisplay, gwind, &ourxwmhints);
 	oursizhints.min_width = MINWIDTH;
 	oursizhints.min_height = MINHEIGHT+COMHEIGHT;
@@ -138,7 +141,7 @@ char  *name, *id;
 	XSetNormalHints(ourdisplay, gwind, &oursizhints);
 	XSelectInput(ourdisplay, gwind, ExposureMask);
 	XMapWindow(ourdisplay, gwind);
-	XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XExposeEvent));
+	XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XEvent));
 	gwidth = levptr(XExposeEvent)->width;
 	gheight = levptr(XExposeEvent)->height - COMHEIGHT;
 	x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
@@ -336,8 +339,11 @@ int  r, g, b;
 static int
 getpixels()				/* get the color map */
 {
+	XColor  thiscolor;
+	register int  i, j;
+
 	if (ncolors > 0)
-		return(ncolors);
+		goto donecolors;
 	if (ourvisual == DefaultVisual(ourdisplay,ourscreen)) {
 		ourmap = DefaultColormap(ourdisplay,ourscreen);
 		goto loop;
@@ -348,7 +354,7 @@ loop:
 	for (ncolors = ourvisual->map_entries;
 			ncolors > ourvisual->map_entries/3;
 			ncolors = ncolors*.937) {
-		pixval = (int *)malloc(ncolors*sizeof(int));
+		pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
 		if (pixval == NULL)
 			return(ncolors = 0);
 		if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
@@ -363,11 +369,8 @@ loop:
 		else
 			return(ncolors = 0);	/* failed */
 	}
-	if (ourmap != DefaultColormap(ourdisplay,ourscreen)) {
-		XColor  thiscolor;
-		register int  i, j;
-						/* reset black and white */
-		for (i = 0; i < ncolors; i++) {
+	if (ourmap != DefaultColormap(ourdisplay,ourscreen))
+		for (i = 0; i < ncolors; i++) {	/* reset black and white */
 			if (pixval[i] != ourblack && pixval[i] != ourwhite)
 				continue;
 			thiscolor.pixel = pixval[i];
@@ -381,8 +384,16 @@ loop:
 			ncolors--;
 			i--;
 		}
-	}
 	XSetWindowColormap(ourdisplay, gwind, ourmap);
+donecolors:
+#ifdef  DEBUG
+	thiscolor.flags = DoRed|DoGreen|DoBlue;
+	thiscolor.red = thiscolor.green = thiscolor.blue = 0;
+	for (i = 0; i < ncolors; i++) {
+		thiscolor.pixel = pixval[i];
+		XStoreColor(ourdisplay, ourmap, &thiscolor);
+	}
+#endif
 	return(ncolors);
 }