--- ray/src/rt/rv2.c	1989/05/30 09:57:13	1.4
+++ ray/src/rt/rv2.c	1989/10/27 11:48:19	1.12
@@ -28,58 +28,34 @@ extern char  *progname;
 getframe(s)				/* get a new frame */
 char  *s;
 {
-	int  x0, y0, x1, y1;
-
-	if (!strcmp("all", s)) {
-		pframe.l = pframe.d = 0;
-		pframe.r = ourview.hresolu;
-		pframe.u = ourview.vresolu;
-		pdepth = 0;
+	if (getrect(s, &pframe) < 0)
 		return;
-	}
-	if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) {
-		if (dev->getcur == NULL)
-			return;
-		(*dev->comout)("Pick first corner\n");
-		if ((*dev->getcur)(&x0, &y0) == ABORT)
-			return;
-		(*dev->comout)("Pick second corner\n");
-		if ((*dev->getcur)(&x1, &y1) == ABORT)
-			return;
-	}
-	if (x0 < x1) {
-		pframe.l = x0;
-		pframe.r = x1;
-	} else {
-		pframe.l = x1;
-		pframe.r = x0;
-	}
-	if (y0 < y1) {
-		pframe.d = y0;
-		pframe.u = y1;
-	} else {
-		pframe.d = y1;
-		pframe.u = y0;
-	}
-	if (pframe.l < 0) pframe.l = 0;
-	if (pframe.d < 0) pframe.d = 0;
-	if (pframe.r > ourview.hresolu) pframe.r = ourview.hresolu;
-	if (pframe.u > ourview.vresolu) pframe.u = ourview.vresolu;
 	pdepth = 0;
 }
 
 
+getrepaint(s)				/* get area and repaint */
+char  *s;
+{
+	RECT  box;
+
+	if (getrect(s, &box) < 0)
+		return;
+	paintrect(&ptrunk, 0, 0, ourview.hresolu, ourview.vresolu, &box);
+}
+
+
 getview(s)				/* get/show view parameters */
 char  *s;
 {
 	FILE  *fp;
 	char  buf[128];
-	char  *fname, *getpath();
+	char  *fname;
 	int  change = 0;
 	VIEW  nv;
 
 	if (sscanf(s, "%s", buf) == 1) {	/* write parameters to a file */
-		if ((fname = getpath(buf, NULL)) == NULL ||
+		if ((fname = getpath(buf, NULL, 0)) == NULL ||
 				(fp = fopen(fname, "a")) == NULL) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
@@ -156,13 +132,13 @@ lastview(s)				/* return to a previous view */
 char  *s;
 {
 	char  buf[128];
-	char  *fname, *getpath();
+	char  *fname;
 	int  success;
 	VIEW  nv;
 
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
 		bcopy(&stdview, &nv, sizeof(VIEW));
-		if ((fname = getpath(buf, NULL)) == NULL ||
+		if ((fname = getpath(buf, NULL, 0)) == NULL ||
 				(success = viewfile(fname, &nv)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
@@ -185,53 +161,6 @@ char  *s;
 }
 
 
-getinterest(s, direc, vec, mp)		/* get area of interest */
-char  *s;
-int  direc;
-FVECT  vec;
-double  *mp;
-{
-	int  x, y;
-	RAY  thisray;
-	register int  i;
-
-	if (sscanf(s, "%lf", mp) != 1)
-		*mp = 1.0;
-	else if (*mp < -FTINY)		/* negative zoom is reduction */
-		*mp = -1.0 / *mp;
-	else if (*mp <= FTINY) {	/* too small */
-		error(COMMAND, "illegal magnification");
-		return(-1);
-	}
-	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
-		if (dev->getcur == NULL)
-			return(-1);
-		(*dev->comout)("Pick view center\n");
-		if ((*dev->getcur)(&x, &y) == ABORT)
-			return(-1);
-		rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
-		if (!direc || ourview.type == VT_PAR) {
-			rayorigin(&thisray, NULL, PRIMARY, 1.0);
-			if (!localhit(&thisray, &thescene)) {
-				error(COMMAND, "not a local object");
-				return(-1);
-			}
-		}
-		if (direc)
-			if (ourview.type == VT_PAR)
-				for (i = 0; i < 3; i++)
-					vec[i] = thisray.rop[i] - ourview.vp[i];
-			else
-				VCOPY(vec, thisray.rdir);
-		else
-			VCOPY(vec, thisray.rop);
-	} else if (direc)
-			for (i = 0; i < 3; i++)
-				vec[i] -= ourview.vp[i];
-	return(0);
-}
-
-
 getaim(s)				/* aim camera */
 char  *s;
 {
@@ -369,11 +298,11 @@ char  *s;
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
-		if (intens(p->v) <= FTINY) {
+		if (bright(p->v) <= FTINY) {
 			error(COMMAND, "cannot normalize to zero");
 			return;
 		}
-		e *= 0.5 / intens(p->v);
+		e *= 0.5 / bright(p->v);
 	}
 	if (e <= FTINY || fabs(1.0 - e) <= FTINY)
 		return;
@@ -391,6 +320,8 @@ register char  *s;
 	extern double  minweight;
 	extern int  maxdepth;
 	extern double  dstrsrc;
+	extern double  shadthresh;
+	extern double  shadcert;
 	extern COLOR  ambval;
 	extern double  ambacc;
 	extern double  minarad;
@@ -403,7 +334,7 @@ register char  *s;
 	char  buf[128];
 	
 	if (s[0] == '\0') {
-		(*dev->comout)("aa ab ad ar as av ds lr lw sd sp: ");
+		(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
 		(*dev->comin)(buf);
 		s = buf;
 	}
@@ -436,17 +367,44 @@ register char  *s;
 			goto badparam;
 		}
 		break;
-	case 'd':			/* distribute source */
-		if (s[1] != 's')
+	case 'd':			/* direct */
+		switch (s[1]) {
+		case 'j':			/* jitter */
+			if (sscanf(s+2, "%lf", &d0) != 1) {
+				sprintf(buf, "direct jitter (%.6g): ",
+						dstrsrc);
+				(*dev->comout)(buf);
+				(*dev->comin)(buf);
+				if (sscanf(buf, "%lf", &d0) != 1)
+					break;
+			}
+			dstrsrc = d0;
+			break;
+		case 'c':			/* certainty */
+			if (sscanf(s+2, "%lf", &d0) != 1) {
+				sprintf(buf, "direct certainty (%.6g): ",
+						shadcert);
+				(*dev->comout)(buf);
+				(*dev->comin)(buf);
+				if (sscanf(buf, "%lf", &d0) != 1)
+					break;
+			}
+			shadcert = d0;
+			break;
+		case 't':			/* threshold */
+			if (sscanf(s+2, "%lf", &d0) != 1) {
+				sprintf(buf, "direct threshold (%.6g): ",
+						shadthresh);
+				(*dev->comout)(buf);
+				(*dev->comin)(buf);
+				if (sscanf(buf, "%lf", &d0) != 1)
+					break;
+			}
+			shadthresh = d0;
+			break;
+		default:
 			goto badparam;
-		if (sscanf(s+2, "%lf", &d0) != 1) {
-			sprintf(buf, "distribute source (%.6g): ", dstrsrc);
-			(*dev->comout)(buf);
-			(*dev->comin)(buf);
-			if (sscanf(buf, "%lf", &d0) != 1)
-				break;
 		}
-		dstrsrc = d0;
 		break;
 	case 'a':			/* ambient */
 		switch (s[1]) {
@@ -538,9 +496,9 @@ register char  *s;
 			psample = i0;
 			pdepth = 0;
 			break;
-		case 'd':			/* difference */
+		case 't':			/* threshold */
 			if (sscanf(s+2, "%lf", &d0) != 1) {
-				sprintf(buf, "sample difference (%.6g): ",
+				sprintf(buf, "sample threshold (%.6g): ",
 						maxdiff);
 				(*dev->comout)(buf);
 				(*dev->comin)(buf);
@@ -624,7 +582,7 @@ writepict(s)				/* write the picture to a file */
 char  *s;
 {
 	static char  buf[128];
-	char  *fname, *getpath();
+	char  *fname;
 	FILE  *fp;
 	COLR  *scanline;
 	int  y;
@@ -633,7 +591,7 @@ char  *s;
 		error(COMMAND, "no file");
 		return;
 	}
-	if ((fname = getpath(buf, NULL)) == NULL ||
+	if ((fname = getpath(buf, NULL, 0)) == NULL ||
 			(fp = fopen(fname, "w")) == NULL) {
 		sprintf(errmsg, "cannot open \"%s\"", buf);
 		error(COMMAND, errmsg);
@@ -645,10 +603,11 @@ char  *s;
 						/* write header */
 	fputs(progname, fp);
 	fprintview(&ourview, fp);
-	fputs("\n", fp);
+	putc('\n', fp);
 	if (exposure != 1.0)
 		fprintf(fp, "EXPOSURE=%e\n", exposure);
-	fprintf(fp, "\n-Y %d +X %d\n", ourview.vresolu, ourview.hresolu);
+	putc('\n', fp);
+	fputresolu(YMAJOR|YDECR, ourview.hresolu, ourview.vresolu, fp);
 
 	scanline = (COLR *)malloc(ourview.hresolu*sizeof(COLR));
 	if (scanline == NULL)