--- ray/src/rt/vga.c	1992/09/22 11:42:17	2.1
+++ ray/src/rt/vga.c	2004/03/30 16:13:01	2.10
@@ -1,86 +1,133 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: vga.c,v 2.10 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  *  vga.c - driver for VGA graphics adaptor under MS-DOS
  */
 
-#include  <stdio.h>
+#include "copyright.h"
 
 #include  <graph.h>
 
+#include  "standard.h"
 #include  "driver.h"
-
 #include  "color.h"
 
 #define	 GAMMA		2.2		/* exponent for color correction */
 
 
-int  vga_close(), vga_clear(), vga_paintr(), vga_comout(), vga_comin();
+static struct driver * vga_init(char *name, char *id);
+static void vga_errout(char *msg);
+static dr_newcolrf_t vgacolr;
 
+static dr_closef_t vga_close;
+static dr_clearf_t vga_clear;
+static dr_paintrf_t vga_paintr;
+static dr_comoutf_t vga_comout;
+static dr_cominf_t vga_comin;
+
 static struct driver  vga_driver = {
 	vga_close, vga_clear, vga_paintr, NULL,
-	vga_comout, vga_comin, NULL
+	vga_comout, vga_comin, NULL, 1.0
 };
 
+static char  fatalerr[128];
 static struct videoconfig  config;
 
 
-struct driver *
-vga_init(name, id)			/* open VGA */
-char  *name, *id;
+
+static struct driver *
+vga_init(			/* open VGA */
+	char  *name,
+	char  *id
+)
 {
-	if (_setvideomode(_MRES256COLOR) == 0)
+	static short  mode_pref[] = {_MRES256COLOR, -1};
+	static short  smode_pref[] = {_XRES256COLOR, _SVRES256COLOR,
+					_VRES256COLOR, _MRES256COLOR, -1};
+	char  *ep;
+	register short	*mp;
+
+	mp = !strcmp(name, "vga") ? mode_pref : smode_pref;
+	for ( ; *mp != -1; mp++)
+		if (_setvideomode(*mp))
+			break;
+	if (*mp == -1) {
+		_setvideomode(_DEFAULTMODE);
+		eputs(name);
+		eputs(": card not present or insufficient VGA memory\n");
 		return(NULL);
+	}
 	_getvideoconfig(&config);
 	_settextwindow(config.numtextrows-2, 1,
 			config.numtextrows, config.numtextcols);
 	vga_driver.xsiz = config.numxpixels;
-	vga_driver.ysiz = config.numypixels*(config.numtextrows-3)
+	vga_driver.ysiz = (long)config.numypixels*(config.numtextrows-3)
 				/config.numtextrows;
-	vga_driver.pixaspect = .75*config.numxpixels/config.numypixels;
+	switch (config.mode) {			/* correct problems */
+	case _XRES256COLOR:
+		vga_driver.ysiz -= 16;
+		break;
+	case _MRES256COLOR:
+		vga_driver.pixaspect = 1.2;
+		break;
+	}
 	_setviewport(0, 0, vga_driver.xsiz, vga_driver.ysiz);
-	make_gmap(GAMMA);				/* make color map */
-	_remappalette(1, 0x303030L);
+	if ((ep = getenv("GAMMA")) != NULL)	/* make gamma map */
+		make_gmap(atof(ep));
+	else
+		make_gmap(GAMMA);
+	_remappalette(1, _BRIGHTWHITE);
 	_settextcolor(1);
-	errvec = vga_comout;
-	cmdvec = vga_comout;
-	if (wrnvec != NULL)
-		wrnvec = vga_comout;
+	ms_gcinit(&vga_driver);
+	erract[USER].pf =
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = vga_errout;
+	erract[COMMAND].pf = vga_comout;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = vga_comout;
 	return(&vga_driver);
 }
 
 
-static
-vga_close()					/* close VGA */
+static void
+vga_close(void)					/* close VGA */
 {
-	errvec = stderr_v;			/* reset error vector */
-	cmdvec = NULL;
-	if (wrnvec != NULL)
-		wrnvec = stderr_v;
+	ms_gcdone(&vga_driver);
 	_setvideomode(_DEFAULTMODE);
+	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;
+	if (fatalerr[0])
+		eputs(fatalerr);		/* repeat error message */
 }
 
 
-static
-vga_clear(x, y)					/* clear VGA */
-int  x, y;
+static void
+vga_clear(					/* clear VGA */
+	int  x,
+	int  y
+)
 {
 	_clearscreen(_GCLEARSCREEN);
 	new_ctab(config.numcolors-2);		/* init color table */
 }
 
 
-static
-vga_paintr(col, xmin, ymin, xmax, ymax)		/* paint a rectangle */
-COLOR  col;
-int  xmin, ymin, xmax, ymax;
+static void
+vga_paintr(		/* paint a rectangle */
+	COLOR  col,
+	int  xmin,
+	int  ymin,
+	int  xmax,
+	int  ymax
+)
 {
-	extern int  vgacolr();
-
 	_setcolor(get_pixel(col, vgacolr)+2);
 	_rectangle(_GFILLINTERIOR, xmin, vga_driver.ysiz-ymax,
 			xmax-1, vga_driver.ysiz-1-ymin);
@@ -88,9 +135,10 @@ int  xmin, ymin, xmax, ymax;
 }
 
 
-static
-vga_comout(s)				/* put s to text output */
-register char  *s;
+static void
+vga_comout(				/* put s to text output */
+	register char  *s
+)
 {
 	struct rccoord	tpos;
 	char  buf[128];
@@ -108,7 +156,7 @@ register char  *s;
 			if (*s == '\0')
 				break;
 			tpos = _gettextposition();
-			_settextposition(tpos.row, *s=='\r' ? 0 : tpos.col-1);
+			_settextposition(tpos.row, *s=='\r' ? 1 : tpos.col-1);
 			continue;
 		default:
 			*cp++ = *s;
@@ -116,14 +164,32 @@ register char  *s;
 		}
 		return(0);
 	}
+	fatalerr[0] = '\0';
 }
 
 
-static
-vga_comin(buf, prompt)			/* get input line from console */
-char  *buf;
-char  *prompt;
+static void
+vga_errout(
+	register char  *msg
+)
 {
+	static char  *fep = fatalerr;
+
+	_outtext(msg);
+	while (*msg)
+		*fep++ = *msg++;
+	*fep = '\0';
+	if (fep > fatalerr && fep[-1] == '\n')
+		fep = fatalerr;
+}
+
+
+static void
+vga_comin(			/* get input line from console */
+	char  *buf,
+	char  *prompt
+)
+{
 	extern int  getch();
 
 	if (prompt != NULL)
@@ -133,10 +199,13 @@ char  *prompt;
 }
 
 
-static
-vgacolr(index, r, g, b)		       /* enter a color into our table */
-int  index;
-int  r, g, b;
+static void
+vgacolr(		       /* enter a color into our table */
+	int  index,
+	int  r,
+	int  g,
+	int  b
+)
 {
 	register long  cl;