--- ray/src/px/pcompos.c	1991/05/30 10:33:30	1.8
+++ ray/src/px/pcompos.c	1992/09/21 12:13:57	2.15
@@ -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,15 +12,16 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
 #include  "color.h"
 
+#include  "resolu.h"
 
-#define  MAXFILE	32
+#define	 MAXFILE	64
 
-#define  SIGNHT		24
-#define  setpscom(b,n)	sprintf(b, "psign -h %d '%.30s'|pfilt -1 -x /2 -y /2",\
-				2*SIGNHT, n)
-
 					/* output picture size */
 int  xsiz = 0;
 int  ysiz = 0;
@@ -32,8 +33,13 @@ int  ymax = 0;
 
 COLR  bgcolr = BLKCOLR;			/* background color */
 
+int  labelht = 24;			/* label height */
+
 int  checkthresh = 0;			/* check threshold value */
 
+char  Command[] = "<Command>";
+char  Label[] = "<Label>";
+
 char  *progname;
 
 struct {
@@ -49,9 +55,9 @@ int  nfile;			/* number of files */
 
 int  wrongformat = 0;
 
-char  tmpbuf[128];
+FILE  *popen(), *lblopen();
 
-FILE  *popen();
+extern char  *malloc();
 
 
 tabputs(s)			/* print line preceded by a tab */
@@ -73,21 +79,26 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	double  atof();
 	int  ncolumns = 0;
-	int  dolabels = 0;
-	int  curcol = 0, curx = 0, cury = 0;
+	int  autolabel = 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]),
@@ -98,8 +109,26 @@ 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':
-			dolabels++;
+			switch (argv[an][2]) {
+			case 'a':
+				autolabel++;
+				break;
+			case 'h':
+				labelht = atoi(argv[++an]);
+				break;
+			case '\0':
+				goto dofiles;
+			default:
+				goto userr;
+			}
 			break;
 		case '\0':
 		case 't':
@@ -109,20 +138,9 @@ char  *argv[];
 		}
 dofiles:
 	for (nfile = 0; an < argc; nfile++) {
-		if (dolabels) {
-			if (nfile >= MAXFILE-1) {
-				fprintf(stderr,
-				"%s: only %d files allowed with labels\n",
-					progname, MAXFILE/2);
-				quit(1);
-			}
-		} else {
-			if (nfile >= MAXFILE) {
-				fprintf(stderr, "%s: only %d files allowed\n",
-						progname, MAXFILE);
-				quit(1);
-			}
-		}
+		if (nfile >= MAXFILE)
+			goto toomany;
+		thislabel = NULL;
 		input[nfile].hasmin = input[nfile].hasmax = 0;
 		while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'))
 			switch (argv[an][1]) {
@@ -143,24 +161,36 @@ dofiles:
 				}
 				an += 2;
 				break;
+			case 'l':
+				if (strcmp(argv[an], "-l"))
+					goto userr;
+				thislabel = argv[an+1];
+				an += 2;
+				break;
 			case '\0':
 				if (argv[an][0] == '-')
 					goto getfile;
-			/* fall through */
+				goto userr;
 			default:
 				goto userr;
 			}
 getfile:
 		if (argc-an < (ncolumns ? 1 : 3))
 			goto userr;
+		if (autolabel && thislabel == NULL)
+			thislabel = argv[an];
 		if (!strcmp(argv[an], "-")) {
 			input[nfile].name = "<stdin>";
 			input[nfile].fp = stdin;
 		} else {
-			input[nfile].name = argv[an];
-			if ((input[nfile].fp = argv[an][0] == '!' ?
-					popen(argv[an]+1, "r") :
-					fopen(argv[an], "r")) == NULL) {
+			if (argv[an][0] == '!') {
+				input[nfile].name = Command;
+				input[nfile].fp = popen(argv[an]+1, "r");
+			} else {
+				input[nfile].name = argv[an];
+				input[nfile].fp = fopen(argv[an], "r");
+			}
+			if (input[nfile].fp == NULL) {
 				perror(argv[an]);
 				quit(1);
 			}
@@ -176,20 +206,20 @@ getfile:
 		}
 						/* get picture size */
 		if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
-				input[nfile].fp) != (YMAJOR|YDECR)) {
+				input[nfile].fp) < 0) {
 			fprintf(stderr, "%s: bad picture size\n",
 					input[nfile].name);
 			quit(1);
 		}
 		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++]);
@@ -203,39 +233,49 @@ getfile:
 			xmax = input[nfile].xloc+input[nfile].xres;
 		if (input[nfile].yloc+input[nfile].yres > ymax)
 			ymax = input[nfile].yloc+input[nfile].yres;
-		if (dolabels) {
-			input[++nfile].name = "<Label>";
-			setpscom(tmpbuf, input[nfile-1].name);
-			if ((input[nfile].fp = popen(tmpbuf, "r")) == NULL)
+		if (thislabel != NULL) {
+			if (++nfile >= MAXFILE)
+				goto toomany;
+			input[nfile].name = Label;
+			input[nfile].hasmin = input[nfile].hasmax = 0;
+			input[nfile].xres = input[nfile-1].xres;
+			input[nfile].yres = labelht;
+			if ((input[nfile].fp = lblopen(thislabel,
+					&input[nfile].xres,
+					&input[nfile].yres)) == NULL)
 				goto labelerr;
-			if (checkheader(input[nfile].fp, COLRFMT, NULL) < 0)
-				goto labelerr;
-			if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
-					input[nfile].fp) != (YMAJOR|YDECR))
-				goto labelerr;
 			input[nfile].xloc = input[nfile-1].xloc;
 			input[nfile].yloc = input[nfile-1].yloc +
-					input[nfile-1].yres - SIGNHT;
-			input[nfile].hasmin = input[nfile].hasmax = 0;
+					input[nfile-1].yres-input[nfile].yres;
 		}
 	}
 	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);
-	printf("\n-Y %d +X %d\n", ysiz, xsiz);
+	putchar('\n');
+	fprtresolu(xsiz, ysiz, stdout);
 
 	compos();
 	
 	quit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-x xr][-y yr][-b r g b][-a n][-l] ",
+	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] pic1 x1 y1 ..\n");
+	fprintf(stderr, "[-t min1][+t max1][-l lab] pic1 x1 y1 ..\n");
 	quit(1);
+toomany:
+	fprintf(stderr, "%s: only %d files and labels allowed\n",
+			progname, MAXFILE);
+	quit(1);
 labelerr:
 	fprintf(stderr, "%s: error opening label\n", progname);
 	quit(1);
@@ -317,8 +357,37 @@ register COLR  c1, c2;
 }
 
 
+FILE *
+lblopen(s, xp, yp)		/* open pipe to label generator */
+char  *s;
+int  *xp, *yp;
+{
+	char  com[128];
+	FILE  *fp;
+
+	sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);
+	if ((fp = popen(com, "r")) == NULL)
+		return(NULL);
+	if (checkheader(fp, COLRFMT, NULL) < 0)
+		goto err;
+	if (fgetresolu(xp, yp, fp) < 0)
+		goto err;
+	return(fp);
+err:
+	pclose(fp);
+	return(NULL);
+}
+
+
 quit(code)		/* exit gracefully */
 int  code;
 {
+	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);
 }