--- ray/src/hd/rhdisp.c	1998/12/10 10:45:54	3.36
+++ ray/src/hd/rhdisp.c	2003/05/13 17:58:33	3.45
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhdisp.c,v 3.45 2003/05/13 17:58:33 greg Exp $";
 #endif
-
 /*
  * Holodeck display process.
  */
@@ -22,8 +19,19 @@ static char SCCSid[] = "$SunId$ SGI";
 #define FSIZDEF		0.125	/* default focus frame size */
 #endif
 
+#if defined(freebsd)
+#define fbufcnt(f)	((f)->_r)
+#elif defined(__GNUC__)
+#define fbufcnt(f)	((f)->_IO_read_end - (f)->_IO_read_ptr)
+#else
+#define fbufcnt(f)	((f)->_cnt)
+#endif
+
 HOLO	*hdlist[HDMAX+1];	/* global holodeck list */
 
+char	*hdgfn[HDMAX];		/* holodeck section geometry list */
+char	*hdpfn[HDMAX];		/* section portal list */
+
 char	cmdlist[DC_NCMDS][8] = DC_INIT;
 
 int	imm_mode = 0;		/* bundles are being delivered immediately */
@@ -37,7 +45,6 @@ char	*progname;		/* global argv[0] */
 FILE	*sstdin, *sstdout;	/* server's standard input and output */
 
 #ifdef DEBUG
-#include <sys/types.h>
 extern time_t	time();
 static time_t	tmodesw;
 static time_t	timm, tadd;
@@ -53,7 +60,6 @@ main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	extern int	eputs();
 	int	rdy, inp, res = 0, pause = 0;
 
 	progname = argv[0];
@@ -88,10 +94,12 @@ char	*argv[];
 			inp = dev_input();
 			if (inp & DFL(DC_SETVIEW))
 				new_view(&odev.v);
+			else if (inp & DFL(DC_LASTVIEW))
+				new_view(NULL);
+			if (inp & DFL(DC_REDRAW))
+				imm_mode = beam_sync(1) > 0;
 			if (inp & DFL(DC_GETVIEW))
 				printview();
-			if (inp & DFL(DC_LASTVIEW))
-				new_view(NULL);
 			if (inp & DFL(DC_FOCUS))
 				set_focus(odev_args);
 			if (inp & DFL(DC_KILL)) {
@@ -110,8 +118,6 @@ char	*argv[];
 			}
 			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);
 		}
@@ -152,10 +158,12 @@ disp_wait()			/* wait for more input */
 	int	n;
 	register int	i;
 				/* see if we can avoid select call */
+	if (hdlist[0] == NULL)
+		return(RDY_SRV);	/* initialize first */
 	flgs = 0;		/* flag what's ready already */
-	if (imm_mode || stdin->_cnt > 0)
+	if (imm_mode || fbufcnt(stdin) > 0)
 		flgs |= RDY_SRV;
-	if (sstdin != NULL && sstdin->_cnt > 0)
+	if (sstdin != NULL && fbufcnt(sstdin) > 0)
 		flgs |= RDY_SIN;
 	if (odev.inpready)
 		flgs |= RDY_DEV;
@@ -193,8 +201,9 @@ disp_wait()			/* wait for more input */
 }
 
 
-add_holo(hdg)			/* register a new holodeck section */
+add_holo(hdg, gfn, pfn)		/* register a new holodeck section */
 HDGRID	*hdg;
+char	*gfn, *pfn;
 {
 	VIEW	nv;
 	double	d;
@@ -207,8 +216,10 @@ HDGRID	*hdg;
 	hdlist[hd] = (HOLO *)malloc(sizeof(HOLO));
 	if (hdlist[hd] == NULL)
 		error(SYSTEM, "out of memory in add_holo");
-	bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID));
+	bcopy((void *)hdg, (void *)hdlist[hd], sizeof(HDGRID));
 	hdcompgrid(hdlist[hd]);
+	hdgfn[hd] = savestr(gfn);
+	hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL;
 	if (hd)
 		return;
 					/* set initial viewpoint */
@@ -264,6 +275,7 @@ register VIEW	*v;
 	static unsigned	nhist;
 	VIEW	*dv;
 	int	i, res[2];
+	int2	*slist;
 	char	*err;
 				/* restore previous view? */
 	if (v == NULL) {
@@ -279,25 +291,30 @@ again:
 		error(COMMAND, err);
 		return;
 	}
+	if (!dev_view(v))	/* notify display driver */
+		goto again;
 	if (v->type == VT_PAR) {
 		error(COMMAND, "cannot handle parallel views");
 		return;
 	}
-	if (!dev_view(v))	/* notify display driver */
-		goto again;
-	dev_flush();		/* update screen */
-	beam_init(0);		/* compute new beam set */
-	for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++)
-		if (!beam_view(dv, res[0], res[1])) {
+	beam_init(odev.firstuse);	/* compute new beam set */
+	for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) {
+		if ((slist = beam_view(dv, res[0], res[1])) == NULL) {
 			if (!nhist) {
 				error(COMMAND, "invalid starting view");
 				return;
 			}
 			copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN));
-			goto again;
-		}	
+			goto again;	/* poss. overloading dev_section()? */
+		}
+		DCHECK(*slist < 0, WARNING, "no visible sections in new_view");
+		for ( ; *slist >= 0; slist++)
+			dev_section(hdgfn[*slist], hdpfn[*slist]);
+	}
+	dev_section(NULL,NULL);	/* end section list */
+	dev_flush();		/* update display */
 				/* update server */
-	imm_mode = beam_sync(0) > 0;
+	imm_mode = beam_sync(odev.firstuse) > 0;
 				/* record new view */
 	if (v < viewhist || v >= viewhist+VIEWHISTLEN) {
 		copystruct(viewhist + (nhist%VIEWHISTLEN), v);
@@ -462,7 +479,8 @@ serv_result()			/* get next server result and process 
 			if (buf == NULL)
 				buf = (char *)malloc(bufsiz=msg.nbytes);
 			else
-				buf = (char *)realloc(buf, bufsiz=msg.nbytes);
+				buf = (char *)realloc((void *)buf,
+						bufsiz=msg.nbytes);
 			if (buf == NULL)
 				error(SYSTEM, "out of memory in serv_result");
 		}
@@ -477,9 +495,10 @@ serv_result()			/* get next server result and process 
 		disp_bundle((PACKHEAD *)buf);
 		break;
 	case DS_ADDHOLO:
-		if (msg.nbytes != sizeof(HDGRID))
+		if (msg.nbytes < sizeof(HDGRID)+2)
 			error(INTERNAL, "bad holodeck record from server");
-		add_holo((HDGRID *)buf);
+		add_holo((HDGRID *)buf, buf+sizeof(HDGRID),
+			buf+sizeof(HDGRID)+strlen(buf+sizeof(HDGRID))+1);
 		break;
 	case DS_OUTSECT:
 		do_outside = 1;
@@ -490,6 +509,8 @@ serv_result()			/* get next server result and process 
 		break;
 	case DS_STARTIMM:
 	case DS_ENDIMM:
+		if (!(imm_mode = msg.type==DS_STARTIMM))
+			dev_flush();
 #ifdef DEBUG
 		{
 			time_t	tnow = time(NULL);
@@ -498,8 +519,6 @@ serv_result()			/* get next server result and process 
 			tmodesw = tnow;
 		}
 #endif
-		if (!(imm_mode = msg.type==DS_STARTIMM))
-			dev_flush();
 		goto noargs;
 	case DS_ACKNOW:
 	case DS_SHUTDOWN:
@@ -529,10 +548,8 @@ 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
+	DCHECK(nbytes < 0 || nbytes > 0 & p == NULL,
+			CONSISTENCY, "bad buffer handed to serv_request");
 				/* get server's attention for big request */
 	if (nbytes >= BIGREQSIZ-sizeof(MSGHEAD)) {
 		serv_request(DR_ATTEN, 0, NULL);
@@ -550,6 +567,7 @@ char	*p;
 }
 
 
+void
 eputs(s)			/* put error message to stderr */
 register char  *s;
 {
@@ -569,10 +587,13 @@ register char  *s;
 }
 
 
+void
 quit(code)			/* clean up and exit */
 int	code;
 {
+	if (code)
+		exit(code);
 	if (odev.v.type)
 		dev_close();
-	exit(code);
+	exit(0);
 }