--- ray/src/rt/rv2.c	1990/01/05 18:04:25	1.13
+++ ray/src/rt/rv2.c	1990/02/27 09:50:56	1.20
@@ -41,7 +41,7 @@ char  *s;
 
 	if (getrect(s, &box) < 0)
 		return;
-	paintrect(&ptrunk, 0, 0, ourview.hresolu, ourview.vresolu, &box);
+	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
 }
 
 
@@ -63,13 +63,14 @@ char  *s;
 		}
 		fputs(progname, fp);
 		fprintview(&ourview, fp);
+		fputs(sskip(s), fp);
 		fputs("\n", fp);
 		fclose(fp);
 		return;
 	}
 	sprintf(buf, "view type (%c): ", ourview.type);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (buf[0] && buf[0] != ourview.type) {
 		nv.type = buf[0];
@@ -79,7 +80,7 @@ char  *s;
 	sprintf(buf, "view point (%.6g %.6g %.6g): ",
 			ourview.vp[0], ourview.vp[1], ourview.vp[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
 		change++;
@@ -88,7 +89,7 @@ char  *s;
 	sprintf(buf, "view direction (%.6g %.6g %.6g): ",
 			ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
 		change++;
@@ -97,7 +98,7 @@ char  *s;
 	sprintf(buf, "view up (%.6g %.6g %.6g): ",
 			ourview.vup[0], ourview.vup[1], ourview.vup[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
 		change++;
@@ -106,22 +107,22 @@ char  *s;
 	sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
 			ourview.horiz, ourview.vert);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
 		change++;
 	else {
 		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
 	}
-	sprintf(buf, "x and y resolution (%d %d): ",
-			ourview.hresolu, ourview.vresolu);
+	sprintf(buf, "view shift and lift (%.6g %.6g): ",
+			ourview.hoff, ourview.voff);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
-	if (sscanf(buf, "%d %d", &nv.hresolu, &nv.vresolu) == 2)
+	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
 		change++;
 	else {
-		nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
+		nv.hoff = ourview.hoff; nv.voff = ourview.voff;
 	}
 	if (change)
 		newview(&nv);
@@ -137,9 +138,9 @@ char  *s;
 	VIEW  nv;
 
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
-		bcopy(&stdview, &nv, sizeof(VIEW));
+		copystruct(&nv, &stdview);
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
-				(success = viewfile(fname, &nv)) == -1) {
+				(success = viewfile(fname, &nv, 0, 0)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
 			return;
@@ -150,13 +151,13 @@ char  *s;
 			newview(&nv);
 		return;
 	}
-	if (oldview.hresolu == 0) {	/* no old view! */
+	if (oldview.type == 0) {	/* no old view! */
 		error(COMMAND, "no previous view");
 		return;
 	}
-	bcopy(&ourview, &nv, sizeof(VIEW));
-	bcopy(&oldview, &ourview, sizeof(VIEW));
-	bcopy(&nv, &oldview, sizeof(VIEW));
+	copystruct(&nv, &ourview);
+	copystruct(&ourview, &oldview);
+	copystruct(&oldview, &nv);
 	newimage();
 }
 
@@ -172,7 +173,7 @@ char  *s;
 		return;
 	VCOPY(nv.vp, ourview.vp);
 	VCOPY(nv.vup, ourview.vup);
-	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
+	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
 	if ((nv.type = ourview.type) == VT_PAR) {
 		nv.horiz = ourview.horiz / zfact;
 		nv.vert = ourview.vert / zfact;
@@ -213,7 +214,7 @@ char  *s;
 	}
 	VCOPY(nv.vp, ourview.vp);
 	VCOPY(nv.vup, ourview.vup);
-	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
+	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
 	spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
 	if (elev != 0.0) {
 		fcross(v1, nv.vdir, ourview.vup);
@@ -270,7 +271,7 @@ char  *s;
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return;
 		r.l = r.d = 0;
-		r.r = ourview.hresolu; r.u = ourview.vresolu;
+		r.r = hresolu; r.u = vresolu;
 		p = findrect(x, y, &ptrunk, &r, -1);
 		e = 1.0;
 	} else {
@@ -282,7 +283,7 @@ char  *s;
 			if (*cp == '\0') {	/* interactive */
 				sprintf(buf, "exposure (%lf): ", exposure);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				for (cp = buf; isspace(*cp); cp++)
 					;
 				if (*cp == '\0')
@@ -335,7 +336,7 @@ register char  *s;
 	
 	if (s[0] == '\0') {
 		(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
-		(*dev->comin)(buf);
+		(*dev->comin)(buf, NULL);
 		s = buf;
 	}
 	switch (s[0]) {
@@ -346,7 +347,7 @@ register char  *s;
 				sprintf(buf, "limit weight (%.6g): ",
 						minweight);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -357,7 +358,7 @@ register char  *s;
 				sprintf(buf, "limit reflection (%d): ",
 						maxdepth);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -374,7 +375,7 @@ register char  *s;
 				sprintf(buf, "direct jitter (%.6g): ",
 						dstrsrc);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -385,7 +386,7 @@ register char  *s;
 				sprintf(buf, "direct certainty (%.6g): ",
 						shadcert);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -396,7 +397,7 @@ register char  *s;
 				sprintf(buf, "direct threshold (%.6g): ",
 						shadthresh);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -416,7 +417,7 @@ register char  *s;
 						colval(ambval,GRN),
 						colval(ambval,BLU));
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf %lf %lf",
 						&d0, &d1, &d2) != 3)
 					break;
@@ -428,7 +429,7 @@ register char  *s;
 				sprintf(buf, "ambient accuracy (%.6g): ",
 						ambacc);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -439,7 +440,7 @@ register char  *s;
 				sprintf(buf, "ambient divisions (%d): ",
 						ambdiv);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -450,7 +451,7 @@ register char  *s;
 				sprintf(buf, "ambient super-samples (%d): ",
 						ambssamp);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -461,7 +462,7 @@ register char  *s;
 				sprintf(buf, "ambient bounces (%d): ",
 						ambounce);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -472,7 +473,7 @@ register char  *s;
 				sprintf(buf, "ambient resolution (%d): ",
 						ambres);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -489,7 +490,7 @@ register char  *s;
 			if (sscanf(s+2, "%d", &i0) != 1) {
 				sprintf(buf, "sample pixel (%d): ", psample);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -501,7 +502,7 @@ register char  *s;
 				sprintf(buf, "sample threshold (%.6g): ",
 						maxdiff);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -540,7 +541,8 @@ char  *s;
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return;
 
-		rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
+		viewray(thisray.rorg, thisray.rdir, &ourview,
+				(x+.5)/hresolu, (y+.5)/vresolu);
 		
 	} else if (normalize(thisray.rdir) == 0.0) {
 		error(COMMAND, "zero ray direction");
@@ -559,7 +561,7 @@ char  *s;
 				ofun[thisray.ro->otype].funame,
 				thisray.ro->oname);
 		(*dev->comout)(buf);
-		(*dev->comin)(buf);
+		(*dev->comin)(buf, NULL);
 		if (thisray.rot >= FHUGE)
 			(*dev->comout)("at infinity");
 		else {
@@ -567,14 +569,14 @@ char  *s;
 					thisray.rop[1], thisray.rop[2]);
 			(*dev->comout)(buf);
 		}
-		(*dev->comin)(buf);
+		(*dev->comin)(buf, NULL);
 		sprintf(buf, "with value (%.6g %.6g %.6g)",
 				colval(thisray.rcol,RED),
 				colval(thisray.rcol,GRN),
 				colval(thisray.rcol,BLU));
 		(*dev->comout)(buf);
 	}
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 }
 
 
@@ -606,16 +608,17 @@ char  *s;
 	putc('\n', fp);
 	if (exposure != 1.0)
 		fputexpos(exposure, fp);
+	if (dev->pixaspect != 1.0)
+		fputaspect(dev->pixaspect, fp);
 	putc('\n', fp);
-	fputresolu(YMAJOR|YDECR, ourview.hresolu, ourview.vresolu, fp);
+	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
 
-	scanline = (COLR *)malloc(ourview.hresolu*sizeof(COLR));
+	scanline = (COLR *)malloc(hresolu*sizeof(COLR));
 	if (scanline == NULL)
 		error(SYSTEM, "out of memory in writepict");
-	for (y = ourview.vresolu-1; y >= 0; y--) {
-		getpictcolrs(y, scanline, &ptrunk,
-				ourview.hresolu, ourview.vresolu);
-		if (fwritecolrs(scanline, ourview.hresolu, fp) < 0)
+	for (y = vresolu-1; y >= 0; y--) {
+		getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
+		if (fwritecolrs(scanline, hresolu, fp) < 0)
 			break;
 	}
 	if (fclose(fp) < 0)