--- ray/src/hd/rhd_glx.c	1998/01/01 16:28:44	3.12
+++ ray/src/hd/rhd_glx.c	1998/05/14 13:06:33	3.17
@@ -28,7 +28,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #define MAXCONE		16		/* number of different cone sizes */
 #endif
 #ifndef MAXVERT
-#define MAXVERT		32		/* maximum number of cone vertices */
+#define MAXVERT		64		/* maximum number of cone vertices */
 #endif
 #ifndef MINVERT
 #define MINVERT		4		/* minimum number of cone vertices */
@@ -94,11 +94,13 @@ dev_open(id)			/* initialize X11 driver */
 char  *id;
 {
 	extern char	*getenv();
+	static RGBPRIMS	myprims = STDPRIMS;
 	static int	atlBest[] = {GLX_RGBA, GLX_RED_SIZE,8,
 				GLX_GREEN_SIZE,8, GLX_BLUE_SIZE,8,
 				GLX_DEPTH_SIZE,15, None};
-	char	*gv;
+	char	*ev;
 	double	gamval = GAMMA;
+	RGBPRIMP	dpri = stdprims;
 	XSetWindowAttributes	ourwinattr;
 	XWMHints	ourxwmhints;
 	XSizeHints	oursizhints;
@@ -116,10 +118,17 @@ char  *id;
 					/* get a context */
 	gctx = glXCreateContext(ourdisplay, ourvinf, NULL, GL_TRUE);
 					/* set gamma and tone mapping */
-	if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
-			|| (gv = getenv("DISPLAY_GAMMA")) != NULL)
-		gamval = atof(gv);
-	if (tmInit(mytmflags(), stdprims, gamval) == NULL)
+	if ((ev = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
+			|| (ev = getenv("DISPLAY_GAMMA")) != NULL)
+		gamval = atof(ev);
+	if ((ev = getenv("DISPLAY_PRIMARIES")) != NULL &&
+			sscanf(ev, "%f %f %f %f %f %f %f %f",
+				&myprims[RED][CIEX],&myprims[RED][CIEY],
+				&myprims[GRN][CIEX],&myprims[GRN][CIEY],
+				&myprims[BLU][CIEX],&myprims[BLU][CIEY],
+				&myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6)
+		dpri = myprims;
+	if (tmInit(mytmflags(), dpri, gamval) == NULL)
 		error(SYSTEM, "not enough memory in dev_open");
 					/* open window */
 	ourwinattr.background_pixel = ourblack;
@@ -195,6 +204,14 @@ dev_close()			/* close our display and free resources 
 }
 
 
+dev_clear()			/* clear our quadtree */
+{
+	qtCompost(100);
+	glClear(GL_DEPTH_BUFFER_BIT);
+	rayqleft = 0;			/* hold off update */
+}
+
+
 int
 dev_view(nv)			/* assign new driver view */
 register VIEW	*nv;
@@ -247,6 +264,18 @@ register VIEW	*nv;
 }
 
 
+VIEW *
+dev_auxview(n, hvres)		/* return nth auxiliary view */
+int	n;
+int	hvres[2];
+{
+	if (n)
+		return(NULL);
+	hvres[0] = odev.hres; hvres[1] = odev.vres;
+	return(&odev.v);
+}
+
+
 int
 dev_input()			/* get X11 input */
 {
@@ -342,7 +371,7 @@ initcones()			/* initialize cone vertices */
 	for (i = 0; i < MAXCONE; i++) {
 		d = (double)i/(MAXCONE-1); d *= d;	/* x^2 distribution */
 		cone[i].rad = minrad + (1.-minrad)*d;
-		cone[i].nverts = MINVERT + (MAXVERT-MINVERT)*d;
+		cone[i].nverts = MINVERT + 0.5 + (MAXVERT-MINVERT)*d;
 		cone[i].va = (FVECT *)malloc(cone[i].nverts*sizeof(FVECT));
 		if (cone[i].va == NULL)
 			error(SYSTEM, "out of memory in initcones");
@@ -594,6 +623,7 @@ register XKeyPressedEvent  *ekey;
 		glFlush();
 		qtCompost(100);			/* get rid of old values */
 		inpresflags |= DFL(DC_REDRAW);	/* resend values from server */
+		rayqleft = 0;			/* hold off update */
 		return;
 	case 'K':			/* kill rtrace process(es) */
 		inpresflags |= DFL(DC_KILL);