--- ray/src/hd/rholo4.c	1998/11/24 17:05:36	3.22
+++ ray/src/hd/rholo4.c	2003/07/01 21:21:40	3.33
@@ -1,74 +1,94 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rholo4.c,v 3.33 2003/07/01 21:21:40 greg Exp $";
 #endif
-
 /*
  * Holodeck display process communication
  */
 
 #include "rholo.h"
 #include "rhdisp.h"
+#include "rtprocess.h"
 #include <sys/uio.h>
+#include <string.h>
 
 #ifndef HDSUF
-#define HDSUF	".hdi"
+#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 SUBPROC	dpd;
 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.r = 0;		/* read from stdin */
+		dpout = stdout;		/* write to stdout */
+		dpd.running = 0; /* we're the slave procees */
+	} 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");
-	dpd[1] = -1;		/* causes ignored error in close_process() */
+					/* 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.w, "w")) == NULL)
+			error(SYSTEM, "problem opening display pipe");
+					/* close dup'ed stdin and stdout */
+		if (readinp)
+			close(atoi(fd0));
+		close(atoi(fd1));
+	}
+	dpd.w = -1;		/* causes ignored error in close_process() */
 	inp_flags = 0;
-				/* close dup'ed stdin and stdout */
-	if (readinp)
-		close(atoi(fd0));
-	close(atoi(fd1));
 				/* check if outside */
 	if (vdef(OBSTRUCTIONS) && vbool(OBSTRUCTIONS))
 		disp_result(DS_OUTSECT, 0, NULL);
 				/* send eye separation if specified */
 	if (vdef(EYESEP)) {
-		char	fbuf[32];
-		sprintf(fbuf, "%.9e", vflt(EYESEP));
-		disp_result(DS_EYESEP, strlen(fbuf)+1, fbuf);
+		sprintf(buf, "%.9e", vflt(EYESEP));
+		disp_result(DS_EYESEP, strlen(buf)+1, buf);
 	}
-				/* write out hologram grids */
-	for (i = 0; hdlist[i] != NULL; i++)
-		disp_result(DS_ADDHOLO, sizeof(HDGRID), (char *)hdlist[i]);
+				/* write out hologram grids & octrees */
+	for (i = 0; hdlist[i] != NULL; i++) {
+		memcpy(buf, (void *)hdlist[i], 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();
 }
 
@@ -94,11 +114,11 @@ int	block;
 					/* check read blocking */
 	if (block != (inp_flags == 0)) {
 		inp_flags = block ? 0 : FNONBLK;
-		if (fcntl(dpd[0], F_SETFL, inp_flags) < 0)
+		if (fcntl(dpd.r, F_SETFL, inp_flags) < 0)
 			goto fcntlerr;
 	}
 					/* read message header */
-	n = read(dpd[0], (char *)&msg, sizeof(MSGHEAD));
+	n = read(dpd.r, (char *)&msg, sizeof(MSGHEAD));
 	if (n != sizeof(MSGHEAD)) {
 		if (n >= 0) {
 			dpout = NULL;
@@ -114,9 +134,9 @@ int	block;
 		buf = (char *)malloc(msg.nbytes);
 		if (buf == NULL)
 			error(SYSTEM, "out of memory in disp_check");
-		if (inp_flags != 0 && fcntl(dpd[0], F_SETFL, inp_flags=0) < 0)
+		if (inp_flags != 0 && fcntl(dpd.r, F_SETFL, inp_flags=0) < 0)
 			goto fcntlerr;
-		if (readbuf(dpd[0], buf, msg.nbytes) != msg.nbytes)
+		if (readbuf(dpd.r, buf, msg.nbytes) != msg.nbytes)
 			goto readerr;
 	}
 	switch (msg.type) {		/* take appropriate action */
@@ -195,7 +215,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");
@@ -228,10 +248,12 @@ 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.running ? close_process(&dpd) : 0);
+
 }