--- ray/src/rt/x11twind.c	2003/02/22 02:07:29	2.5
+++ ray/src/rt/x11twind.c	2003/04/11 16:01:26	2.7
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: x11twind.c,v 2.5 2003/02/22 02:07:29 greg Exp $";
+static const char	RCSid[] = "$Id: x11twind.c,v 2.7 2003/04/11 16:01:26 greg Exp $";
 #endif
 /*
  *  x11twind.c - routines for X11 text windows.
@@ -11,62 +11,7 @@ static const char	RCSid[] = "$Id: x11twind.c,v 2.5 200
  *	9/26/88
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * 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 "copyright.h"
 
 #include  <stdio.h>
 
@@ -144,22 +89,8 @@ char  *fontname;
 
 
 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_putc(c, t)				/* output a character */
-char  c;
+int  c;
 register TEXTWIND  *t;
 {
 	checkcurs(t);
@@ -188,6 +119,20 @@ register TEXTWIND  *t;
 		break;
 	}
 	restorecurs(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);
 }