--- ray/src/hd/rholo4.c	1997/12/12 11:13:17	3.13
+++ ray/src/hd/rholo4.c	2003/05/13 17:58:33	3.29
@@ -1,9 +1,6 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rholo4.c,v 3.29 2003/05/13 17:58:33 greg Exp $";
 #endif
-
 /*
  * Holodeck display process communication
  */
@@ -13,9 +10,16 @@ static char SCCSid[] = "$SunId$ SGI";
 #include <sys/uio.h>
 
 #ifndef HDSUF
-#define HDSUF	".hdisp"
+#define HDSUF		".hdi"
 #endif
+#ifndef SLAVENAME
+#define SLAVENAME	"slave"
+#endif
 
+#ifndef FNONBLK
+#define FNONBLK		O_NONBLOCK
+#endif
+
 static int	inp_flags;
 static int	dpd[3];
 static FILE	*dpout;
@@ -24,38 +28,65 @@ static FILE	*dpout;
 disp_open(dname)		/* open the named display driver */
 char	*dname;
 {
-	char	dpath[128], fd0[8], fd1[8], *cmd[5];
-	int	i;
-				/* get full display program name */
+	char	buf[sizeof(HDGRID)+512], fd0[8], fd1[8], *cmd[5], *sfn;
+	int	i, n, len;
+
+	if (!strcmp(dname, SLAVENAME)) {
+		dpd[0] = 0;		/* read from stdin */
+		dpout = stdout;		/* write to stdout */
+		dpd[2] = -1;		/* we're the slave process */
+	} else {
+					/* get full display program name */
 #ifdef DEVPATH
-	sprintf(dpath, "%s/%s%s", DEVPATH, dname, HDSUF);
+		sprintf(buf, "%s/%s%s", DEVPATH, dname, HDSUF);
 #else
-	sprintf(dpath, "dev/%s%s", dname, HDSUF);
+		sprintf(buf, "dev/%s%s", dname, HDSUF);
 #endif
-				/* dup stdin and stdout */
-	if (readinp)
-		sprintf(fd0, "%d", dup(0));
-	else
-		strcpy(fd0, "-1");
-	sprintf(fd1, "%d", dup(1));
-				/* start the display process */
-	cmd[0] = dpath;
-	cmd[1] = froot; cmd[2] = fd1; cmd[3] = fd0;
-	cmd[4] = NULL;
-	i = open_process(dpd, cmd);
-	if (i <= 0)
-		error(USER, "cannot start display process");
-	if ((dpout = fdopen(dpd[1], "w")) == NULL)
-		error(SYSTEM, "cannot associate FILE with display pipe");
+					/* dup stdin and stdout */
+		if (readinp)
+			sprintf(fd0, "%d", dup(0));
+		else
+			strcpy(fd0, "-1");
+		sprintf(fd1, "%d", dup(1));
+					/* start the display process */
+		cmd[0] = buf;
+		cmd[1] = froot; cmd[2] = fd1; cmd[3] = fd0;
+		cmd[4] = NULL;
+		i = open_process(dpd, cmd);
+		if (i <= 0)
+			error(USER, "cannot start display process");
+		if ((dpout = fdopen(dpd[1], "w")) == NULL)
+			error(SYSTEM, "problem opening display pipe");
+					/* close dup'ed stdin and stdout */
+		if (readinp)
+			close(atoi(fd0));
+		close(atoi(fd1));
+	}
 	dpd[1] = -1;		/* causes ignored error in close_process() */
 	inp_flags = 0;
-				/* close dup'ed stdin and stdout */
-	if (readinp)
-		close(atoi(fd0));
-	close(atoi(fd1));
-				/* write out hologram grids */
-	for (i = 0; hdlist[i] != NULL; i++)
-		disp_result(DS_ADDHOLO, sizeof(HDGRID), (char *)hdlist[i]);
+				/* check if outside */
+	if (vdef(OBSTRUCTIONS) && vbool(OBSTRUCTIONS))
+		disp_result(DS_OUTSECT, 0, NULL);
+				/* send eye separation if specified */
+	if (vdef(EYESEP)) {
+		sprintf(buf, "%.9e", vflt(EYESEP));
+		disp_result(DS_EYESEP, strlen(buf)+1, buf);
+	}
+				/* write out hologram grids & octrees */
+	for (i = 0; hdlist[i] != NULL; i++) {
+		bcopy((void *)hdlist[i], buf, sizeof(HDGRID));
+		len = sizeof(HDGRID);
+		n = vdef(GEOMETRY);
+		sfn = i<n ? nvalue(GEOMETRY,i) :
+				n ? nvalue(GEOMETRY,n-1) : vval(OCTREE);
+		strcpy(buf+len, sfn);
+		len += strlen(sfn) + 1;
+		n = vdef(PORTS);
+		sfn = i<n ? nvalue(PORTS,i) : n ? nvalue(PORTS,n-1) : "";
+		strcpy(buf+len, sfn);
+		len += strlen(sfn) + 1;
+		disp_result(DS_ADDHOLO, len, buf);
+	}
 	disp_flush();
 }
 
@@ -96,10 +127,12 @@ int	block;
 		return(2);		/* acceptable failure */
 	}
 	if (msg.nbytes) {		/* get the message body */
+		if (msg.nbytes < 0)
+			error(INTERNAL, "anti-message from display process");
 		buf = (char *)malloc(msg.nbytes);
 		if (buf == NULL)
 			error(SYSTEM, "out of memory in disp_check");
-		if (fcntl(dpd[0], F_SETFL, inp_flags=0) < 0)
+		if (inp_flags != 0 && fcntl(dpd[0], F_SETFL, inp_flags=0) < 0)
 			goto fcntlerr;
 		if (readbuf(dpd[0], buf, msg.nbytes) != msg.nbytes)
 			goto readerr;
@@ -113,20 +146,27 @@ int	block;
 	case DR_NEWSET:		/* new calculation set */
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_NEWSET from display process");
-		disp_result(DS_STARTIMM, 0, NULL);
+		if (msg.nbytes)
+			disp_result(DS_STARTIMM, 0, NULL);
 		bundle_set(BS_NEW, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
-		disp_result(DS_ENDIMM, 0, NULL);
-		disp_flush();
+		if (msg.nbytes) {
+			disp_result(DS_ENDIMM, 0, NULL);
+			disp_flush();
+		}
 		break;
 	case DR_ADDSET:		/* add to calculation set */
+		if (!msg.nbytes)
+			break;
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_ADDSET from display process");
 		disp_result(DS_STARTIMM, 0, NULL);
 		bundle_set(BS_ADD, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
 		disp_result(DS_ENDIMM, 0, NULL);
-		disp_check(0);		/* hack -- delete usu. follows add */
+		disp_flush();
 		break;
 	case DR_ADJSET:		/* adjust calculation set members */
+		if (!msg.nbytes)
+			break;
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_ADJSET from display process");
 		disp_result(DS_STARTIMM, 0, NULL);
@@ -135,10 +175,17 @@ int	block;
 		disp_flush();
 		break;
 	case DR_DELSET:		/* delete from calculation set */
+		if (!msg.nbytes)
+			break;
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_DELSET from display process");
 		bundle_set(BS_DEL, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
 		break;
+	case DR_VIEWPOINT:	/* set target eye position */
+		if (msg.nbytes != sizeof(VIEWPOINT))
+			error(INTERNAL, "bad DR_VIEWPOINT from display process");
+		copystruct(&myeye, (VIEWPOINT *)buf);
+		break;
 	case DR_ATTEN:		/* block for priority request */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_ATTEN from display process");
@@ -148,21 +195,17 @@ int	block;
 	case DR_KILL:		/* kill computation process(es) */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_KILL from display process");
-		if (nprocs > 0) {
-			done_packets(flush_queue());
-			if (end_rtrace())
-				error(WARNING, "bad status returned by rtrace");
-		} else
+		if (nprocs > 0)
+			done_rtrace();
+		else
 			error(WARNING, "no rtrace process to kill");
 		break;
 	case DR_RESTART:	/* restart computation process(es) */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_RESTART from display process");
-		if (ncprocs > nprocs) {
-			checkrad();
-			if (start_rtrace() < 1)
-				error(WARNING, "cannot restart rtrace");
-		} else if (nprocs > 0)
+		if (ncprocs > nprocs)
+			new_rtrace();
+		else if (nprocs > 0)
 			error(WARNING, "rtrace already runnning");
 		else
 			error(WARNING, "holodeck not open for writing");
@@ -170,7 +213,7 @@ int	block;
 	case DR_CLOBBER:	/* clobber holodeck */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_CLOBBER from display process");
-		if (!force || !ncprocs)
+		if (force <= 0 | ncprocs <= 0)
 			error(WARNING, "request to clobber holodeck denied");
 		else {
 			error(WARNING, "clobbering holodeck contents");
@@ -203,10 +246,11 @@ disp_close()			/* close our display process */
 
 	if (dpout == NULL)
 		return(-1);
+	myeye.rng = 0;
 	disp_result(DS_SHUTDOWN, 0, NULL);
 	fclose(dpout);
 	dpout = NULL;
-	return(close_process(dpd));
+	return(dpd[2]<0 ? 0 : close_process(dpd));
 }
 
 
@@ -215,7 +259,11 @@ int	type, nbytes;
 char	*p;
 {
 	MSGHEAD	msg;
-
+					/* consistency checks */
+#ifdef DEBUG
+	if (nbytes < 0 || nbytes > 0 & p == NULL)
+		error(CONSISTENCY, "bad buffer handed to disp_result");
+#endif
 	if (dpout == NULL)
 		return;
 	msg.type = type;