--- ray/src/rt/x11twind.c 2003/02/22 02:07:29 2.5
+++ ray/src/rt/x11twind.c 2003/06/30 14:59:13 2.9
@@ -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.9 2003/06/30 14:59:13 schorsch Exp $";
#endif
/*
* x11twind.c - routines for X11 text windows.
@@ -11,75 +11,15 @@ 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
- * .
- */
+#include "copyright.h"
#include
-
#include
-
+#include
#include
#include "x11twind.h"
-#ifndef BSD
-#define bzero(d,n) (void)memset(d,0,n)
-#endif
-
#define checkcurs(t) if ((t)->cursor) togglecurs(t)
#define restorecurs checkcurs
@@ -144,24 +84,12 @@ 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;
{
+ char ch[2];
+
checkcurs(t);
switch (c) {
case '\n':
@@ -182,8 +110,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;
}
@@ -192,6 +121,20 @@ 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;
@@ -214,7 +157,7 @@ int r;
XClearArea(t->dpy, t->w, LEFTMAR, (t->nr-1)*Height(t->f),
t->nc*Width(t->f), Height(t->f),(Bool) 0);
- bzero(cp, t->nc);
+ memset(cp, '\0', t->nc);
restorecurs(t); /* should we reposition cursor? */
}
@@ -241,7 +184,7 @@ int r;
/* clear new line */
XClearArea(t->dpy, t->w, LEFTMAR, r*Height(t->f),
t->nc*Width(t->f), Height(t->f), (Bool) 0);
- bzero(cp, t->nc);
+ memset(cp, '\0', t->nc);
restorecurs(t); /* should we reposition cursor? */
}
@@ -270,7 +213,7 @@ register TEXTWIND *t;
XClearWindow(t->dpy, t->w);
for (i = 0; i < t->nr; i++)
- bzero(t->lp[i], t->nc);
+ memset(t->lp[i], '\0', t->nc);
t->r = t->c = 0;
restorecurs(t);
}