--- ray/src/hd/rhd_x11.c	2003/02/22 02:07:24	3.32
+++ ray/src/hd/rhd_x11.c	2003/09/19 18:33:05	3.36
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhd_x11.c,v 3.32 2003/02/22 02:07:24 greg Exp $";
+static const char	RCSid[] = "$Id: rhd_x11.c,v 3.36 2003/09/19 18:33:05 greg Exp $";
 #endif
 /*
  * X11 driver for holodeck display.
@@ -176,7 +176,7 @@ char  *id;
 			DisplayWidth(ourdisplay, ourscreen);
 	pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) /
 			DisplayHeight(ourdisplay, ourscreen);
-	copystruct(&odev.v, &stdview);
+	odev.v = stdview;
 	odev.v.type = VT_PER;
 					/* map the window and get its size */
 	XMapWindow(ourdisplay, gwind);
@@ -258,7 +258,7 @@ VIEW	*nv;
 			XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres);
 			dev_input();	/* wait for resize event */
 		}
-		copystruct(&odev.v, nv);
+		odev.v = *nv;
 	}
 	qtReplant();
 	return(1);
@@ -546,7 +546,7 @@ int	dx, dy, mov, orb;
 	double	d;
 	register int	li;
 				/* start with old view */
-	copystruct(&nv, &odev.v);
+	nv = odev.v;
 				/* change view direction */
 	if (mov | orb) {
 		if ((li = qtFindLeaf(dx, dy)) < 0)
@@ -595,7 +595,7 @@ XButtonPressedEvent	*ebut;
 	XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent));
 	endx = levptr(XButtonReleasedEvent)->x;
 	endy = levptr(XButtonReleasedEvent)->y;
-	if (endx == startx | endy == starty) {
+	if ((endx == startx) | (endy == starty)) {
 		XBell(ourdisplay, 0);
 		return;
 	}
@@ -613,7 +613,7 @@ waitabit()				/* pause a moment */
 {
 	struct timespec	ts;
 	ts.tv_sec = 0;
-	ts.tv_nsec = 5000000;
+	ts.tv_nsec = 100000000;
 	nanosleep(&ts, NULL);
 }