--- ray/src/px/xshowtrace.c	1991/07/26 14:14:03	1.6
+++ ray/src/px/xshowtrace.c	2003/06/27 06:53:22	2.8
@@ -1,7 +1,6 @@
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: xshowtrace.c,v 2.8 2003/06/27 06:53:22 greg Exp $";
 #endif
-
 /*
  *  Display an image and watch the rays get traced.
  *
@@ -14,11 +13,17 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define MAXDEPTH	32		/* ridiculous ray tree depth */
 
+#ifdef  SMLFLT
+#define  sscanvec(s,v)	(sscanf(s,"%f %f %f",v,v+1,v+2)==3)
+#else
+#define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
+#endif
+
 char	rtcom[] = "rtrace -h- -otp -fa -x 1";
-char	xicom[] = "ximage";
+char	xicom[] = "ximage -c 256";
 
 VIEW	ourview = STDVIEW;		/* view for picture */
-int	xres, yres;
+RESOLU	ourres;				/* picture resolution */
 
 char	*progname;			/* program name */
 
@@ -29,7 +34,7 @@ FILE	*pin;				/* input stream */
 Display	*theDisplay = NULL;		/* connection to server */
 
 struct node {				/* ray tree node */
-	double	ipt[2];
+	int	ipt[2];
 	struct node	*sister;
 	struct node	*daughter;
 };
@@ -59,7 +64,7 @@ char	*argv[];
 	}
 	picture = argv[argc-1];
 					/* get the viewing parameters */
-	if (viewfile(picture, &ourview, &xres, &yres) <= 0 ||
+	if (viewfile(picture, &ourview, &ourres) <= 0 ||
 			setview(&ourview) != NULL) {
 		fprintf(stderr, "%s: cannot get view from \"%s\"\n",
 				progname, picture);
@@ -83,7 +88,8 @@ char	*argv[];
 		exit(1);
 					/* loop on input */
 	mainloop();
-
+					/* close pipe and exit */
+	pclose(pin);
 	exit(0);
 }
 
@@ -130,11 +136,13 @@ mainloop()				/* get and process input */
 freetree(tp)				/* free a trace tree */
 struct node	*tp;
 {
-	register struct node	*kid;
+	register struct node	*kid, *k2;
 
-	for (kid = tp->daughter; kid != NULL; kid = kid->sister)
+	for (kid = tp->daughter; kid != NULL; kid = k2) {
+		k2 = kid->sister;
 		freetree(kid);
-	free((char *)tp);
+	}
+	free((void *)tp);
 }
 
 
@@ -151,14 +159,19 @@ struct node	*tp;
 
 
 strtoipt(ipt, str)		/* convert string x y z to image point */
-double	ipt[2];
+int	ipt[2];
 char	*str;
 {
-	FVECT	pt;
+	FVECT	im_pt, pt;
 
-	if (sscanf(str, "%lf %lf %lf", &pt[0], &pt[1], &pt[2]) != 3)
+	if (!sscanvec(str, pt))
 		return(-1);
-	viewpixel(&ipt[0], &ipt[1], NULL, &ourview, pt);
+	if (DOT(pt,pt) <= FTINY)		/* origin is really infinity */
+		ipt[0] = ipt[1] = -1;			/* null vector */
+	else {
+		viewloc(im_pt, &ourview, pt);
+		loc2pix(ipt, &ourres, im_pt[0], im_pt[1]);
+	}
 	return(0);
 }
 
@@ -172,8 +185,9 @@ int	xoff, yoff;
 
 
 setvec(ipt)			/* set up vector drawing for pick */
-double	ipt[2];
+int	ipt[2];
 {
+	extern Window	xfindwind();
 	XWindowAttributes	wa;
 	XColor	xc;
 	XGCValues	gcv;
@@ -181,14 +195,19 @@ double	ipt[2];
 	Window	rw, cw;
 	unsigned int	pm;
 					/* compute pointer location */
-	if (gwind == 0 &&
-		(gwind = xfindwind(theDisplay, rwind, picture, 2)) == 0) {
-		fprintf(stderr, "%s: cannot find display window!\n", progname);
-		exit(1);
+	if (gwind == 0) {
+		register char	*wn;
+		for (wn = picture; *wn; wn++);
+		while (wn > picture && wn[-1] != '/') wn--;
+		if ((gwind = xfindwind(theDisplay, rwind, wn, 4)) == 0) {
+			fprintf(stderr, "%s: cannot find display window!\n",
+					progname);
+			exit(1);
+		}
 	}
 	XQueryPointer(theDisplay, gwind, &rw, &cw, &rx, &ry, &wx, &wy, &pm);
-	xoff = wx - ipt[0]*xres;
-	yoff = wy - (1.-ipt[1])*yres;
+	xoff = wx - ipt[0];
+	yoff = wy - ipt[1];
 					/* set graphics context */
 	if (vecGC == 0) {
 		XGetWindowAttributes(theDisplay, gwind, &wa);
@@ -206,11 +225,13 @@ double	ipt[2];
 
 
 vector(ip1, ip2)		/* draw a vector */
-double	ip1[2], ip2[2];
+int	ip1[2], ip2[2];
 {
+	if (ip2[0] == -1 && ip2[1] == -1)
+		return;			/* null vector */
 	XDrawLine(theDisplay, gwind, vecGC,
-			(int)(ip1[0]*xres)+xoff, (int)((1.-ip1[1])*yres)+yoff,
-			(int)(ip2[0]*xres)+xoff, (int)((1.-ip2[1])*yres)+yoff);
+			ip1[0]+xoff, ip1[1]+yoff,
+			ip2[0]+xoff, ip2[1]+yoff);
 	if (slow) {
 		XFlush(theDisplay);
 		sleep(1);