--- ray/src/rt/aed.c	1989/10/03 11:10:02	1.3
+++ ray/src/rt/aed.c	2003/02/22 02:07:28	2.3
@@ -1,13 +1,65 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: aed.c,v 2.3 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  aed.c - driver for AED 512 terminal.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     2/2/87
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
 #include  <stdio.h>
@@ -52,28 +104,26 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  MINPIX		8		/* minimum hardware color */
 
 #define  NCOLS		512		/* maximum # columns for output */
-#define  NROWS		512-COMHT	/* maximum # rows for output */
+#define  NROWS		483-COMHT	/* maximum # rows for output */
 #define  COMHT		16		/* height of command line */
 #define  COMCW		63		/* maximum chars on command line */
 
-int  anewcolr();
-
 int  aed_close(), aed_clear(), aed_paintr(),
 		aed_getcur(), aed_comout(), aed_errout();
 
 static struct driver  aed_driver = {
 	aed_close, aed_clear, aed_paintr, aed_getcur,
-	aed_comout, NULL,
-	NCOLS, NROWS
+	aed_comout, NULL, NULL,
+	1.0, NCOLS, NROWS
 };
 
 
 struct driver *
-aed_init(name)				/* open AED */
-char  *name;
+aed_init(name, id)			/* open AED */
+char  *name, *id;
 {
 	if (ttyset(&aed_driver, fileno(stdin)) < 0) {	/* set tty driver */
-		stderr_v("cannot access terminal\n");
+		eputs("cannot access terminal\n");
 		return(NULL);
 	}
 	command(RST);					/* reset AED */
@@ -88,11 +138,14 @@ char  *name;
 	byte(BLK); byte(WHT); byte(15);
 	command(SCP);
 	byte('+'); byte(0); byte(1);
-	make_cmap(GAMMA);				/* make color map */
-	errvec = aed_errout;				/* set error vector */
-	cmdvec = aed_errout;
-	if (wrnvec != NULL)
-		wrnvec = aed_errout;
+	make_gmap(GAMMA);				/* make color map */
+	erract[USER].pf =				/* set error vector */
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = aed_errout;
+	erract[COMMAND].pf = aed_errout;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = aed_errout;
 	return(&aed_driver);
 }
 
@@ -100,10 +153,13 @@ char  *name;
 static
 aed_close()					/* close AED */
 {
-	errvec = stderr_v;			/* reset error vector */
-	cmdvec = NULL;
-	if (wrnvec != NULL)
-		wrnvec = stderr_v;
+	erract[USER].pf = 			/* reset error vector */
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = eputs;
+	erract[COMMAND].pf = NULL;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = wputs;
 	aedsetcap(0, 0);			/* go to bottom */
 	command(SEC);
 	byte(WHT);				/* white text */
@@ -119,7 +175,7 @@ aed_clear(x, y)					/* clear AED */
 int  x, y;
 {
 	command(FFD);
-	new_ctab(NCOLORS, anewcolr);		/* init color table */
+	new_ctab(NCOLORS);			/* init color table */
 	flush();
 }
 
@@ -129,9 +185,10 @@ aed_paintr(col, xmin, ymin, xmax, ymax)		/* paint a re
 COLOR  col;
 int  xmin, ymin, xmax, ymax;
 {
+	extern int  anewcolr();
 	int  ndx;
 
-	ndx = get_pixel(col);			/* may call anewcolr() */
+	ndx = get_pixel(col, anewcolr);		/* calls anewcolr() */
 	command(SEC);				/* draw rectangle */
 	byte(ndx+MINPIX);
 	aedsetcap(xmin, ymin+COMHT);