--- ray/src/util/glrad.c	2016/03/21 19:06:08	3.23
+++ ray/src/util/glrad.c	2016/04/25 20:06:22	3.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: glrad.c,v 3.23 2016/03/21 19:06:08 greg Exp $";
+static const char	RCSid[] = "$Id: glrad.c,v 3.25 2016/04/25 20:06:22 greg Exp $";
 #endif
 /*
  * Program to display Radiance scene using OpenGL.
@@ -29,9 +29,9 @@ static const char	RCSid[] = "$Id: glrad.c,v 3.23 2016/
 
 #define ZOOMPCT		9		/* percent to zoom at a time */
 
-#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 */
@@ -97,26 +97,26 @@ extern int	nowarn;			/* turn warnings off? */
 
 static void startrtrace(char	*octname);
 static void runrad(int	ac, char	**av);
-static int findvw(register char	*nm);
-static int varmatch(register char	*s, register char	*vn);
+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(register VIEW	*nv);
+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(register VIEW	*vp);
-static int getkey(register XKeyPressedEvent  *ekey);
+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(register XExposeEvent  *eexp);
-static void resizewindow(register XConfigureEvent  *ersz);
+static void fixwindow(XExposeEvent  *eexp);
+static void resizewindow(XConfigureEvent  *ersz);
 
 
 int
@@ -245,7 +245,7 @@ runrad(				/* run rad and load variables */
 	static char	optfile[] = TEMPLATE;
 	int	nvn = 0, nvv = 0;
 	FILE	*fp;
-	register char	*cp;
+	char	*cp;
 	char	radcomm[256], buf[128], nam[32];
 					/* set rad commmand */
 	strcpy(radcomm, "rad -w -v 0        ");	/* look out below! */
@@ -335,10 +335,10 @@ runrad(				/* run rad and load variables */
 
 static int
 findvw(			/* find named view */
-	register char	*nm
+	char	*nm
 )
 {
-	register int	n;
+	int	n;
 
 	if ((*nm >= '1') & (*nm <= '9') &&
 			(n = atoi(nm)-1) <= MAXVIEW && vwl[n].v != NULL)
@@ -352,11 +352,11 @@ findvw(			/* find named view */
 
 static int
 varmatch(				/* match line to variable */
-	register char	*s,
-	register char	*vn
+	char	*s,
+	char	*vn
 )
 {
-	register int	c;
+	int	c;
 
 	for ( ; *vn && *s == *vn; s++, vn++)
 		;
@@ -379,7 +379,7 @@ scan4var(	/* scan for variable from fp */
 )
 {
 	int	cval;
-	register char	*cp;
+	char	*cp;
 					/* search out matching line */
 	while ((cval = varmatch(buf, vname))) {
 		if (cval > 0)			/* gone too far? */
@@ -501,7 +501,7 @@ dev_close(void)			/* close our display and free resour
 
 static int
 dev_view(			/* assign new driver view */
-	register VIEW	*nv
+	VIEW	*nv
 )
 {
 	int	newhres = hres, newvres = vres;
@@ -539,7 +539,7 @@ dev_view(			/* assign new driver view */
 			XResizeWindow(ourdisplay, gwind, newhres, newvres);
 			do
 				dev_input(0);		/* get resize event */
-			while ((newhres != hres) | (newvres != vres));
+			while ((newhres != hres) & (newvres != vres));
 			no_render--;
 		}
 	}
@@ -748,7 +748,7 @@ getintersect(		/* intersect ray with scene geometry */
 
 static void
 setglpersp(			/* set perspective view in GL */
-	register VIEW	*vp
+	VIEW	*vp
 )
 {
 	double	d, xmin, xmax, ymin, ymax, zmin, zmax;
@@ -782,7 +782,7 @@ setglpersp(			/* set perspective view in GL */
 
 static int
 getkey(				/* get input key */
-	register XKeyPressedEvent  *ekey
+	XKeyPressedEvent  *ekey
 )
 {
 	int  n;
@@ -931,7 +931,7 @@ copylastv(			/* copy last view position */
 
 static void
 fixwindow(				/* repair damage to window */
-	register XExposeEvent  *eexp
+	XExposeEvent  *eexp
 )
 {
 	if ((hres == 0) | (vres == 0)) {	/* first exposure */
@@ -947,7 +947,7 @@ fixwindow(				/* repair damage to window */
 
 static void
 resizewindow(			/* resize window */
-	register XConfigureEvent  *ersz
+	XConfigureEvent  *ersz
 )
 {
 	static char	resizing[] = "resizing window";