--- ray/src/util/glrad.c	1998/10/21 17:48:51	3.11
+++ ray/src/util/glrad.c	2003/05/19 16:32:19	3.14
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: glrad.c,v 3.14 2003/05/19 16:32:19 greg Exp $";
 #endif
-
 /*
  * Program to display Radiance scene using OpenGL.
  */
@@ -14,6 +11,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #include <X11/extensions/SGIStereo.h>
 #endif
 #include <ctype.h>
+#include <time.h>
 #include "radogl.h"
 #include "view.h"
 #include "paths.h"
@@ -92,13 +90,8 @@ int	displist;			/* our scene display list */
 
 int	no_render = 0;			/* don't rerender */
 
-#ifdef BSD
-#define strchr		index
-#endif
-
-extern char	*strchr(), *fgets(), *fgetline(), *atos(), *scan4var();
+extern char	*fgetline(), *atos(), *scan4var();
 extern int	nowarn;			/* turn warnings off? */
-extern time_t	time();
 
 
 main(argc, argv)
@@ -161,10 +154,10 @@ char	*argv[];
 	dev_open(radfile = argv[i]);
 					/* load octree or scene files */
 	if (octree != NULL) {
-		displist = rgl_octlist(octree, NULL, NULL);
+		displist = rgl_octlist(octree, NULL, NULL, NULL);
 		startrtrace(octree);
 	} else
-		displist = rgl_filelist(nscenef, scene);
+		displist = rgl_filelist(nscenef, scene, NULL);
 					/* set initial view */
 	dev_view(currentview < 0 ? &thisview : vwl[currentview].v);
 					/* input/render loop */
@@ -180,6 +173,7 @@ userr:
 }
 
 
+void
 quit(code)				/* exit gracefully */
 int	code;
 {
@@ -626,6 +620,16 @@ int	dx, dy, mov, orb;
 }
 
 
+static
+waitabit()				/* pause a moment */
+{
+	struct timespec	ts;
+	ts.tv_sec = 0;
+	ts.tv_nsec = 5000000;
+	nanosleep(&ts, NULL);
+}
+
+
 getmove(ebut)				/* get view change */
 XButtonPressedEvent	*ebut;
 {
@@ -642,6 +646,8 @@ XButtonPressedEvent	*ebut;
 
 	while (!XCheckMaskEvent(ourdisplay,
 			ButtonReleaseMask, levptr(XEvent))) {
+					/* pause so as not to move too fast */
+		waitabit();
 
 		if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw,
 				&rootx, &rooty, &wx, &wy, &statemask))
@@ -677,8 +683,8 @@ double	md;
 	if (md <= FTINY) md = FHUGE;
 	fbuf[3] = dir[0]*md; fbuf[4] = dir[1]*md; fbuf[5] = dir[2]*md;
 				/* trace that ray */
-	if (process(rtpd, fbuf, fbuf, 4*sizeof(float), 6*sizeof(float)) !=
-			4*sizeof(float))
+	if (process(rtpd, (char *)fbuf, (char *)fbuf,
+			4*sizeof(float), 6*sizeof(float)) != 4*sizeof(float))
 		error(INTERNAL, "error getting data back from rtrace process");
 	if (fbuf[3] >= .99*FHUGE)
 		return(0);	/* missed local objects */