--- ray/src/rt/x11.c	1992/05/30 09:32:18	2.4
+++ ray/src/rt/x11.c	1994/09/12 14:41:54	2.16
@@ -11,7 +11,7 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include  <stdio.h>
-
+#include  <math.h>
 #include  <sys/ioctl.h>
 
 #include  <X11/Xlib.h>
@@ -23,10 +23,10 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "x11twind.h"
 #include  "x11icon.h"
 
-#define GAMMA		2.2		/* exponent for color correction */
+#define GAMMA		2.2		/* default exponent correction */
 
 #define MINWIDTH	(32*COMCW)	/* minimum graphics window width */
-#define MINHEIGHT	MINWIDTH	/* minimum graphics window height */
+#define MINHEIGHT	(MINWIDTH/2)	/* minimum graphics window height */
 
 #define BORWIDTH	5		/* border width */
 #define COMHEIGHT	(COMLH*COMCH)	/* command line height (pixels) */
@@ -44,6 +44,7 @@ static char SCCSid[] = "$SunId$ LBL";
 static XEvent  currentevent;		/* current event */
 
 static int  ncolors = 0;		/* color table size */
+static int  mapped = 0;			/* window is mapped? */
 static unsigned long  *pixval = NULL;	/* allocated pixels */
 static unsigned long  ourblack=0, ourwhite=1;
 
@@ -77,11 +78,17 @@ static struct driver  x11_driver = {
 	x11_comout, x11_comin, x11_flush, 1.0
 };
 
+static int  getpixels(), xnewcolr(), freepixels(), resizewindow(),
+		getevent(), getkey(), fixwindow(), x11_getc();
+static unsigned long  true_pixel();
 
+
 struct driver *
 x11_init(name, id)		/* initialize driver */
 char  *name, *id;
 {
+	extern char  *getenv();
+	char  *gv;
 	int  nplanes;
 	XSetWindowAttributes	ourwinattr;
 	XWMHints  ourxwmhints;
@@ -117,8 +124,13 @@ char  *name, *id;
 		ourblack = BlackPixel(ourdisplay,ourscreen);
 		ourwhite = WhitePixel(ourdisplay,ourscreen);
 	}
-	make_gmap(GAMMA);
-	/* open window */
+					/* set gamma */
+	if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
+			|| (gv = getenv("GAMMA")) != NULL)
+		make_gmap(atof(gv));
+	else
+		make_gmap(GAMMA);
+					/* open window */
 	ourwinattr.background_pixel = ourblack;
 	ourwinattr.border_pixel = ourblack;
 					/* this is stupid */
@@ -133,7 +145,6 @@ char  *name, *id;
 		stderr_v("cannot create window\n");
 		return(NULL);
 	}
-	XFreeColormap(ourdisplay, ourwinattr.colormap);
    	XStoreName(ourdisplay, gwind, id);
 	/* create a cursor */
 	pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
@@ -155,6 +166,7 @@ char  *name, *id;
 	x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
 	x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight;
 	x11_driver.inpready = 0;
+	mapped = 1;
 	cmdvec = x11_comout;			/* set error vectors */
 	if (wrnvec != NULL)
 		wrnvec = x11_errout;
@@ -232,16 +244,14 @@ x11_paintr(col, xmin, ymin, xmax, ymax)		/* fill a rec
 COLOR  col;
 int  xmin, ymin, xmax, ymax;
 {
-	extern int  xnewcolr();		/* pixel assignment routine */
-	extern unsigned long  true_pixel();
 	unsigned long  pixel;
 
+	if (!mapped)
+		return;
 	if (ncolors > 0)
 		pixel = pixval[get_pixel(col, xnewcolr)];
-	else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor)
-		pixel = true_pixel(col);
 	else
-		return;
+		pixel = true_pixel(col);
 	XSetForeground(ourdisplay, ourgc, pixel);
 	XFillRectangle(ourdisplay, gwind, 
 		ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin);
@@ -251,9 +261,19 @@ int  xmin, ymin, xmax, ymax;
 static
 x11_flush()			/* flush output */
 {
+	int	n;
+	char	*buf;
+						/* check for input */
 	XNoOp(ourdisplay);
-	while (XPending(ourdisplay) > 0)
+	n = XPending(ourdisplay);			/* from X server */
+	while (n-- > 0)
 		getevent();
+	if (ioctl(0, FIONREAD, &n) == 0 && n > 0) {	/* from stdin */
+		buf = getcombuf(&x11_driver);
+		n = read(0, buf, n);
+		if (n > 0)
+			buf[n] = '\0';
+	}
 }
 
 
@@ -261,13 +281,12 @@ static
 x11_comin(inp, prompt)		/* read in a command line */
 char  *inp, *prompt;
 {
-	extern int  x11_getc();
-
-	if (prompt != NULL)
+	if (prompt != NULL) {
+		x11_flush();		/* make sure we get everything */
 		if (fromcombuf(inp, &x11_driver))
 			return;
-		else
-			xt_puts(prompt, comline);
+		xt_puts(prompt, comline);
+	}
 	xt_cursor(comline, TBLKCURS);
 	editline(inp, x11_getc, x11_comout);
 	xt_cursor(comline, TNOCURS);
@@ -314,14 +333,12 @@ int  *xp, *yp;
 	if (c_last > c_first)			/* key pressed */
 		return(x11_getc());
 						/* button pressed */
-	if (levptr(XButtonPressedEvent)->button & Button1)
+	if (levptr(XButtonPressedEvent)->button == Button1)
 		return(MB1);
-	if (levptr(XButtonPressedEvent)->button & Button2)
+	if (levptr(XButtonPressedEvent)->button == Button2)
 		return(MB2);
-	if (levptr(XButtonPressedEvent)->button & Button3)
+	if (levptr(XButtonPressedEvent)->button == Button3)
 		return(MB3);
-	if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
-		return(MB1);
 	return(ABORT);
 }
 
@@ -364,8 +381,7 @@ loop:
 		pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
 		if (pixval == NULL)
 			return(ncolors = 0);
-		if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
-				pixval,ncolors) != 0)
+		if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors))
 			break;
 		free((char *)pixval);
 		pixval = NULL;
@@ -402,6 +418,8 @@ freepixels()				/* free our pixels */
 	if (ncolors == 0)
 		return;
 	XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L);
+	free((char *)pixval);
+	pixval = NULL;
 	ncolors = 0;
 	if (ourmap != DefaultColormap(ourdisplay,ourscreen))
 		XFreeColormap(ourdisplay, ourmap);
@@ -445,6 +463,7 @@ getevent()			/* get next event */
 		resizewindow(levptr(XConfigureEvent));
 		break;
 	case UnmapNotify:
+		mapped = 0;
 		freepixels();
 		break;
 	case MapNotify:
@@ -454,6 +473,7 @@ getevent()			/* get next event */
 				stderr_v("Cannot allocate colors\n");
 			else
 				new_ctab(ncolors);
+		mapped = 1;
 		break;
 	case Expose:
 		fixwindow(levptr(XExposeEvent));