--- ray/src/px/pcompos.c	1992/06/16 16:48:41	2.5
+++ ray/src/px/pcompos.c	1993/12/29 09:48:12	2.17
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1993 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -12,12 +12,21 @@ 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	32
+#define	 MAXFILE	64
 
+#define  HASMIN		1
+#define  HASMAX		2
+
 					/* output picture size */
 int  xsiz = 0;
 int  ysiz = 0;
@@ -33,6 +42,9 @@ int  labelht = 24;			/* label height */
 
 int  checkthresh = 0;			/* check threshold value */
 
+char  Command[] = "<Command>";
+char  Label[] = "<Label>";
+
 char  *progname;
 
 struct {
@@ -40,7 +52,7 @@ struct {
 	FILE  *fp;			/* stream pointer */
 	int  xres, yres;		/* picture size */
 	int  xloc, yloc;		/* anchor point */
-	int  hasmin, hasmax;		/* has threshold values */
+	int  flags;			/* HASMIN, HASMAX */
 	COLR  thmin, thmax;		/* thresholds */
 } input[MAXFILE];		/* our input files */
 
@@ -50,7 +62,9 @@ int  wrongformat = 0;
 
 FILE  *popen(), *lblopen();
 
+extern char  *malloc();
 
+
 tabputs(s)			/* print line preceded by a tab */
 char  *s;
 {
@@ -72,19 +86,25 @@ 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;
+	int  xsgn, ysgn;
 	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 +115,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':
@@ -119,36 +146,45 @@ dofiles:
 	for (nfile = 0; an < argc; nfile++) {
 		if (nfile >= MAXFILE)
 			goto toomany;
-		if (autolabel)
-			thislabel = argv[an];
-		else
-			thislabel = NULL;
-		input[nfile].hasmin = input[nfile].hasmax = 0;
-		while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'))
+		thislabel = NULL;
+		input[nfile].flags = 0;
+		xsgn = ysgn = '-';
+		while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'
+				|| argv[an][0] == '=')) {
 			switch (argv[an][1]) {
 			case 't':
 				checkthresh = 1;
 				if (argv[an][0] == '-') {
-					input[nfile].hasmin = 1;
+					input[nfile].flags |= HASMIN;
 					setcolr(input[nfile].thmin,
 							atof(argv[an+1]),
 							atof(argv[an+1]),
 							atof(argv[an+1]));
-				} else {
-					input[nfile].hasmax = 1;
+				} else if (argv[an][0] == '+') {
+					input[nfile].flags |= HASMAX;
 					setcolr(input[nfile].thmax,
 							atof(argv[an+1]),
 							atof(argv[an+1]),
 							atof(argv[an+1]));
-				}
-				an += 2;
+				} else
+					goto userr;
+				an++;
 				break;
 			case 'l':
 				if (strcmp(argv[an], "-l"))
 					goto userr;
-				thislabel = argv[an+1];
-				an += 2;
+				thislabel = argv[++an];
 				break;
+			case '+':
+			case '-':
+			case '0':
+				if (argv[an][0] != '=')
+					goto userr;
+				xsgn = argv[an][1];
+				ysgn = argv[an][2];
+				if (ysgn != '+' && ysgn != '-' && ysgn != '0')
+					goto userr;
+				break;
 			case '\0':
 				if (argv[an][0] == '-')
 					goto getfile;
@@ -156,15 +192,19 @@ dofiles:
 			default:
 				goto userr;
 			}
+			an++;
+		}
 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 {
 			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];
@@ -193,17 +233,25 @@ 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++]);
+			if (xsgn == '+')
+				input[nfile].xloc -= input[nfile].xres;
+			else if (xsgn == '0')
+				input[nfile].xloc -= input[nfile].xres/2;
 			input[nfile].yloc = atoi(argv[an++]);
+			if (ysgn == '+')
+				input[nfile].yloc -= input[nfile].yres;
+			else if (ysgn == '0')
+				input[nfile].yloc -= input[nfile].yres/2;
 		}
 		if (input[nfile].xloc < xmin)
 			xmin = input[nfile].xloc;
@@ -216,8 +264,10 @@ getfile:
 		if (thislabel != NULL) {
 			if (++nfile >= MAXFILE)
 				goto toomany;
-			input[nfile].name = "<Label>";
-			input[nfile].hasmin = input[nfile].hasmax = 0;
+			input[nfile].name = Label;
+			input[nfile].flags = 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)
@@ -229,8 +279,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);
@@ -241,9 +295,10 @@ 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");
+	fprintf(stderr, "[-t min1][+t max1][-l lab][=SS] pic1 x1 y1 ..\n");
 	quit(1);
 toomany:
 	fprintf(stderr, "%s: only %d files and labels allowed\n",
@@ -292,10 +347,10 @@ compos()				/* composite pictures */
 				if (x > xsiz)
 					x = xsiz;
 				for (x--; x >= 0 && x >= input[i].xloc; x--) {
-					if (input[i].hasmin &&
+					if (input[i].flags & HASMIN &&
 					cmpcolr(scanin[x], input[i].thmin) <= 0)
 						continue;
-					if (input[i].hasmax &&
+					if (input[i].flags & HASMAX &&
 					cmpcolr(scanin[x], input[i].thmax) >= 0)
 						continue;
 					copycolr(scanout[x], scanin[x]);
@@ -338,7 +393,7 @@ int  *xp, *yp;
 	char  com[128];
 	FILE  *fp;
 
-	sprintf(com, "psign -s -.2 -h %d '%.30s'", labelht, s);
+	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)
@@ -355,5 +410,12 @@ err:
 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);
 }