--- ray/src/hd/rhdisp.c	1998/08/19 17:43:08	3.30
+++ ray/src/hd/rhdisp.c	1998/12/10 10:45:54	3.36
@@ -18,6 +18,10 @@ static char SCCSid[] = "$SunId$ SGI";
 #define VIEWHISTLEN	4	/* number of remembered views */
 #endif
 
+#ifndef FSIZDEF
+#define FSIZDEF		0.125	/* default focus frame size */
+#endif
+
 HOLO	*hdlist[HDMAX+1];	/* global holodeck list */
 
 char	cmdlist[DC_NCMDS][8] = DC_INIT;
@@ -88,14 +92,8 @@ char	*argv[];
 				printview();
 			if (inp & DFL(DC_LASTVIEW))
 				new_view(NULL);
-			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(1) > 0;
+			if (inp & DFL(DC_FOCUS))
+				set_focus(odev_args);
 			if (inp & DFL(DC_KILL)) {
 				serv_request(DR_KILL, 0, NULL);
 				pause = 0;
@@ -106,10 +104,18 @@ char	*argv[];
 				serv_request(DR_RESTART, 0, NULL);
 				pause = 0;
 			}
+			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(1) > 0;
 			if (inp & DFL(DC_QUIT))
 				serv_request(DR_SHUTDOWN, 0, NULL);
 		}
-		if (rdy & RDY_SIN)		/* user input from sstdin */
+		if (rdy & RDY_SIN && !imm_mode)	/* user input from sstdin */
 			switch (usr_input()) {
 			case DC_PAUSE:
 				pause = 1;
@@ -289,8 +295,9 @@ again:
 			}
 			copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN));
 			goto again;
-		}
-	beam_sync(0);		/* update server */
+		}	
+				/* update server */
+	imm_mode = beam_sync(0) > 0;
 				/* record new view */
 	if (v < viewhist || v >= viewhist+VIEWHISTLEN) {
 		copystruct(viewhist + (nhist%VIEWHISTLEN), v);
@@ -299,6 +306,66 @@ again:
 }
 
 
+set_focus(args)			/* set focus frame */
+char	*args;
+{
+	double	hcent, vcent, hsiz, vsiz;
+	VIEW	*dv, vwfocus;
+	int	i, res[2];
+
+	i = sscanf(args, "%lf %lf %lf %lf", &hcent, &vcent, &hsiz, &vsiz);
+	if (i < 2 || hcent < 0 || hcent > 1 || vcent < 0 || vcent > 1) {
+		beam_init(0);				/* restore view */
+		for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++)
+			beam_view(dv, res[0], res[1]);
+		beam_sync(0);				/* update server */
+		return;
+	}
+	if (i < 4 || hsiz <= hcent || hsiz > 1 || vsiz <= vcent || vsiz > 1)
+		hsiz = vsiz = FSIZDEF;			/* gave center only */
+	else {
+		hsiz -= hcent; hcent += 0.5*hsiz;	/* gave min and max */
+		vsiz -= vcent; vcent += 0.5*vsiz;
+	}
+	beam_init(0);					/* add basic views */
+	for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++)
+		beam_view(dv, res[0]>>4, res[1]>>4);
+	copystruct(&vwfocus, &odev.v);			/* add focus view */
+	switch (odev.v.type) {
+	case VT_PER:
+		vwfocus.horiz = 2.*180./PI*atan(
+				hsiz * tan(PI/180./2.*odev.v.horiz) );
+		vwfocus.vert = 2.*180./PI*atan(
+				vsiz * tan(PI/180./2.*odev.v.vert) );
+		break;
+	case VT_PAR:
+	case VT_ANG:
+		vwfocus.horiz = hsiz * odev.v.horiz;
+		vwfocus.vert = vsiz * odev.v.vert;
+		break;
+	case VT_HEM:
+		vwfocus.horiz = 2.*180./PI*asin(
+				hsiz * sin(PI/180./2.*odev.v.horiz) );
+		vwfocus.vert = 2.*180./PI*asin(
+				vsiz * sin(PI/180./2.*odev.v.vert) );
+		break;
+	case VT_CYL:
+		vwfocus.horiz = hsiz * odev.v.horiz;
+		vwfocus.vert = 2.*180./PI*atan(
+				vsiz * tan(PI/180./2.*odev.v.vert) );
+		break;
+	default:
+		error(INTERNAL, "bad view type in set_focus");
+	}
+	vwfocus.hoff = (odev.v.hoff + hcent - 0.5)/hsiz;
+	vwfocus.voff = (odev.v.voff + vcent - 0.5)/vsiz;
+	setview(&vwfocus);
+	beam_view(&vwfocus, (int)(3*odev.hres*hsiz)+100,
+			(int)(3*odev.vres*vsiz)+100);
+	beam_sync(0);					/* update server */
+}
+
+
 int
 usr_input()			/* get user input and process it */
 {
@@ -312,7 +379,7 @@ usr_input()			/* get user input and process it */
 		sstdin = NULL;
 		return(-1);
 	}
-	if (!*cmd)
+	if (*cmd == '\n')
 		return(DC_RESUME);
 	for (args = cmd; *args && !isspace(*args); args++)
 		;
@@ -341,6 +408,9 @@ usr_input()			/* get user input and process it */
 	case DC_LASTVIEW:		/* restore previous view */
 		new_view(NULL);
 		break;
+	case DC_FOCUS:			/* set focus frame */
+		set_focus(args);
+		break;
 	case DC_PAUSE:			/* pause the current calculation */
 	case DC_RESUME:			/* resume the calculation */
 		/* handled in main() */
@@ -421,14 +491,15 @@ serv_result()			/* get next server result and process 
 	case DS_STARTIMM:
 	case DS_ENDIMM:
 #ifdef DEBUG
-		if (imm_mode != (msg.type==DS_STARTIMM)) {
+		{
 			time_t	tnow = time(NULL);
-			if (imm_mode) timm += tnow - tmodesw;
-			else tadd += tnow - tmodesw;
+			if (msg.type==DS_STARTIMM) tadd += tnow - tmodesw;
+			else timm += tnow - tmodesw;
 			tmodesw = tnow;
 		}
 #endif
-		imm_mode = msg.type==DS_STARTIMM;
+		if (!(imm_mode = msg.type==DS_STARTIMM))
+			dev_flush();
 		goto noargs;
 	case DS_ACKNOW:
 	case DS_SHUTDOWN:
@@ -457,6 +528,11 @@ char	*p;
 {
 	MSGHEAD	msg;
 	int	m;
+				/* consistency checks */
+#ifdef DEBUG
+	if (nbytes < 0 || nbytes > 0 & p == NULL)
+		error(CONSISTENCY, "bad buffer handed to serv_request");
+#endif
 				/* get server's attention for big request */
 	if (nbytes >= BIGREQSIZ-sizeof(MSGHEAD)) {
 		serv_request(DR_ATTEN, 0, NULL);