--- ray/src/hd/rhd_x11.c	1997/12/12 11:13:15	3.15
+++ ray/src/hd/rhd_x11.c	1997/12/24 14:04:22	3.18
@@ -158,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);
 }
 
@@ -203,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;
@@ -222,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 *
@@ -236,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);
 	}
@@ -472,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 */
@@ -481,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.);