--- ray/src/hd/rhdisp.c	1997/11/20 18:05:57	3.2
+++ ray/src/hd/rhdisp.c	1997/12/04 10:54:24	3.9
@@ -17,19 +17,17 @@ HOLO	*hdlist[HDMAX+1];	/* global holodeck list */
 
 int	imm_mode = 0;		/* bundles are being delivered immediately */
 
-VIEW	dvw;			/* our current display view */
-
 char	*progname;		/* global argv[0] */
 
-#define SERV_READY	01
-#define DEV_READY	02
+#define RDY_SRV	01
+#define RDY_DEV	02
 
 
 main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	int	rdy, inp, res = 0;
+	int	rdy, inp, res = 0, pause = 0;
 
 	progname = argv[0];
 	if (argc != 2)
@@ -39,22 +37,32 @@ char	*argv[];
 					/* enter main loop */
 	do {
 		rdy = disp_wait();
-		while (rdy & DEV_READY) {
-			inp = dev_input();	/* take residual action here */
+		if (rdy & RDY_DEV) {		/* get user input */
+			inp = dev_input();
 			if (inp & DEV_NEWVIEW)
 				new_view(&odev.v);
 			if (inp & DEV_SHUTDOWN)
 				serv_request(DR_SHUTDOWN, 0, NULL);
+			if (inp & DEV_REDRAW) {
+				imm_mode = 1;	/* preempt updates */
+				beam_sync();
+			}
 			if (inp & DEV_WAIT)
-				serv_request(DR_ATTEN, 0, NULL);
-			else
-				rdy &= ~DEV_READY;
-		}
-		if (rdy & SERV_READY) {
-			res = serv_result();	/* processes result, also */
-			if (res == DS_ACKNOW)
+				pause = 1;
+			if (inp & DEV_RESUME) {
 				serv_request(DR_NOOP, 0, NULL);
+				pause = 0;
+			}
 		}
+		if (rdy & RDY_SRV) {		/* get 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);
@@ -70,9 +78,9 @@ disp_wait()			/* wait for more input */
 	register int	i;
 				/* see if we can avoid select call */
 	if (imm_mode || stdin->_cnt > 0)
-		return(SERV_READY);
+		return(RDY_SRV);
 	if (dev_flush())
-		return(DEV_READY);
+		return(RDY_DEV);
 				/* make the call */
 	FD_ZERO(&readset); FD_ZERO(&errset);
 	FD_SET(0, &readset);
@@ -88,9 +96,9 @@ disp_wait()			/* wait for more input */
 	}
 	flgs = 0;		/* flag what's ready */
 	if (FD_ISSET(0, &readset) || FD_ISSET(0, &errset))
-		flgs |= SERV_READY;
+		flgs |= RDY_SRV;
 	if (FD_ISSET(odev.ifd, &readset) || FD_ISSET(odev.ifd, &errset))
-		flgs |= DEV_READY;
+		flgs |= RDY_DEV;
 	return(flgs);
 }
 
@@ -140,7 +148,7 @@ register PACKHEAD	*p;
 		hdray(ro, rd, hdlist[p->hd], gc, packra(p)[i].r);
 		d = hddepth(hdlist[p->hd], packra(p)[i].d);
 		VSUM(wp, ro, rd, d);		/* might be behind viewpoint */
-		dev_value(packra(p)[i].v, wp);
+		dev_value(packra(p)[i].v, wp, rd);
 	}
 }
 
@@ -150,11 +158,12 @@ VIEW	*v;
 {
 	char	*err;
 
-	if ((err = setview(v)) != NULL)
-		error(INTERNAL, err);
-	dev_view(v);			/* update display driver */
-	beam_view(&dvw, v);		/* update beam list */
-	copystruct(&dvw, v);		/* record new view */
+	do {
+		if ((err = setview(v)) != NULL)
+			error(INTERNAL, err);
+		dev_view(v);		/* update display driver */
+		dev_flush();		/* update screen */
+	} while (!beam_view(v));	/* update beam list */
 }
 
 
@@ -195,6 +204,8 @@ 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: