--- ray/src/hd/rhd_x11.c	1997/12/11 09:37:43	3.13
+++ ray/src/hd/rhd_x11.c	1997/12/24 14:04:22	3.18
@@ -22,8 +22,6 @@ static char SCCSid[] = "$SunId$ SGI";
 #define FEQ(a,b)	((a)-(b) <= FTINY && (a)-(b) >= -FTINY)
 #endif
 
-#define	CTRL(c)		((c)-'@')
-
 #define GAMMA		2.2		/* default gamma correction */
 
 #define MOVPCT		7		/* percent distance to move /frame */
@@ -160,25 +158,22 @@ char  *id;
 	oursizhints.min_height = MINHEIGHT;
 	oursizhints.flags = PMinSize;
 	XSetNormalHints(ourdisplay, gwind, &oursizhints);
+					/* figure out sensible view */
+	pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) /
+			DisplayWidth(ourdisplay, ourscreen);
+	pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) /
+			DisplayHeight(ourdisplay, ourscreen);
+	copystruct(&odev.v, &stdview);
+	odev.v.type = VT_PER;
 					/* map the window and get its size */
 	XMapWindow(ourdisplay, gwind);
-	dev_input();
+	dev_input();			/* sets size and view angles */
 					/* allocate our leaf pile */
 	if (!qtAllocLeaves(DisplayWidth(ourdisplay,ourscreen) *
 			DisplayHeight(ourdisplay,ourscreen) /
 			(qtMinNodesiz*qtMinNodesiz)))
 		error(SYSTEM, "insufficient memory for leaf storage");
-
-					/* figure out sensible view */
-	pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) /
-			DisplayWidth(ourdisplay, ourscreen);
-	pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) /
-			DisplayHeight(ourdisplay, ourscreen);
-	copystruct(&odev.v, &stdview);
 	odev.name = id;
-	odev.v.type = VT_PER;
-	odev.v.horiz = 2.*180./PI * atan(0.5/VIEWDIST*pwidth*odev.hres);
-	odev.v.vert = 2.*180./PI * atan(0.5/VIEWDIST*pheight*odev.vres);
 	odev.ifd = ConnectionNumber(ourdisplay);
 }
 
@@ -205,7 +200,7 @@ dev_view(nv)			/* assign new driver view */
 VIEW	*nv;
 {
 	if (nv->type == VT_PAR ||		/* check view legality */
-		nv->horiz > 160. || nv->vert > 160.) {
+			nv->horiz > 160. || nv->vert > 160.) {
 		error(COMMAND, "illegal view type/angle");
 		nv->type = VT_PER;
 		nv->horiz = odev.v.horiz;
@@ -224,7 +219,7 @@ VIEW	*nv;
 			int	dh = DisplayHeight(ourdisplay,ourscreen);
 
 			dw -= 25;	/* for window frame */
-			dh -= 100;
+			dh -= 50;
 			odev.hres = 2.*VIEWDIST/pwidth *
 					tan(PI/180./2.*nv->horiz);
 			odev.vres = 2.*VIEWDIST/pheight *
@@ -238,6 +233,7 @@ VIEW	*nv;
 				odev.vres = dh;
 			}
 			XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres);
+			dev_input();	/* wait for resize event */
 		}
 		copystruct(&odev.v, nv);
 	}
@@ -474,7 +470,7 @@ moveview(dx, dy, mov, orb)	/* move our view */
 int	dx, dy, mov, orb;
 {
 	VIEW	nv;
-	FVECT	v1;
+	FVECT	odir, v1;
 	double	d;
 	register int	li;
 				/* start with old view */
@@ -483,24 +479,26 @@ int	dx, dy, mov, orb;
 	if (mov | orb) {
 		if ((li = qtFindLeaf(dx, dy)) < 0)
 			return(0);	/* not on window */
-		VSUM(nv.vdir, qtL.wp[li], nv.vp, -1.);
+		VSUM(odir, qtL.wp[li], nv.vp, -1.);
 	} else {
 		if (viewray(nv.vp, nv.vdir, &odev.v,
 				(dx+.5)/odev.hres, (dy+.5)/odev.vres) < -FTINY)
 			return(0);	/* outside view */
 	}
 	if (orb && mov) {		/* orbit left/right */
-		spinvector(nv.vdir, nv.vdir, nv.vup, MOVDEG*PI/180.*mov);
-		VSUM(nv.vp, qtL.wp[li], nv.vdir, -1.);
+		spinvector(odir, odir, nv.vup, d=MOVDEG*PI/180.*mov);
+		VSUM(nv.vp, qtL.wp[li], odir, -1.);
+		spinvector(nv.vdir, nv.vdir, nv.vup, d);
 	} else if (orb) {		/* orbit up/down */
-		fcross(v1, nv.vdir, nv.vup);
+		fcross(v1, odir, nv.vup);
 		if (normalize(v1) == 0.)
 			return(0);
-		spinvector(nv.vdir, nv.vdir, v1, MOVDEG*PI/180.*orb);
-		VSUM(nv.vp, qtL.wp[li], nv.vdir, -1.);
+		spinvector(odir, odir, v1, d=MOVDEG*PI/180.*orb);
+		VSUM(nv.vp, qtL.wp[li], odir, -1.);
+		spinvector(nv.vdir, nv.vdir, v1, d);
 	} else if (mov) {		/* move forward/backward */
 		d = MOVPCT/100. * mov;
-		VSUM(nv.vp, nv.vp, nv.vdir, d);
+		VSUM(nv.vp, nv.vp, odir, d);
 	}
 	if (!mov ^ !orb && headlocked) {	/* restore head height */
 		VSUM(v1, odev.v.vp, nv.vp, -1.);
@@ -510,7 +508,7 @@ int	dx, dy, mov, orb;
 	if (setview(&nv) != NULL)
 		return(0);	/* illegal view */
 	dev_view(&nv);
-	inpresflags |= DEV_NEWVIEW;
+	inpresflags |= DFL(DC_SETVIEW);
 	return(1);
 }
 
@@ -544,7 +542,7 @@ XButtonPressedEvent	*ebut;
 		qtUpdate();
 		draw_grids();
 	}
-	if (!(inpresflags & DEV_NEWVIEW)) {	/* do final motion */
+	if (!(inpresflags & DFL(DC_SETVIEW))) {	/* do final motion */
 		movdir = MOVDIR(levptr(XButtonReleasedEvent)->button);
 		wx = levptr(XButtonReleasedEvent)->x;
 		wy = levptr(XButtonReleasedEvent)->y;
@@ -574,19 +572,17 @@ register XKeyPressedEvent  *ekey;
 		headlocked = 0;
 		return;
 	case 'l':			/* retrieve last view */
-		inpresflags |= DEV_LASTVIEW;
+		inpresflags |= DFL(DC_LASTVIEW);
 		return;
-	case CTRL('S'):
 	case 'p':			/* pause computation */
-		inpresflags |= DEV_WAIT;
+		inpresflags |= DFL(DC_PAUSE);
 		return;
 	case 'v':			/* spit out view */
-		inpresflags |= DEV_PUTVIEW;
+		inpresflags |= DFL(DC_GETVIEW);
 		return;
-	case CTRL('Q'):
 	case '\n':
 	case '\r':			/* resume computation */
-		inpresflags |= DEV_RESUME;
+		inpresflags |= DFL(DC_RESUME);
 		return;
 	case CTRL('R'):			/* redraw screen */
 		if (ncolors > 0)
@@ -594,7 +590,7 @@ register XKeyPressedEvent  *ekey;
 		qtRedraw(0, 0, odev.hres, odev.vres);
 		return;
 	case CTRL('L'):			/* refresh from server */
-		if (inpresflags & DEV_REDRAW)
+		if (inpresflags & DFL(DC_REDRAW))
 			return;
 		XClearWindow(ourdisplay, gwind);
 		draw_grids();
@@ -602,12 +598,19 @@ register XKeyPressedEvent  *ekey;
 		qtCompost(100);			/* unload the old tree */
 		if (ncolors > 0)
 			new_ctab(ncolors);
-		inpresflags |= DEV_REDRAW;	/* resend values from server */
+		inpresflags |= DFL(DC_REDRAW);	/* resend values from server */
 		return;
-	case CTRL('D'):
-	case 'Q':
+	case 'K':			/* kill rtrace process(es) */
+		inpresflags |= DFL(DC_KILL);
+		break;
+	case 'R':			/* restart rtrace */
+		inpresflags |= DFL(DC_RESTART);
+		break;
+	case 'C':			/* clobber holodeck */
+		inpresflags |= DFL(DC_CLOBBER);
+		break;
 	case 'q':			/* quit the program */
-		inpresflags |= DEV_SHUTDOWN;
+		inpresflags |= DFL(DC_QUIT);
 		return;
 	default:
 		XBell(ourdisplay, 0);
@@ -623,7 +626,6 @@ register XExposeEvent  *eexp;
 	if (odev.hres == 0 || odev.vres == 0) {	/* first exposure */
 		odev.hres = eexp->width;
 		odev.vres = eexp->height;
-		inpresflags |= DEV_NEWSIZE;
 	}
 	qtRedraw(eexp->x, odev.vres - eexp->y - eexp->height,
 			eexp->x + eexp->width, odev.vres - eexp->y);
@@ -643,5 +645,5 @@ register XConfigureEvent  *ersz;
 	odev.v.horiz = 2.*180./PI * atan(0.5/VIEWDIST*pwidth*odev.hres);
 	odev.v.vert = 2.*180./PI * atan(0.5/VIEWDIST*pheight*odev.vres);
 
-	inpresflags |= DEV_NEWSIZE|DEV_NEWVIEW;
+	inpresflags |= DFL(DC_SETVIEW);
 }