--- ray/src/px/xshowtrace.c	1990/09/24 12:21:06	1.3
+++ ray/src/px/xshowtrace.c	1992/12/11 18:24:29	2.4
@@ -1,3 +1,5 @@
+/* Copyright (c) 1991 Regents of the University of California */
+
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
 #endif
@@ -10,24 +12,33 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "standard.h"
 #include "view.h"
+#include "resolu.h"
 #include <X11/Xlib.h>
 
 #define MAXDEPTH	32		/* ridiculous ray tree depth */
 
-char	rtcom[] = "rtrace -h -otp -fa -x 1";
-char	xicom[] = "x11image -f";
+#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";
+
 VIEW	ourview = STDVIEW;		/* view for picture */
-int	xres, yres;
+RESOLU	ourres;				/* picture resolution */
 
 char	*progname;			/* program name */
 
+char	*picture;			/* picture name */
+
 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;
 };
@@ -43,7 +54,6 @@ char	*argv[];
 {
 	int	i;
 	char	combuf[256];
-	Cursor	curs;
 
 	progname = argv[0];
 	for (i = 1; i < argc-2; i++)
@@ -53,25 +63,26 @@ char	*argv[];
 			break;
 	if (i > argc-2) {
 		fprintf(stderr, "Usage: %s [-s] [rtrace args] octree picture\n",
-				argv[0]);
+				progname);
 		exit(1);
 	}
+	picture = argv[argc-1];
 					/* get the viewing parameters */
-	if (viewfile(argv[argc-1], &ourview, &xres, &yres) <= 0 ||
+	if (viewfile(picture, &ourview, &ourres) <= 0 ||
 			setview(&ourview) != NULL) {
 		fprintf(stderr, "%s: cannot get view from \"%s\"\n",
-				argv[0], argv[argc-1]);
+				progname, picture);
 		exit(1);
 	}
 					/* open the display */
 	if ((theDisplay = XOpenDisplay(NULL)) == NULL) {
 		fprintf(stderr,
 		"%s: cannot open display; DISPLAY variable set?\n",
-				argv[0]);
+				progname);
 		exit(1);
 	}
 					/* build input command */
-	sprintf(combuf, "%s %s | %s", xicom, argv[argc-1], rtcom);
+	sprintf(combuf, "%s %s | %s", xicom, picture, rtcom);
 	for ( ; i < argc-1; i++) {
 		strcat(combuf, " ");
 		strcat(combuf, argv[i]);
@@ -81,7 +92,8 @@ char	*argv[];
 		exit(1);
 					/* loop on input */
 	mainloop();
-
+					/* close pipe and exit */
+	pclose(pin);
 	exit(0);
 }
 
@@ -149,14 +161,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);
 }
 
@@ -170,21 +187,24 @@ 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;
-	int	pm, rx, ry, wx, wy, rw, cw;
+	int	rx, ry, wx, wy;
+	Window	rw, cw;
+	unsigned int	pm;
 					/* compute pointer location */
-	if (gwind == 0) {
-		XQueryPointer(theDisplay, rwind, &rw, &gwind,
-				&rx, &ry, &wx, &wy, &pm);
+	if (gwind == 0 &&
+		(gwind = xfindwind(theDisplay, rwind, picture, 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;
+	XQueryPointer(theDisplay, gwind, &rw, &cw, &rx, &ry, &wx, &wy, &pm);
+	xoff = wx - ipt[0];
+	yoff = wy - ipt[1];
 					/* set graphics context */
 	if (vecGC == 0) {
 		XGetWindowAttributes(theDisplay, gwind, &wa);
@@ -202,11 +222,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);