--- ray/src/rt/x11twind.c 1991/11/12 17:08:48 2.1
+++ ray/src/rt/x11twind.c 2003/02/22 02:07:29 2.5
@@ -1,9 +1,6 @@
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: x11twind.c,v 2.5 2003/02/22 02:07:29 greg Exp $";
#endif
-
-/* Copyright (c) 1989 Regents of the University of California */
-
/*
* x11twind.c - routines for X11 text windows.
*
@@ -14,15 +11,73 @@ static char SCCSid[] = "$SunId$ LBL";
* 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
+#include
+
#include
#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 +89,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 +109,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 +120,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,6 +143,7 @@ char *fontname;
}
+void
xt_puts(s, t) /* output a string */
register char *s;
TEXTWIND *t;
@@ -109,6 +157,7 @@ TEXTWIND *t;
}
+void
xt_putc(c, t) /* output a character */
char c;
register TEXTWIND *t;
@@ -142,6 +191,7 @@ register TEXTWIND *t;
}
+void
xt_delete(t, r) /* delete a line */
register TEXTWIND *t;
int r;
@@ -169,6 +219,7 @@ int r;
}
+void
xt_insert(t, r) /* insert a line */
register TEXTWIND *t;
int r;
@@ -195,6 +246,7 @@ int r;
}
+void
xt_redraw(t) /* redraw text window */
register TEXTWIND *t;
{
@@ -210,6 +262,7 @@ register TEXTWIND *t;
}
+void
xt_clear(t) /* clear text window */
register TEXTWIND *t;
{
@@ -223,6 +276,7 @@ register TEXTWIND *t;
}
+void
xt_move(t, r, c) /* move to new position */
register TEXTWIND *t;
int r, c;
@@ -253,6 +307,7 @@ register int curs;
}
+void
xt_close(t) /* close text window */
register TEXTWIND *t;
{
@@ -263,12 +318,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;
{