--- ray/src/hd/rhdisp.c	1997/12/12 11:13:15	3.14
+++ ray/src/hd/rhdisp.c	1998/01/04 12:28:09	3.19
@@ -15,7 +15,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #include <ctype.h>
 
 #ifndef VIEWHISTLEN
-#define VIEWHISTLEN	2	/* number of remembered views */
+#define VIEWHISTLEN	4	/* number of remembered views */
 #endif
 
 HOLO	*hdlist[HDMAX+1];	/* global holodeck list */
@@ -56,6 +56,15 @@ char	*argv[];
 					/* enter main loop */
 	do {
 		rdy = disp_wait();
+		if (rdy & RDY_SRV) {		/* process server result */
+			res = serv_result();
+			if (pause && res != DS_SHUTDOWN) {
+				serv_request(DR_ATTEN, 0, NULL);
+				while ((res = serv_result()) != DS_ACKNOW &&
+						res != DS_SHUTDOWN)
+					;
+			}
+		}
 		if (rdy & RDY_DEV) {		/* user input from driver */
 			inp = dev_input();
 			if (inp & DFL(DC_SETVIEW))
@@ -64,20 +73,24 @@ char	*argv[];
 				printview();
 			if (inp & DFL(DC_LASTVIEW))
 				new_view(NULL);
-			if (inp & DFL(DC_PAUSE))
-				pause = 1;
 			if (inp & DFL(DC_RESUME)) {
 				serv_request(DR_NOOP, 0, NULL);
 				pause = 0;
 			}
+			if (inp & DFL(DC_PAUSE))
+				pause = 1;
 			if (inp & DFL(DC_REDRAW))
 				imm_mode = beam_sync() > 0;
-			if (inp & DFL(DC_KILL))
+			if (inp & DFL(DC_KILL)) {
 				serv_request(DR_KILL, 0, NULL);
+				pause = 0;
+			}
 			if (inp & DFL(DC_CLOBBER))
 				serv_request(DR_CLOBBER, 0, NULL);
-			if (inp & DFL(DC_RESTART))
+			if (inp & DFL(DC_RESTART)) {
 				serv_request(DR_RESTART, 0, NULL);
+				pause = 0;
+			}
 			if (inp & DFL(DC_QUIT))
 				serv_request(DR_SHUTDOWN, 0, NULL);
 		}
@@ -88,18 +101,12 @@ char	*argv[];
 				break;
 			case DC_RESUME:
 				serv_request(DR_NOOP, 0, NULL);
+				/* fall through */
+			case DC_KILL:
+			case DC_RESTART:
 				pause = 0;
 				break;
 			}
-		if (rdy & RDY_SRV) {		/* process server result */
-			res = serv_result();
-			if (pause && res != DS_SHUTDOWN) {
-				serv_request(DR_ATTEN, 0, NULL);
-				while ((res = serv_result()) != DS_ACKNOW &&
-						res != DS_SHUTDOWN)
-					;
-			}
-		}
 	} while (res != DS_SHUTDOWN);
 					/* all done */
 	quit(0);
@@ -207,17 +214,18 @@ register VIEW	*v;
 	char	*err;
 				/* restore previous view? */
 	if (v == NULL) {
-		if (nhist < 2) {
-			error(COMMAND, "no previous view");
-			return;
-		}
-		nhist--;	/* get one before last setting */
+		if (nhist > 1)		/* get one before last setting */
+			nhist--;
+		else			/* else go to end of list */
+			while (nhist < VIEWHISTLEN && viewhist[nhist].type)
+				nhist++;
 		v = viewhist + ((nhist-1)%VIEWHISTLEN);
-	} else if ((err = setview(v)) != NULL) {
+	} else
+again:
+	if ((err = setview(v)) != NULL) {
 		error(COMMAND, err);
 		return;
 	}
-again:
 	if (v->type == VT_PAR) {
 		error(COMMAND, "cannot handle parallel views");
 		return;
@@ -347,8 +355,6 @@ serv_result()			/* get next server result and process 
 	case DS_STARTIMM:
 	case DS_ENDIMM:
 		imm_mode = msg.type==DS_STARTIMM;
-		if (msg.type == DS_ENDIMM)
-			dev_flush();		/* update display NOW */
 		/* fall through */
 	case DS_ACKNOW:
 	case DS_SHUTDOWN: