--- ray/src/rt/x11.c	1990/07/18 12:25:07	1.16
+++ ray/src/rt/x11.c	1991/04/19 15:02:54	1.18
@@ -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;
@@ -351,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,