--- ray/src/rt/driver.h	1997/11/11 20:03:00	2.3
+++ ray/src/rt/driver.h	2003/02/22 02:07:28	2.4
@@ -1,27 +1,77 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: driver.h,v 2.4 2003/02/22 02:07:28 greg Exp $ */
 /*
  *  driver.h - header file for interactive device drivers.
+ */
+
+/* ====================================================================
+ * 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/>.
  */
 
 struct driver {				/* driver functions */
-	int  (*close)();			/* close device */
-	int  (*clear)();			/* clear device */
-	int  (*paintr)();			/* paint rectangle */
+	void  (*close)();			/* close device */
+	void  (*clear)();			/* clear device */
+	void  (*paintr)();			/* paint rectangle */
 	int  (*getcur)();			/* get cursor position */
-	int  (*comout)();			/* command line output */
-	int  (*comin)();			/* command line input */
-	int  (*flush)();			/* flush output */
+	void  (*comout)();			/* command line output */
+	void  (*comin)();			/* command line input */
+	void  (*flush)();			/* flush output */
 	double  pixaspect;			/* pixel aspect ratio */
 	int  xsiz, ysiz;			/* device size */
 	int  inpready;				/* input ready on device */
 };
-					/* stream interface */
-extern struct driver  *comm_init(), *slave_init();
 					/* magic numbers for verification */
 #define COM_SENDM		0x6f37
 #define COM_RECVM		0x51da
@@ -119,3 +169,33 @@ extern char  dev_default[];		/* default device name */
  *	when characters are ready on the input.  (Often easiest
  *	to check for input during calls to paintr.)
  */
+
+#ifdef NOPROTO
+
+extern void	editline();
+extern void	tocombuf();
+extern int	fromcombuf();
+extern struct driver	*slave_init();
+extern struct driver	*comm_init();
+extern int	new_ctab();
+extern int	get_pixel();
+extern void	make_gmap();
+extern void	set_cmap();
+extern void	map_color();
+
+#else
+					/* defined in editline.c */
+extern void	editline(char *buf, int (*c_get)(), void (*s_put)());
+extern void	tocombuf(char *b, struct driver *d);
+extern int	fromcombuf(char *b, struct driver *d);
+					/* defined in devcomm.c */
+extern struct driver	*slave_init(char *dname, char *id);
+extern struct driver	*comm_init(char *dname, char *id);
+					/* defined in colortab.c */
+extern int	new_ctab(int ncolors);
+extern int	get_pixel(COLOR col, void (*set_pixel)());
+extern void	make_gmap(double gam);
+extern void	set_cmap(BYTE *rmap, BYTE *gmap, BYTE *bmap);
+extern void	map_color(BYTE rgb[3], COLOR col);
+
+#endif