--- ray/src/rt/rv3.c	2008/09/16 21:14:11	2.30
+++ ray/src/rt/rv3.c	2012/03/20 03:37:08	2.37
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rv3.c,v 2.30 2008/09/16 21:14:11 greg Exp $";
+static const char	RCSid[] = "$Id: rv3.c,v 2.37 2012/03/20 03:37:08 greg Exp $";
 #endif
 /*
  *  rv3.c - miscellaneous routines for rview.
@@ -29,8 +29,10 @@ static const char	RCSid[] = "$Id: rv3.c,v 2.30 2008/09
 #define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
 #endif
 
-static unsigned long  niflush;		/* flushes since newimage() */
+extern int	ray_pnprocs;
 
+static RNUMBER  niflush;		/* flushes since newimage() */
+
 int
 getrect(				/* get a box */
 	char  *s,
@@ -192,17 +194,18 @@ paint(			/* compute and paint a rectangle */
 	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
 			h/hresolu, v/vresolu)) < -FTINY) {
 		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
-	} else if (nproc == 1) {		/* immediate mode */
+	} else if (!ray_pnprocs) {		/* immediate mode */
 		ray_trace(&thisray);
 	} else {				/* queuing mode */
 		int	rval;
 		rayorigin(&thisray, PRIMARY, NULL, NULL);
-		thisray.rno = (unsigned long)p;
+		thisray.rno = (RNUMBER)p;
 		rval = ray_pqueue(&thisray);
 		if (!rval)
 			return(0);
 		if (rval < 0)
 			return(-1);
+						/* get node for returned ray */
 		p = (PNODE *)thisray.rno;
 	}
 
@@ -212,18 +215,20 @@ paint(			/* compute and paint a rectangle */
 	recolor(p);				/* paint it */
 
 	if (dev->flush != NULL) {		/* shall we check for input? */
-		static unsigned long	lastflush = 0;
-		unsigned long		counter = raynum;
-		int			flushintvl;
-		if (nproc == 1) {
+		static RNUMBER	lastflush = 0;
+		RNUMBER		counter = raynum;
+		int		flushintvl;
+		if (!ray_pnprocs) {
 			counter = nrays;
 			flushintvl = WFLUSH1;
 		} else if (ambounce == 0)
-			flushintvl = nproc*WFLUSH;
+			flushintvl = ray_pnprocs*WFLUSH;
 		else if (niflush < WFLUSH)
-			flushintvl = nproc*niflush/(ambounce+1);
+			flushintvl = ray_pnprocs*niflush/(ambounce+1);
 		else
-			flushintvl = nproc*WFLUSH/(ambounce+1);
+			flushintvl = ray_pnprocs*WFLUSH/(ambounce+1);
+		if (lastflush > counter)
+			lastflush = 0;		/* counter wrapped */
 
 		if (counter - lastflush >= flushintvl) {
 			lastflush = counter;
@@ -242,7 +247,7 @@ waitrays(void)					/* finish up pending rays */
 	int	rval;
 	RAY	raydone;
 
-	if (nproc <= 1)				/* immediate mode? */
+	if (!ray_pnprocs)			/* immediate mode? */
 		return(0);
 	while ((rval = ray_presult(&raydone, 0)) > 0) {
 		PNODE  *p = (PNODE *)raydone.rno;
@@ -262,21 +267,10 @@ newimage(					/* start a new image */
 	char *s
 )
 {
-	extern int	ray_pnprocs;
-	int		newnp;
-						/* change in nproc? */
-	if (s != NULL && sscanf(s, "%d", &newnp) == 1 &&
-			(newnp > 0) & (newnp != nproc)) {
-		if (!newparam) {
-			if (newnp == 1)
-				ray_pclose(0);
-			else if (newnp < ray_pnprocs)
-				ray_pclose(ray_pnprocs - newnp);
-			else
-				ray_popen(newnp - ray_pnprocs);
-		}
-		nproc = newnp;
-	}
+	int		newnp = 0;
+						/* # rendering procs arg? */
+	if (s != NULL)
+		sscanf(s, "%d", &newnp);
 						/* free old image */
 	freepkids(&ptrunk);
 						/* compute resolution */
@@ -291,11 +285,21 @@ newimage(					/* start a new image */
 	(*dev->clear)(hresolu, vresolu);
 
 	if (newparam) {				/* (re)start rendering procs */
-		if (ray_pnprocs > 0)
-			ray_pclose(0);
+		if (ray_pnprocs)
+			ray_pclose(0);		/* should already be closed */
+		if (newnp > 0)
+			nproc = newnp;
 		if (nproc > 1)
 			ray_popen(nproc);
 		newparam = 0;
+	} else if ((newnp > 0) & (newnp != nproc)) {
+		if (newnp == 1)			/* change # rendering procs */
+			ray_pclose(0);
+		else if (newnp < ray_pnprocs)
+			ray_pclose(ray_pnprocs - newnp);
+		else
+			ray_popen(newnp - ray_pnprocs);
+		nproc = newnp;
 	}
 	niflush = 0;				/* get first value */
 	paint(&ptrunk);