--- ray/src/px/pcompos.c	1992/08/10 11:23:13	2.9
+++ ray/src/px/pcompos.c	1993/06/04 14:47:01	2.16
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -12,11 +12,17 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#include  <math.h>
+
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
 #include  "color.h"
 
 #include  "resolu.h"
 
-#define  MAXFILE	64
+#define	 MAXFILE	64
 
 					/* output picture size */
 int  xsiz = 0;
@@ -33,6 +39,9 @@ int  labelht = 24;			/* label height */
 
 int  checkthresh = 0;			/* check threshold value */
 
+char  Command[] = "<Command>";
+char  Label[] = "<Label>";
+
 char  *progname;
 
 struct {
@@ -50,7 +59,9 @@ int  wrongformat = 0;
 
 FILE  *popen(), *lblopen();
 
+extern char  *malloc();
 
+
 tabputs(s)			/* print line preceded by a tab */
 char  *s;
 {
@@ -72,19 +83,24 @@ char  *argv[];
 {
 	int  ncolumns = 0;
 	int  autolabel = 0;
-	int  curcol = 0, curx = 0, cury = 0;
+	int  curcol = 0, x0 = 0, curx = 0, cury = 0, spacing = 0;
 	char  *thislabel;
 	int  an;
-
+#ifdef MSDOS
+	extern int  _fmode;
+	_fmode = O_BINARY;
+	setmode(fileno(stdin), O_BINARY);
+	setmode(fileno(stdout), O_BINARY);
+#endif
 	progname = argv[0];
 
 	for (an = 1; an < argc && argv[an][0] == '-'; an++)
 		switch (argv[an][1]) {
 		case 'x':
-			xmax = xsiz = atoi(argv[++an]);
+			xsiz = atoi(argv[++an]);
 			break;
 		case 'y':
-			ymax = ysiz = atoi(argv[++an]);
+			ysiz = atoi(argv[++an]);
 			break;
 		case 'b':
 			setcolr(bgcolr, atof(argv[an+1]),
@@ -95,6 +111,13 @@ char  *argv[];
 		case 'a':
 			ncolumns = atoi(argv[++an]);
 			break;
+		case 's':
+			spacing = atoi(argv[++an]);
+			break;
+		case 'o':
+			curx = x0 = atoi(argv[++an]);
+			cury = atoi(argv[++an]);
+			break;
 		case 'l':
 			switch (argv[an][2]) {
 			case 'a':
@@ -163,7 +186,7 @@ getfile:
 			input[nfile].fp = stdin;
 		} else {
 			if (argv[an][0] == '!') {
-				input[nfile].name = "<Command>";
+				input[nfile].name = Command;
 				input[nfile].fp = popen(argv[an]+1, "r");
 			} else {
 				input[nfile].name = argv[an];
@@ -192,13 +215,13 @@ getfile:
 		}
 		if (ncolumns > 0) {
 			if (curcol >= ncolumns) {
-				cury = ymax;
-				curx = 0;
+				cury = ymax + spacing;
+				curx = x0;
 				curcol = 0;
 			}
 			input[nfile].xloc = curx;
 			input[nfile].yloc = cury;
-			curx += input[nfile].xres;
+			curx += input[nfile].xres + spacing;
 			curcol++;
 		} else {
 			input[nfile].xloc = atoi(argv[an++]);
@@ -215,7 +238,7 @@ getfile:
 		if (thislabel != NULL) {
 			if (++nfile >= MAXFILE)
 				goto toomany;
-			input[nfile].name = "<Label>";
+			input[nfile].name = Label;
 			input[nfile].hasmin = input[nfile].hasmax = 0;
 			input[nfile].xres = input[nfile-1].xres;
 			input[nfile].yres = labelht;
@@ -230,8 +253,12 @@ getfile:
 	}
 	if (xsiz <= 0)
 		xsiz = xmax;
+	else if (xsiz > xmax)
+		xmax = xsiz;
 	if (ysiz <= 0)
 		ysiz = ymax;
+	else if (ysiz > ymax)
+		ymax = ysiz;
 					/* add new header info. */
 	printargs(argc, argv, stdout);
 	fputformat(COLRFMT, stdout);
@@ -242,7 +269,8 @@ getfile:
 	
 	quit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-x xr][-y yr][-b r g b][-a n][-la][-lh h] ",
+	fprintf(stderr,
+	"Usage: %s [-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
 			progname);
 	fprintf(stderr, "[-t min1][+t max1][-l lab] pic1 x1 y1 ..\n");
 	quit(1);
@@ -356,11 +384,12 @@ err:
 quit(code)		/* exit gracefully */
 int  code;
 {
-	int  status;
-
-	if (code == 0)			/* reap any children */
-		while (wait(&status) != -1)
-			if (code == 0)
-				code = status>>8 & 0xff;
+	register int  i;
+				/* close input files */
+	for (i = 0; i < nfile; i++)
+		if (input[i].name == Command || input[i].name == Label)
+			pclose(input[i].fp);
+		else
+			fclose(input[i].fp);
 	exit(code);
 }