--- ray/src/hd/rhdisp.c	1997/11/19 18:01:03	3.1
+++ ray/src/hd/rhdisp.c	1997/11/21 16:10:17	3.4
@@ -21,15 +21,15 @@ 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,15 +39,32 @@ char	*argv[];
 					/* enter main loop */
 	do {
 		rdy = disp_wait();
-		if (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);
-			else if (inp & DEV_NEWVIEW)
-				new_view(&odev.v);
+			if (inp & DEV_REDRAW) {
+				beam_sync();
+				imm_mode = 1;	/* preempt updates */
+			}
+			if (inp & DEV_WAIT)
+				pause = 1;
+			if (inp & DEV_RESUME) {
+				serv_request(DR_NOOP, 0, NULL);
+				pause = 0;
+			}
 		}
-		if (rdy & SERV_READY)
-			res = serv_result();	/* processes result, also */
+		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);
@@ -63,9 +80,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);
@@ -81,9 +98,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);
 }
 
@@ -229,6 +246,25 @@ char	*p;
 		fwrite(p, 1, nbytes, stdout);
 	if (fflush(stdout) < 0)
 		error(SYSTEM, "write error in serv_request");
+}
+
+
+eputs(s)			/* put error message to stderr */
+register char  *s;
+{
+	static int  midline = 0;
+
+	if (!*s)
+		return;
+	if (!midline++) {	/* prepend line with program name */
+		fputs(progname, stderr);
+		fputs(": ", stderr);
+	}
+	fputs(s, stderr);
+	if (s[strlen(s)-1] == '\n') {
+		fflush(stderr);
+		midline = 0;
+	}
 }