--- ray/src/px/xshowtrace.c	1991/05/03 10:22:02	1.5
+++ ray/src/px/xshowtrace.c	1991/11/12 16:04:29	2.1
@@ -1,3 +1,5 @@
+/* Copyright (c) 1991 Regents of the University of California */
+
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
 #endif
@@ -14,8 +16,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define MAXDEPTH	32		/* ridiculous ray tree depth */
 
-char	rtcom[] = "rtrace -h -otp -fa -x 1";
-char	xicom[] = "x11image -f";
+char	rtcom[] = "rtrace -h- -otp -fa -x 1";
+char	xicom[] = "ximage";
 
 VIEW	ourview = STDVIEW;		/* view for picture */
 int	xres, yres;
@@ -29,7 +31,7 @@ FILE	*pin;				/* input stream */
 Display	*theDisplay = NULL;		/* connection to server */
 
 struct node {				/* ray tree node */
-	double	ipt[2];
+	FVECT	ipt;
 	struct node	*sister;
 	struct node	*daughter;
 };
@@ -151,14 +153,14 @@ struct node	*tp;
 
 
 strtoipt(ipt, str)		/* convert string x y z to image point */
-double	ipt[2];
+FVECT	ipt;
 char	*str;
 {
 	FVECT	pt;
 
 	if (sscanf(str, "%lf %lf %lf", &pt[0], &pt[1], &pt[2]) != 3)
 		return(-1);
-	viewpixel(&ipt[0], &ipt[1], NULL, &ourview, pt);
+	viewloc(ipt, &ourview, pt);
 	return(0);
 }