--- ray/src/hd/rhd_ogl.c	1999/01/05 18:16:17	3.15
+++ ray/src/hd/rhd_ogl.c	2003/07/21 22:30:18	3.22
@@ -1,9 +1,6 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_ogl.c,v 3.22 2003/07/21 22:30:18 schorsch Exp $";
 #endif
-
 /*
  * OpenGL driver for holodeck display.
  * Based on GLX driver using T-mesh.
@@ -22,12 +19,12 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #include "standard.h"
 
-#include <sys/types.h>
 #include <GL/glx.h>
 #include <GL/glu.h>
 #ifdef STEREO
 #include <X11/extensions/SGIStereo.h>
 #endif
+#include <time.h>
 
 #include "rhd_odraw.h"
 #ifdef DOBJ
@@ -246,7 +243,7 @@ char  *id;
 	setstereobuf(STEREO_BUFFER_LEFT);
 #endif
 	checkglerr("setting rendering parameters");
-	copystruct(&odev.v, &stdview);
+	odev.v = stdview;
 	odev.v.type = VT_PER;
 	viewflags = VWSTEADY;		/* view starts static */
 					/* map the window */
@@ -333,11 +330,11 @@ register VIEW	*nv;
 			XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres);
 			dev_input();	/* get resize event */
 		}
-		copystruct(&odev.v, nv);	/* setview() already called */
+		odev.v = *nv;	/* setview() already called */
 		viewflags |= VWCHANGE;
 	}
 #ifdef STEREO
-	copystruct(&vwright, nv);
+	vwright = *nv;
 	d = eyesepdist / sqrt(nv->hn2);
 	VSUM(vwright.vp, nv->vp, nv->hvec, d);
 	/* setview(&vwright);	-- Unnecessary */
@@ -350,7 +347,6 @@ register VIEW	*nv;
 dev_section(gfn, pfn)		/* add octree for geometry rendering */
 char	*gfn, *pfn;
 {
-	extern char	*index();
 	char	*cp;
 
 	if (gfn == NULL) {
@@ -558,7 +554,7 @@ xferdepth()			/* load and clear depth buffer */
 	glClear(GL_DEPTH_BUFFER_BIT);		/* clear system depth buffer */
 	odDepthMap(0, depthbuffer);		/* transfer depth data */
 	if (pbuf != NULL)
-		free((char *)pbuf);		/* free our portal buffer */
+		free((void *)pbuf);		/* free our portal buffer */
 }
 
 
@@ -569,11 +565,11 @@ freedepth()				/* free recorded depth buffer */
 		return;
 #ifdef STEREO
 	odDepthMap(1, NULL);
-	free((char *)depthright);
+	free((void *)depthright);
 	depthright = NULL;
 #endif
 	odDepthMap(0, NULL);
-	free((char *)depthbuffer);
+	free((void *)depthbuffer);
 	depthbuffer = NULL;
 }
 
@@ -723,7 +719,7 @@ int	dx, dy, mov, orb;
 	double	d, d1;
 	register int	li;
 				/* start with old view */
-	copystruct(&nv, &odev.v);
+	nv = odev.v;
 				/* orient our motion */
 	if (viewray(v1, odir, &odev.v,
 			(dx+.5)/odev.hres, (dy+.5)/odev.vres) < -FTINY)
@@ -793,6 +789,16 @@ XButtonPressedEvent	*ebut;
 
 
 static
+waitabit()				/* pause a moment */
+{
+	struct timespec	ts;
+	ts.tv_sec = 0;
+	ts.tv_nsec = 50000000;
+	nanosleep(&ts, NULL);
+}
+
+
+static
 getmove(ebut)				/* get view change */
 XButtonPressedEvent	*ebut;
 {
@@ -809,6 +815,8 @@ XButtonPressedEvent	*ebut;
 	setglpersp();			/* start us off in perspective */
 	while (!XCheckMaskEvent(ourdisplay,
 			ButtonReleaseMask, levptr(XEvent))) {
+					/* pause so as not to move too fast */
+		waitabit();
 					/* get cursor position */
 		if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw,
 				&rootx, &rooty, &wx, &wy, &statemask))
@@ -868,8 +876,8 @@ setglpersp()			/* set perspective view in GL */
 		dev_zmin = odev.v.vfore;
 	if (odev.v.vaft > FTINY)
 		dev_zmax = odev.v.vaft;
-	if (dev_zmin < dev_zmax/100.)
-		dev_zmin = dev_zmax/100.;
+	if (dev_zmin*500. < dev_zmax)
+		dev_zmin = dev_zmax/500.;
 	setzrat();
 	xmax = dev_zmin * tan(PI/180./2. * odev.v.horiz);
 	xmin = -xmax;
@@ -945,7 +953,7 @@ wipeclean()			/* prepare for redraw */
 		viewflags &= ~VWCHANGE;		/* change noted */
 	} else if (viewflags & VWSTEADY)
 		odRedrawAll();
-	setglpersp(&odev.v);		/* reset view & clipping planes */
+	setglpersp();			/* reset view & clipping planes */
 }