--- ray/src/util/glrad.c	2003/07/21 22:30:19	3.17
+++ ray/src/util/glrad.c	2020/02/28 05:18:49	3.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: glrad.c,v 3.17 2003/07/21 22:30:19 schorsch Exp $";
+static const char	RCSid[] = "$Id: glrad.c,v 3.27 2020/02/28 05:18:49 greg Exp $";
 #endif
 /*
  * Program to display Radiance scene using OpenGL.
@@ -27,11 +27,12 @@ static const char	RCSid[] = "$Id: glrad.c,v 3.17 2003/
 #define MAXSCENE	127		/* maximum number of scene files */
 #endif
 
-#define ZOOMPCT		9		/* percent to zoom at a time */
+#define ZOOMPCT		9		/* percent to zoom for +/- */
+#define WZOOMPCT	3		/* percent to zoom for mouse wheel */
 
-#define MOVPCT		7		/* percent distance to move /frame */
+#define MOVPCT		4		/* percent distance to move /frame */
 #define MOVDIR(b)	((b)==Button1 ? 1 : (b)==Button2 ? 0 : -1)
-#define MOVDEG		(-5)		/* degrees to orbit CW/down /frame */
+#define MOVDEG		(-1.5)		/* degrees to orbit CW/down /frame */
 #define MOVORB(s)	((s)&ShiftMask ? 1 : (s)&ControlMask ? -1 : 0)
 
 #define BORWIDTH	5		/* border width */
@@ -75,14 +76,14 @@ char	*scene[MAXSCENE+1];		/* material and scene file l
 int	nscenef = 0;			/* number of scene files */
 char	*octree;			/* octree name (NULL if unnec.) */
 
-SUBPROC	rtpd;			/* rtrace process descriptors */
+SUBPROC	rtpd = SP_INACTIVE;		/* rtrace process descriptors */
 
 int	silent = 0;			/* run rad silently? */
 int	backvis = 1;			/* back faces visible? */
 int	stereo = 0;			/* do stereo? */
 
 #ifdef NOSTEREO
-#define setstereobuf(bid)	0
+#define setstereobuf(bid)	
 #else
 #define setstereobuf(bid)	(glXWaitGL(), \
 				XSGISetStereoBuffer(ourdisplay, gwind, bid), \
@@ -93,13 +94,37 @@ int	displist;			/* our scene display list */
 
 int	no_render = 0;			/* don't rerender */
 
-extern char	*fgetline(), *atos(), *scan4var();
 extern int	nowarn;			/* turn warnings off? */
 
+static void startrtrace(char	*octname);
+static void runrad(int	ac, char	**av);
+static int findvw(char	*nm);
+static int varmatch(char	*s, char	*vn);
+static char * scan4var(char	*buf, int	buflen, char	*vname, FILE	*fp);
+static void dev_open(char  *id);
+static void dev_close(void);
+static int dev_view(VIEW	*nv);
+static int dev_input(int	nsecs);
+static void render(void);
+static int moveview(int	dx, int	dy, int	mov, int	orb);
+static void waitabit(void);
+static void getmove(XButtonPressedEvent	*ebut);
+static int getintersect(FVECT	wp, FVECT	org, FVECT	dir, double	md);
+static void setglpersp(VIEW	*vp);
+static int getkey(XKeyPressedEvent  *ekey);
+static void zoomview(int	pct, int	dx, int	dy);
+static void gotoview(int	vwnum);
+static void appendview(char	*nm, VIEW	*vp);
+static void copylastv(char	*cause);
+static void fixwindow(XExposeEvent  *eexp);
+static void resizewindow(XConfigureEvent  *ersz);
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	char	*viewsel = NULL;
 	long	vwintvl = 0;
@@ -174,17 +199,19 @@ userr:
 		"Usage: %s [-w][-s][-b][-S][-v view] rfile [VAR=value]..\n",
 			argv[0]);
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
 void
-quit(code)				/* exit gracefully */
-int	code;
+quit(				/* exit gracefully */
+	int	code
+)
 {
 	if (ourdisplay != NULL)
 		dev_close();
 	/* if (rtpd.pid > 0) { */
-	if (rtpd.running) {
+	if (rtpd.flags & PF_RUNNING) {
 		if (close_process(&rtpd) > 0)
 			wputs("bad exit status from rtrace\n");
 		/* rtpd.pid = 0; */
@@ -193,8 +220,10 @@ int	code;
 }
 
 
-startrtrace(octname)			/* start rtrace on octname */
-char	*octname;
+static void
+startrtrace(			/* start rtrace on octname */
+	char	*octname
+)
 {
 	static char	*av[12] = {"rtrace", "-h", "-fff", "-ld+",
 					"-opL", "-x", "1"};
@@ -208,15 +237,16 @@ char	*octname;
 }
 
 
-runrad(ac, av)				/* run rad and load variables */
-int	ac;
-char	**av;
+static void
+runrad(				/* run rad and load variables */
+	int	ac,
+	char	**av
+)
 {
 	static char	optfile[] = TEMPLATE;
 	int	nvn = 0, nvv = 0;
 	FILE	*fp;
-	int	cval;
-	register char	*cp;
+	char	*cp;
 	char	radcomm[256], buf[128], nam[32];
 					/* set rad commmand */
 	strcpy(radcomm, "rad -w -v 0        ");	/* look out below! */
@@ -243,7 +273,7 @@ char	**av;
 						/* get exposure */
 	if ((cp = scan4var(buf, sizeof(buf), "EXPOSURE", fp)) != NULL) {
 		expval = atof(cp);
-		if (*cp == '-' | *cp == '+')
+		if ((*cp == '-') | (*cp == '+'))
 			expval = pow(2., expval);
 		expval *= 0.5;		/* compensate for local shading */
 	}
@@ -252,7 +282,7 @@ char	**av;
 		eyedist = atof(cp);
 						/* look for materials */
 	while ((cp = scan4var(buf, sizeof(buf), "materials", fp)) != NULL) {
-		nscenef += wordstring(scene+nscenef, cp);
+		nscenef += wordstring(scene+nscenef, MAXSCENE-nscenef, cp);
 		buf[0] = '\0';
 	}
 						/* look for octree */
@@ -260,7 +290,7 @@ char	**av;
 		octree = savqstr(cp);
 						/* look for scene files */
 	while ((cp = scan4var(buf, sizeof(buf), "scene", fp)) != NULL) {
-		nscenef += wordstring(scene+nscenef, cp);
+		nscenef += wordstring(scene+nscenef, MAXSCENE-nscenef, cp);
 		buf[0] = '\0';
 	}
 						/* load view names */
@@ -304,13 +334,14 @@ char	**av;
 }
 
 
-int
-findvw(nm)			/* find named view */
-register char	*nm;
+static int
+findvw(			/* find named view */
+	char	*nm
+)
 {
-	register int	n;
+	int	n;
 
-	if (*nm >= '1' & *nm <= '9' &&
+	if ((*nm >= '1') & (*nm <= '9') &&
 			(n = atoi(nm)-1) <= MAXVIEW && vwl[n].v != NULL)
 		return(n);
 	for (n = 0; vwl[n].v != NULL; n++)
@@ -320,11 +351,13 @@ register char	*nm;
 }
 
 
-int
-varmatch(s, vn)				/* match line to variable */
-register char	*s, *vn;
+static int
+varmatch(				/* match line to variable */
+	char	*s,
+	char	*vn
+)
 {
-	register int	c;
+	int	c;
 
 	for ( ; *vn && *s == *vn; s++, vn++)
 		;
@@ -338,15 +371,16 @@ register char	*s, *vn;
 }
 
 
-char *
-scan4var(buf, buflen, vname, fp)	/* scan for variable from fp */
-char	*buf;
-int	buflen;
-char	*vname;
-FILE	*fp;
+static char *
+scan4var(	/* scan for variable from fp */
+	char	*buf,
+	int	buflen,
+	char	*vname,
+	FILE	*fp
+)
 {
 	int	cval;
-	register char	*cp;
+	char	*cp;
 					/* search out matching line */
 	while ((cval = varmatch(buf, vname))) {
 		if (cval > 0)			/* gone too far? */
@@ -363,8 +397,10 @@ FILE	*fp;
 }
 
 
-dev_open(id)			/* initialize GLX driver */
-char  *id;
+static void
+dev_open(			/* initialize GLX driver */
+	char  *id
+)
 {
 	static int	atlBest[] = {GLX_RGBA, GLX_RED_SIZE,4,
 				GLX_GREEN_SIZE,4, GLX_BLUE_SIZE,4,
@@ -414,8 +450,8 @@ char  *id;
 					/* set window manager hints */
 	ourxwmhints.flags = InputHint|IconPixmapHint;
 	ourxwmhints.input = True;
-	ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay,
-		gwind, glradicon_bits, glradicon_width, glradicon_height);
+	ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind,
+		(char *)glradicon_bits, glradicon_width, glradicon_height);
 	XSetWMHints(ourdisplay, gwind, &ourxwmhints);
 					/* set GLX context */
 	glXMakeCurrent(ourdisplay, gwind, gctx);
@@ -446,13 +482,14 @@ char  *id;
 	no_render++;
 	do
 		dev_input(0);		/* get resize event */
-	while (hres == 0 & vres == 0);
+	while ((hres == 0) & (vres == 0));
 	no_render--;
 	rgl_checkerr("initializing GLX");
 }
 
 
-dev_close()			/* close our display and free resources */
+static void
+dev_close(void)			/* close our display and free resources */
 {
 	glXMakeCurrent(ourdisplay, None, NULL);
 	glXDestroyContext(ourdisplay, gctx);
@@ -463,9 +500,10 @@ dev_close()			/* close our display and free resources 
 }
 
 
-int
-dev_view(nv)			/* assign new driver view */
-register VIEW	*nv;
+static int
+dev_view(			/* assign new driver view */
+	VIEW	*nv
+)
 {
 	int	newhres = hres, newvres = vres;
 	double	wa, va;
@@ -474,14 +512,14 @@ register VIEW	*nv;
 		error(COMMAND, "illegal view type");
 		nv->type = VT_PER;
 	}
-	if (nv->horiz > 160. | nv->vert > 160.) {
+	if ((nv->horiz > 160.) | (nv->vert > 160.)) {
 		error(COMMAND, "illegal view angle");
 		if (nv->horiz > 160.)
 			nv->horiz = 160.;
 		if (nv->vert > 160.)
 			nv->vert = 160.;
 	}
-	if (hres != 0 & vres != 0) {
+	if ((hres != 0) & (vres != 0)) {
 		wa = (vres*pheight)/(hres*pwidth);
 		va = viewaspect(nv);
 		if (va > wa+.05) {
@@ -497,12 +535,12 @@ register VIEW	*nv;
 				newvres = (pwidth/pheight)*va*newhres + .5;
 			}
 		}
-		if (newhres != hres | newvres != vres) {
+		if ((newhres != hres) | (newvres != vres)) {
 			no_render++;
 			XResizeWindow(ourdisplay, gwind, newhres, newvres);
 			do
 				dev_input(0);		/* get resize event */
-			while (newhres != hres | newvres != vres);
+			while ((newhres != hres) & (newvres != vres));
 			no_render--;
 		}
 	}
@@ -513,9 +551,10 @@ register VIEW	*nv;
 }
 
 
-int
-dev_input(nsecs)		/* get next input event */
-int	nsecs;
+static int
+dev_input(		/* get next input event */
+	int	nsecs
+)
 {
 #if 0
 	static time_t	lasttime = 0;
@@ -546,14 +585,27 @@ int	nsecs;
 	case KeyPress:
 		return(getkey(levptr(XKeyPressedEvent)));
 	case ButtonPress:
-		getmove(levptr(XButtonPressedEvent));
+		switch (levptr(XButtonPressedEvent)->button) {
+		case Button4:			/* wheel up */
+			zoomview(100+WZOOMPCT, levptr(XButtonPressedEvent)->x,
+					vres-1-levptr(XButtonPressedEvent)->y);
+			break;
+		case Button5:			/* wheel down */
+			zoomview(100-WZOOMPCT, levptr(XButtonPressedEvent)->x,
+					vres-1-levptr(XButtonPressedEvent)->y);
+			break;
+		default:
+			getmove(levptr(XButtonPressedEvent));
+			break;
+		}
 		break;
 	}
 	return(1);
 }
 
 
-render()			/* render our display list and swap buffers */
+static void
+render(void)			/* render our display list and swap buffers */
 {
 	double	d;
 
@@ -579,8 +631,13 @@ render()			/* render our display list and swap buffers
 }
 
 
-moveview(dx, dy, mov, orb)	/* move our view */
-int	dx, dy, mov, orb;
+static int
+moveview(	/* move our view */
+	int	dx,
+	int	dy,
+	int	mov,
+	int	orb
+)
 {
 	VIEW	nv;
 	FVECT	odir, v1, wp;
@@ -602,12 +659,11 @@ int	dx, dy, mov, orb;
 		VSUM(nv.vp, wp, odir, -1.);
 		spinvector(nv.vdir, nv.vdir, nv.vup, d);
 	} else if (orb) {		/* orbit up/down */
-		fcross(v1, odir, nv.vup);
-		if (normalize(v1) == 0.)
+		if (geodesic(odir, odir, nv.vup,
+				d=MOVDEG*PI/180.*orb, GEOD_RAD) == 0.0)
 			return(0);
-		spinvector(odir, odir, v1, d=MOVDEG*PI/180.*orb);
 		VSUM(nv.vp, wp, odir, -1.);
-		spinvector(nv.vdir, nv.vdir, v1, d);
+		geodesic(nv.vdir, nv.vdir, nv.vup, d, GEOD_RAD);
 	} else if (mov) {		/* move forward/backward */
 		d = MOVPCT/100. * mov;
 		VSUM(nv.vp, nv.vp, odir, d);
@@ -624,18 +680,20 @@ int	dx, dy, mov, orb;
 }
 
 
-static
-waitabit()				/* pause a moment */
+static void
+waitabit(void)				/* pause a moment */
 {
 	struct timespec	ts;
 	ts.tv_sec = 0;
-	ts.tv_nsec = 5000000;
+	ts.tv_nsec = 50000000;
 	nanosleep(&ts, NULL);
 }
 
 
-getmove(ebut)				/* get view change */
-XButtonPressedEvent	*ebut;
+static void
+getmove(				/* get view change */
+	XButtonPressedEvent	*ebut
+)
 {
 	int	movdir = MOVDIR(ebut->button);
 	int	movorb = MOVORB(ebut->state);
@@ -672,15 +730,18 @@ XButtonPressedEvent	*ebut;
 }
 
 
-getintersect(wp, org, dir, md)		/* intersect ray with scene geometry */
-FVECT	wp;		/* returned world intersection point */
-FVECT	org, dir;
-double	md;
+static int
+getintersect(		/* intersect ray with scene geometry */
+	FVECT	wp,		/* returned world intersection point */
+	FVECT	org,
+	FVECT	dir,
+	double	md
+)
 {
 	float	fbuf[6];
 				/* check to see if rtrace is running */
 	/* if (rtpd.pid <= 0) */
-	if (!rtpd.running)
+	if (!(rtpd.flags & PF_RUNNING))
 		return(0);
 				/* assign origin */
 	fbuf[0] = org[0]; fbuf[1] = org[1]; fbuf[2] = org[2];
@@ -698,8 +759,10 @@ double	md;
 }
 
 
-setglpersp(vp)			/* set perspective view in GL */
-register VIEW	*vp;
+static void
+setglpersp(			/* set perspective view in GL */
+	VIEW	*vp
+)
 {
 	double	d, xmin, xmax, ymin, ymax, zmin, zmax;
 
@@ -730,9 +793,10 @@ register VIEW	*vp;
 }
 
 
-int
-getkey(ekey)				/* get input key */
-register XKeyPressedEvent  *ekey;
+static int
+getkey(				/* get input key */
+	XKeyPressedEvent  *ekey
+)
 {
 	int  n;
 	char	buf[8];
@@ -776,6 +840,7 @@ register XKeyPressedEvent  *ekey;
 	case 'V':			/* append view to rad file */
 		appendview(NULL, &thisview);
 		break;
+	case 'Q':
 	case 'q':			/* quit the program */
 		return(0);
 	default:
@@ -786,14 +851,16 @@ register XKeyPressedEvent  *ekey;
 }
 
 
-zoomview(pct, dx, dy)			/* zoom in or out around (dx,dy) */
-int	pct;
-int	dx, dy;
+static void
+zoomview(			/* zoom in or out around (dx,dy) */
+	int	pct,
+	int	dx,
+	int	dy
+)
 {
 	double	h, v;
-	FVECT	direc;
 
-	if (pct == 100 | pct <= 0)
+	if ((pct == 100) | (pct <= 0))
 		return;
 	copylastv("zooming");
 	h = (dx+.5)/hres - 0.5;
@@ -812,8 +879,10 @@ int	dx, dy;
 }
 
 
-gotoview(vwnum)				/* go to specified view number */
-int	vwnum;
+static void
+gotoview(				/* go to specified view number */
+	int	vwnum
+)
 {
 	if (vwnum < 0)
 		for (vwnum = currentview; vwl[vwnum+1].v != NULL; vwnum++)
@@ -825,9 +894,11 @@ int	vwnum;
 }
 
 
-appendview(nm, vp)			/* append standard view */
-char	*nm;
-VIEW	*vp;
+static void
+appendview(			/* append standard view */
+	char	*nm,
+	VIEW	*vp
+)
 {
 	FILE	*fp;
 					/* check if already in there */
@@ -858,8 +929,10 @@ VIEW	*vp;
 }
 
 
-copylastv(cause)			/* copy last view position */
-char	*cause;
+static void
+copylastv(			/* copy last view position */
+	char	*cause
+)
 {
 	static char	*lastvc;
 
@@ -870,10 +943,12 @@ char	*cause;
 }
 
 
-fixwindow(eexp)				/* repair damage to window */
-register XExposeEvent  *eexp;
+static void
+fixwindow(				/* repair damage to window */
+	XExposeEvent  *eexp
+)
 {
-	if (hres == 0 | vres == 0) {	/* first exposure */
+	if ((hres == 0) | (vres == 0)) {	/* first exposure */
 		resizewindow((XConfigureEvent *)eexp);
 		return;
 	}
@@ -884,8 +959,10 @@ register XExposeEvent  *eexp;
 }
 
 
-resizewindow(ersz)			/* resize window */
-register XConfigureEvent  *ersz;
+static void
+resizewindow(			/* resize window */
+	XConfigureEvent  *ersz
+)
 {
 	static char	resizing[] = "resizing window";
 	double	wa, va;