--- ray/src/rt/driver.h	1990/03/09 14:00:03	1.8
+++ ray/src/rt/driver.h	2003/08/20 10:00:09	2.8
@@ -1,30 +1,28 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: driver.h,v 2.8 2003/08/20 10:00:09 schorsch Exp $ */
 /*
  *  driver.h - header file for interactive device drivers.
- *
- *     2/2/87
  */
+#ifndef _RAD_DRIVER_H_
+#define _RAD_DRIVER_H_
 
+#include "color.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct driver {				/* driver functions */
-	int  (*close)();			/* close device */
-	int  (*clear)();			/* clear device */
-	int  (*paintr)();			/* paint rectangle */
-	int  (*getcur)();			/* get cursor position */
-	int  (*comout)();			/* command line output */
-	int  (*comin)();			/* command line input */
-	int  (*flush)();			/* flush output */
+	void  (*close)(void);			/* close device */
+	void  (*clear)(int, int);			/* clear device */
+	void  (*paintr)(COLOR  col, int  xmin, int ymin, int xmax, int ymax);			/* paint rectangle */
+	int  (*getcur)(int*,int*);			/* get cursor position */
+	void  (*comout)(char*);			/* 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 */
 };
-
-extern int  stderr_v();			/* error vectors */
-extern int  (*wrnvec)(), (*errvec)(), (*cmdvec)();
-
-extern struct driver  *comm_init();	/* stream interface */
 					/* magic numbers for verification */
 #define COM_SENDM		0x6f37
 #define COM_RECVM		0x51da
@@ -60,9 +58,8 @@ extern char  dev_default[];		/* default device name */
  *	The name string identifies the driver,
  *	and the id string identifies the client.
  *	A device can be open by at most one client.
- *	Be verbose in error reports; call stderr_v().
- *	If device has its own error output, set errvec,
- *	cmdvec and wrnvec.
+ *	Be verbose in error reports; call eputs().
+ *	If device has its own error output, set erract.
  *  }
  *  (*dev->close)()
  *  {
@@ -123,3 +120,24 @@ extern char  dev_default[];		/* default device name */
  *	when characters are ready on the input.  (Often easiest
  *	to check for input during calls to paintr.)
  */
+
+					/* 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);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_DRIVER_H_ */
+