--- ray/src/rt/x11twind.c	1991/11/12 17:08:48	2.1
+++ ray/src/rt/x11twind.c	2003/04/11 19:32:00	2.8
@@ -1,9 +1,6 @@
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: x11twind.c,v 2.8 2003/04/11 19:32:00 greg Exp $";
 #endif
-
-/* Copyright (c) 1989 Regents of the University of California */
-
 /*
  *  x11twind.c - routines for X11 text windows.
  *
@@ -14,15 +11,18 @@ static char SCCSid[] = "$SunId$ LBL";
  *	9/26/88
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
 
+#include  <stdlib.h>
+
 #include  <X11/Xlib.h>
 
 #include  "x11twind.h"
 
 #ifndef  BSD
 #define  bzero(d,n)		(void)memset(d,0,n)
-extern char  *memset();
 #endif
 
 #define checkcurs(t)		if ((t)->cursor) togglecurs(t)
@@ -34,18 +34,18 @@ extern char  *memset();
 #define	Height(f)		((f)->ascent + (f)->descent)
 #define YStart(f)		((f)->ascent)
 
-extern	char  *calloc(), *malloc();
+static void  togglecurs();
 
 
 TEXTWIND *
-xt_open(dpy, gc, parent, x, y, width, height, bw, fontname)
-Display *dpy;
-GC gc;
-Window parent;
-int x, y;
-int width, height;
-int bw;
-char *fontname;
+xt_open(dpy, parent, x, y, width, height, bw, fore, back, fontname)
+Display  *dpy;
+Window  parent;
+int  x, y;
+int  width, height;
+int  bw;
+unsigned long  fore, back;
+char  *fontname;
 {
 	register int  i;
 	register TEXTWIND  *t;
@@ -54,14 +54,8 @@ char *fontname;
 		return(NULL);
 
 	t->dpy = dpy;
-	t->w = XCreateSimpleWindow(dpy, parent, x, y, width, height, bw,
-					BlackPixel(dpy,DefaultScreen(dpy)),
-					WhitePixel(dpy,DefaultScreen(dpy)));
-	/*
-	t->w = XCreateWindow(dpy, parent, x, y, width, height, bw, 0,
-				CopyFromParent, CopyFromParent, 0, 0);
-	*/
-
+	t->w = XCreateSimpleWindow(dpy, parent, x, y, width, height,
+					bw, fore, back);
 	if (t->w == 0)
 		return(NULL);
 	XMapWindow(dpy, t->w);
@@ -71,12 +65,10 @@ char *fontname;
 
 	/* if (!t->f.fixedwidth)   check for fixedwidth later 
 		return(NULL); */
-	t->gc = XCreateGC(dpy,t->w,0,NULL);
 
-	XCopyGC(dpy, gc, ~0L, t->gc);
-
+	t->gc = XCreateGC(dpy,t->w,0,NULL);
+	XSetState(dpy, t->gc, fore, back, GXcopy, AllPlanes);
 	XSetFont(dpy, t->gc, t->f->fid);
-	XSetFunction(dpy, t->gc, GXcopy);
 
 	t->nc = (width - LEFTMAR) / 
 		Width(t->f);		/* number of columns */
@@ -96,23 +88,13 @@ char *fontname;
 }
 
 
-xt_puts(s, t)				/* output a string */
-register char  *s;
-TEXTWIND  *t;
-{
-	int	oldcurs;
-
-	oldcurs = xt_cursor(t, TNOCURS);	/* for efficiency */
-	while (*s)
-		xt_putc(*s++, t);
-	xt_cursor(t, oldcurs);
-}
-
-
+void
 xt_putc(c, t)				/* output a character */
-char  c;
+int  c;
 register TEXTWIND  *t;
 {
+	char	ch[2];
+
 	checkcurs(t);
 	switch (c) {
 	case '\n':
@@ -133,8 +115,9 @@ register TEXTWIND  *t;
 	default:
 		if (t->c >= t->nc)
 			xt_putc('\n', t);
+		ch[0] = c; ch[1] = '\0';
 		XDrawImageString(t->dpy, t->w, t->gc, LEFTMAR+t->c*Width(t->f), 
-			YStart(t->f)+t->r*Height(t->f), &c, 1);
+			YStart(t->f)+t->r*Height(t->f), ch, 1);
 		t->lp[t->r][t->c++] = c;
 		break;
 	}
@@ -142,6 +125,21 @@ register TEXTWIND  *t;
 }
 
 
+void
+xt_puts(s, t)				/* output a string */
+register char  *s;
+TEXTWIND  *t;
+{
+	int	oldcurs;
+
+	oldcurs = xt_cursor(t, TNOCURS);	/* for efficiency */
+	while (*s)
+		xt_putc(*s++, t);
+	xt_cursor(t, oldcurs);
+}
+
+
+void
 xt_delete(t, r)				/* delete a line */
 register TEXTWIND  *t;
 int  r;
@@ -169,6 +167,7 @@ int  r;
 }
 
 
+void
 xt_insert(t, r)				/* insert a line */
 register TEXTWIND  *t;
 int  r;
@@ -195,6 +194,7 @@ int  r;
 }
 
 
+void
 xt_redraw(t)				/* redraw text window */
 register TEXTWIND  *t;
 {
@@ -210,6 +210,7 @@ register TEXTWIND  *t;
 }
 
 
+void
 xt_clear(t)				/* clear text window */
 register TEXTWIND  *t;
 {
@@ -223,6 +224,7 @@ register TEXTWIND  *t;
 }
 
 
+void
 xt_move(t, r, c)			/* move to new position */
 register TEXTWIND  *t;
 int  r, c;
@@ -253,6 +255,7 @@ register int  curs;
 }
 
 
+void
 xt_close(t)				/* close text window */
 register TEXTWIND  *t;
 {
@@ -263,12 +266,12 @@ register TEXTWIND  *t;
 	XDestroyWindow(t->dpy, t->w);
 	for (i = 0; i < t->nr; i++)
 		free(t->lp[i]);
-	free((char *)t->lp);
-	free((char *)t);
+	free((void *)t->lp);
+	free((void *)t);
 }
 
 
-static
+static void
 togglecurs(t)
 register TEXTWIND  *t;
 {