--- ray/src/rt/rv2.c	2005/08/22 07:02:21	2.53
+++ ray/src/rt/rv2.c	2011/10/05 17:20:55	2.62
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rv2.c,v 2.53 2005/08/22 07:02:21 greg Exp $";
+static const char	RCSid[] = "$Id: rv2.c,v 2.62 2011/10/05 17:20:55 greg Exp $";
 #endif
 /*
  *  rv2.c - command routines used in tracing a view.
@@ -13,6 +13,8 @@ static const char	RCSid[] = "$Id: rv2.c,v 2.53 2005/08
 #include  <string.h>
 
 #include  "platform.h"
+#include  "rtprocess.h"	/* win_popen() */
+#include  "paths.h"
 #include  "ray.h"
 #include  "source.h"
 #include  "ambient.h"
@@ -36,7 +38,7 @@ extern char  *progname;
 extern char  *octname;
 
 
-extern void
+void
 getframe(				/* get a new frame */
 	char  *s
 )
@@ -47,7 +49,7 @@ getframe(				/* get a new frame */
 }
 
 
-extern void
+void
 getrepaint(				/* get area and repaint */
 	char  *s
 )
@@ -56,12 +58,12 @@ getrepaint(				/* get area and repaint */
 
 	if (getrect(s, &box) < 0)
 		return;
-	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
+	paintrect(&ptrunk, &box);
 }
 
 
-extern void
-getview(				/* get/show view parameters */
+void
+getview(				/* get/show/save view parameters */
 	char  *s
 )
 {
@@ -80,7 +82,7 @@ getview(				/* get/show view parameters */
 			error(COMMAND, "bad view option(s)");
 		return;
 	}
-	if (sscanf(s, "%s", buf) == 1) {	/* write parameters to a file */
+	if (nextword(buf, sizeof(buf), s) != NULL) {	/* write to a file */
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
 				(fp = fopen(fname, "a")) == NULL) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
@@ -153,7 +155,7 @@ getview(				/* get/show view parameters */
 }
 
 
-extern void
+void
 lastview(				/* return to a previous view */
 	char  *s
 )
@@ -162,8 +164,8 @@ lastview(				/* return to a previous view */
 	char  *fname;
 	int  success;
 	VIEW  nv;
-
-	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
+					/* get parameters from a file */
+	if (nextword(buf, sizeof(buf), s) != NULL) {
 		nv = stdview;
 		if ((fname = getpath(buf, "", R_OK)) == NULL ||
 				(success = viewfile(fname, &nv, NULL)) == -1) {
@@ -184,11 +186,11 @@ lastview(				/* return to a previous view */
 	nv = ourview;
 	ourview = oldview;
 	oldview = nv;
-	newimage();
+	newimage(NULL);
 }
 
 
-extern void
+void
 saveview(				/* save view to rad file */
 	char  *s
 )
@@ -204,11 +206,7 @@ saveview(				/* save view to rad file */
 		}
 		s = sskip(s);
 	}
-	while (isspace(*s))
-		s++;
-	if (*s)
-		atos(rifname, sizeof(rifname), s);
-	else if (rifname[0] == '\0') {
+	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
 		error(COMMAND, "no previous rad file");
 		return;
 	}
@@ -226,7 +224,7 @@ saveview(				/* save view to rad file */
 }
 
 
-extern void
+void
 loadview(				/* load view from rad file */
 	char  *s
 )
@@ -241,9 +239,7 @@ loadview(				/* load view from rad file */
 		s = sskip(s);
 	else
 		strcat(buf, "1");
-	if (*s)
-		atos(rifname, sizeof(rifname), s);
-	else if (rifname[0] == '\0') {
+	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
 		error(COMMAND, "no previous rad file");
 		return;
 	}
@@ -269,7 +265,7 @@ loadview(				/* load view from rad file */
 }
 
 
-extern void
+void
 getaim(				/* aim camera */
 	char  *s
 )
@@ -284,13 +280,12 @@ getaim(				/* aim camera */
 }
 
 
-extern void
+void
 getfocus(				/* set focus distance */
 	char *s
 )
 {
 	char  buf[64];
-	FVECT  vc;
 	double	dist;
 
 	if (sscanf(s, "%lf", &dist) < 1) {
@@ -322,7 +317,7 @@ getfocus(				/* set focus distance */
 }
 
 
-extern void
+void
 getmove(				/* move camera */
 	char  *s
 )
@@ -336,7 +331,7 @@ getmove(				/* move camera */
 }
 
 
-extern void
+void
 getrotate(				/* rotate camera */
 	char  *s
 )
@@ -361,9 +356,9 @@ getrotate(				/* rotate camera */
 }
 
 
-extern void
+void
 getpivot(				/* pivot viewpoint */
-	register char  *s
+	char  *s
 )
 {
 	FVECT  vc;
@@ -380,16 +375,15 @@ getpivot(				/* pivot viewpoint */
 }
 
 
-extern void
+void
 getexposure(				/* get new exposure */
 	char  *s
 )
 {
 	char  buf[128];
-	register char  *cp;
-	RECT  r;
+	char  *cp;
 	int  x, y;
-	register PNODE  *p = &ptrunk;
+	PNODE  *p = &ptrunk;
 	int  adapt = 0;
 	double  e = 1.0;
 
@@ -406,9 +400,7 @@ getexposure(				/* get new exposure */
 		(*dev->comout)("Pick point for exposure\n");
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return;
-		r.l = r.d = 0;
-		r.r = hresolu; r.u = vresolu;
-		p = findrect(x, y, &ptrunk, &r, -1);
+		p = findrect(x, y, &ptrunk, -1);
 	} else {
 		if (*cp == '=') {	/* absolute setting */
 			p = NULL;
@@ -431,6 +423,7 @@ getexposure(				/* get new exposure */
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
+		compavg(p);
 		if (bright(p->v) < 1e-15) {
 			error(COMMAND, "cannot normalize to zero");
 			return;
@@ -448,8 +441,9 @@ getexposure(				/* get new exposure */
 }
 
 typedef union {int i; double d; COLOR C;}	*MyUptr;
+#define  FEQ(x,y)     (fabs((x)-(y)) <= FTINY)
 
-extern int
+int
 getparam(		/* get variable from user */
 	char  *str,
 	char  *dsc,
@@ -457,7 +451,7 @@ getparam(		/* get variable from user */
 	void  *p
 )
 {
-	register MyUptr  ptr = (MyUptr)p;
+	MyUptr  ptr = (MyUptr)p;
 	int  i0;
 	double  d0, d1, d2;
 	char  buf[48];
@@ -472,8 +466,10 @@ getparam(		/* get variable from user */
 			if (sscanf(buf, "%d", &i0) != 1)
 				return(0);
 		}
+		if (ptr->i == i0)
+			return(0);
 		ptr->i = i0;
-		return(1);
+		break;
 	case 'r':			/* real */
 		if (sscanf(str, "%lf", &d0) != 1) {
 			(*dev->comout)(dsc);
@@ -483,20 +479,26 @@ getparam(		/* get variable from user */
 			if (sscanf(buf, "%lf", &d0) != 1)
 				return(0);
 		}
+		if (FEQ(ptr->d, d0))
+			return(0);
 		ptr->d = d0;
-		return(1);
+		break;
 	case 'b':			/* boolean */
 		if (sscanf(str, "%1s", buf) != 1) {
 			(*dev->comout)(dsc);
 			sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
 			(*dev->comout)(buf);
 			(*dev->comin)(buf, NULL);
-			if (buf[0] == '\0' ||
-					strchr("yY+1tTnN-0fF", buf[0]) == NULL)
+			if (buf[0] == '\0')
 				return(0);
 		}
-		ptr->i = strchr("yY+1tT", buf[0]) != NULL;
-		return(1);
+		if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
+			return(0);
+		i0 = strchr("yY+1tT", buf[0]) != NULL;
+		if (ptr->i == i0)
+			return(0);
+		ptr->i = i0;
+		break;
 	case 'C':			/* color */
 		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
 			(*dev->comout)(dsc);
@@ -509,23 +511,31 @@ getparam(		/* get variable from user */
 			if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
 				return(0);
 		}
+		if (FEQ(colval(ptr->C,RED), d0) &&
+				FEQ(colval(ptr->C,GRN), d1) &&
+				FEQ(colval(ptr->C,BLU), d2))
+			return(0);
 		setcolor(ptr->C, d0, d1, d2);
-		return(1);
+		break;
+	default:
+		return(0);		/* shouldn't happen */
 	}
-	return 0; /* nothing matched */
+	newparam++;
+	return(1);
 }
 
 
-extern void
+void
 setparam(				/* get/set program parameter */
-	register char  *s
+	char  *s
 )
 {
+	int  prev_newp = newparam;
 	char  buf[128];
 	
 	if (s[0] == '\0') {
 		(*dev->comout)(
-		"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt sj st u: ");
+		"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt ss st u: ");
 		(*dev->comin)(buf, NULL);
 		s = buf;
 	}
@@ -586,6 +596,7 @@ setparam(				/* get/set program parameter */
 		case 'n': case 'N': case 'f': case 'F': case '0': case '-':
 			getparam(s+1, "black and white", 'b',
 					(void *)&greyscale);
+			newparam = prev_newp;
 			break;
 		default:
 			goto badparam;
@@ -668,11 +679,12 @@ setparam(				/* get/set program parameter */
 		default:
 			goto badparam;
 		}
+		newparam = prev_newp;
 		break;
 	case 's':			/* specular */
 		switch (s[1]) {
-		case 'j':			/* jitter */
-			getparam(s+2, "specular jitter", 'r',
+		case 's':			/* sampling */
+			getparam(s+2, "specular sampling", 'r',
 					(void *)&specjitter);
 			break;
 		case 't':			/* threshold */
@@ -695,19 +707,19 @@ badparam:
 }
 
 
-extern void
-traceray(s)				/* trace a single ray */
-char  *s;
+void
+traceray(				/* trace a single ray */
+	char  *s
+)
 {
-	char  buf[128];
-	int  x, y;
-	OBJREC	*ino;
-	RAY  thisray;
+	RAY	thisray;
+	char	buf[512];
 
 	thisray.rmax = 0.0;
 
 	if (!sscanvec(s, thisray.rorg) ||
 			!sscanvec(sskip2(s,3), thisray.rdir)) {
+		int  x, y;
 
 		if (dev->getcur == NULL)
 			return;
@@ -726,9 +738,7 @@ char  *s;
 		return;
 	}
 
-	rayorigin(&thisray, PRIMARY, NULL, NULL);
-	
-	rayvalue(&thisray);
+	ray_trace(&thisray);
 
 	if (thisray.ro == NULL)
 		(*dev->comout)("ray hit nothing");
@@ -736,6 +746,8 @@ char  *s;
 		OBJREC	*mat = NULL;
 		OBJREC	*mod = NULL;
 		char	matspec[256];
+		OBJREC	*ino;
+
 		matspec[0] = '\0';
 		if (thisray.ro->omod != OVOID) {
 			mod = objptr(thisray.ro->omod);
@@ -778,21 +790,18 @@ char  *s;
 }
 
 
-extern void
-writepict(s)				/* write the picture to a file */
-char  *s;
+void
+writepict(				/* write the picture to a file */
+	char  *s
+)
 {
 	static char  buf[128];
 	char  *fname;
 	FILE  *fp;
 	COLR  *scanline;
 	int  y;
-
-	while (isspace(*s))
-		s++;
-	if (*s)
-		atos(buf, sizeof(buf), s);
-	else if (buf[0] == '\0') {
+				/* XXX relies on words.c 2.11 behavior */
+	if (nextword(buf, sizeof(buf), s) == NULL && !buf[0]) {
 		error(COMMAND, "no file");
 		return;
 	}