--- ray/src/rt/x11.c 1990/02/22 10:22:01 1.4 +++ ray/src/rt/x11.c 2003/02/22 02:07:29 2.29 @@ -1,18 +1,77 @@ #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: x11.c,v 2.29 2003/02/22 02:07:29 greg Exp $"; #endif - -/* Copyright (c) 1989 Regents of the University of California */ - /* - * x11.c - driver for X-windows version 11.3 + * x11.c - driver for X-windows version 11 + */ + +/* ==================================================================== + * The Radiance Software License, Version 1.0 * - * Jan 1990 + * 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 "standard.h" #include +#ifdef sparc +#include +#include +#include +#endif +#if !defined(FNDELAY) && defined(O_NONBLOCK) +#define FNDELAY O_NONBLOCK +#endif #include #include @@ -21,11 +80,12 @@ static char SCCSid[] = "$SunId$ LBL"; #include "color.h" #include "driver.h" #include "x11twind.h" +#include "x11icon.h" -#define GAMMA 2.2 /* exponent for color correction */ +#define GAMMA 2.2 /* default exponent correction */ -#define MINWIDTH (4*COMCW) /* minimum graphics window width */ -#define MINHEIGHT 16 /* minimum graphics window height */ +#define MINWIDTH (32*COMCW) /* minimum graphics window width */ +#define MINHEIGHT (MINWIDTH/2) /* minimum graphics window height */ #define BORWIDTH 5 /* border width */ #define COMHEIGHT (COMLH*COMCH) /* command line height (pixels) */ @@ -35,32 +95,29 @@ static char SCCSid[] = "$SunId$ LBL"; #define COMCW 8 /* approx. character width (pixels) */ #define COMCH 14 /* approx. character height (pixels) */ -#ifndef WFLUSH -#define WFLUSH 30 /* flush after this many rays */ -#endif - #define ourscreen DefaultScreen(ourdisplay) #define ourroot RootWindow(ourdisplay,ourscreen) -#define ourwhite WhitePixel(ourdisplay,ourscreen) -#define ourblack BlackPixel(ourdisplay,ourscreen) -#define checkinp() while (XPending(ourdisplay) > 0) getevent() - #define levptr(etype) ((etype *)¤tevent) static XEvent currentevent; /* current event */ static int ncolors = 0; /* color table size */ -static int *pixval = NULL; /* allocated pixels */ +static int mapped = 0; /* window is mapped? */ +static unsigned long *pixval = NULL; /* allocated pixels */ +static unsigned long ourblack=0, ourwhite=1; static Display *ourdisplay = NULL; /* our display */ +static XVisualInfo ourvinfo; /* our visual information */ + static Window gwind = 0; /* our graphics window */ static Cursor pickcursor = 0; /* cursor used for picking */ static int gwidth, gheight; /* graphics window size */ +static int comheight; /* desired comline height */ static TEXTWIND *comline = NULL; /* our command line */ static char c_queue[64]; /* input queue */ @@ -69,188 +126,341 @@ static int c_last = 0; /* last character in queue * static GC ourgc = 0; /* our graphics context for drawing */ -static Colormap ourmap; /* our color map */ +static Colormap ourmap = 0; /* our color map */ -extern char *malloc(); +#define IC_X11 0 +#define IC_IOCTL 1 +#define IC_READ 2 -int x11_close(), x11_clear(), x11_paintr(), x11_errout(), - x11_getcur(), x11_comout(), x11_comin(); +static int inpcheck; /* whence to check input */ +static int x11_getcur(); + +static void x11_close(), x11_clear(), x11_paintr(), x11_errout(), + x11_comout(), x11_comin(), x11_flush(); + +static void std_comin(), std_comout(); + static struct driver x11_driver = { x11_close, x11_clear, x11_paintr, x11_getcur, - x11_comout, x11_comin, 1.0 + NULL, NULL, x11_flush, 1.0 }; +static int getpixels(), x11_getc(); +static void xnewcolr(), freepixels(), resizewindow(), + getevent(), getkey(), fixwindow(); +static unsigned long true_pixel(); + struct driver * x11_init(name, id) /* initialize driver */ char *name, *id; { + char *gv; + int nplanes; + XSetWindowAttributes ourwinattr; XWMHints ourxwmhints; - Pixmap bmCursorSrc, bmCursorMsk; - + XSizeHints oursizhints; + /* open display server */ ourdisplay = XOpenDisplay(NULL); if (ourdisplay == NULL) { - stderr_v("cannot open X-windows; DISPLAY variable set?\n"); + eputs("cannot open X-windows; DISPLAY variable set?\n"); return(NULL); } - if (DisplayPlanes(ourdisplay, ourscreen) < 4) { - stderr_v("not enough colors\n"); - return(NULL); + /* find a usable visual */ + nplanes = DisplayPlanes(ourdisplay, ourscreen); + if (XMatchVisualInfo(ourdisplay,ourscreen, + nplanes>12?nplanes:24,TrueColor,&ourvinfo) || + XMatchVisualInfo(ourdisplay,ourscreen, + nplanes>12?nplanes:24,DirectColor,&ourvinfo)) { + ourblack = 0; + ourwhite = ourvinfo.red_mask | + ourvinfo.green_mask | + ourvinfo.blue_mask ; + } else { + if (nplanes < 4) { + eputs("not enough colors\n"); + return(NULL); + } + if (!XMatchVisualInfo(ourdisplay,ourscreen, + nplanes,PseudoColor,&ourvinfo) && + !XMatchVisualInfo(ourdisplay,ourscreen, + nplanes,GrayScale,&ourvinfo)) { + eputs("unsupported visual type\n"); + return(NULL); + } + ourblack = BlackPixel(ourdisplay,ourscreen); + ourwhite = WhitePixel(ourdisplay,ourscreen); } - ourmap = DefaultColormap(ourdisplay,ourscreen); - make_gmap(GAMMA); /* make color map */ - /* create a cursor */ - pickcursor = XCreateFontCursor (ourdisplay, XC_diamond_cross); - /* open window */ - gwind = XCreateSimpleWindow(ourdisplay, ourroot, 0, 0, + /* set gamma */ + if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL + || (gv = getenv("DISPLAY_GAMMA")) != NULL) + make_gmap(atof(gv)); + else + make_gmap(GAMMA); + /* X11 command line or no? */ + if (!strcmp(name, "x11")) + comheight = COMHEIGHT; + else /* "x11d" */ { + comheight = 0; +#ifndef FNDELAY + eputs("warning: x11d driver not fully functional on this machine\n"); +#endif + } + /* open window */ + ourwinattr.background_pixel = ourblack; + ourwinattr.border_pixel = ourblack; + /* this is stupid */ + ourwinattr.colormap = XCreateColormap(ourdisplay, ourroot, + ourvinfo.visual, AllocNone); + gwind = XCreateWindow(ourdisplay, ourroot, 0, 0, DisplayWidth(ourdisplay,ourscreen)-2*BORWIDTH, DisplayHeight(ourdisplay,ourscreen)-2*BORWIDTH, - BORWIDTH, ourblack, ourwhite); + BORWIDTH, ourvinfo.depth, InputOutput, ourvinfo.visual, + CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); if (gwind == 0) { - stderr_v("cannot create window\n"); + eputs("cannot create window\n"); return(NULL); } - XStoreName(ourdisplay, gwind, id); + XStoreName(ourdisplay, gwind, id); + /* create a cursor */ + pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross); ourgc = XCreateGC(ourdisplay, gwind, 0, NULL); - ourxwmhints.flags = InputHint; + ourxwmhints.flags = InputHint|IconPixmapHint; ourxwmhints.input = True; + ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, + gwind, x11icon_bits, x11icon_width, x11icon_height); XSetWMHints(ourdisplay, gwind, &ourxwmhints); + oursizhints.min_width = MINWIDTH; + oursizhints.min_height = MINHEIGHT+comheight; + oursizhints.flags = PMinSize; + XSetNormalHints(ourdisplay, gwind, &oursizhints); XSelectInput(ourdisplay, gwind, ExposureMask); XMapWindow(ourdisplay, gwind); - XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XExposeEvent)); + XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XEvent)); gwidth = levptr(XExposeEvent)->width; - gheight = levptr(XExposeEvent)->height - COMHEIGHT; + gheight = levptr(XExposeEvent)->height - comheight; x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight; x11_driver.inpready = 0; - cmdvec = x11_comout; /* set error vectors */ - if (wrnvec != NULL) - wrnvec = x11_errout; + mapped = 1; + /* set i/o vectors */ + if (comheight) { + x11_driver.comin = x11_comin; + x11_driver.comout = x11_comout; + erract[COMMAND].pf = x11_comout; + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = x11_errout; + inpcheck = IC_X11; + } else { + x11_driver.comin = std_comin; + x11_driver.comout = std_comout; + erract[COMMAND].pf = std_comout; + inpcheck = IC_IOCTL; + } return(&x11_driver); } -static +static void x11_close() /* close our display */ { - cmdvec = NULL; /* reset error vectors */ - if (wrnvec != NULL) - wrnvec = stderr_v; + erract[COMMAND].pf = NULL; /* reset error vectors */ + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = wputs; if (ourdisplay == NULL) return; if (comline != NULL) { xt_close(comline); comline = NULL; } - if (gwind != 0) { - XFreeGC(ourdisplay, ourgc); - XDestroyWindow(ourdisplay, gwind); - gwind = 0; - ourgc = 0; - } - XFreeCursor(ourdisplay, pickcursor); freepixels(); + XFreeGC(ourdisplay, ourgc); + XDestroyWindow(ourdisplay, gwind); + gwind = 0; + ourgc = 0; + XFreeCursor(ourdisplay, pickcursor); XCloseDisplay(ourdisplay); ourdisplay = NULL; } -static +static void x11_clear(xres, yres) /* clear our display */ int xres, yres; { - if (xres != gwidth || yres != gheight) { /* change window */ - if (comline != NULL) - xt_close(comline); + /* check limits */ + if (xres < MINWIDTH) + xres = MINWIDTH; + if (yres < MINHEIGHT) + yres = MINHEIGHT; + /* resize window */ + if (xres != gwidth || yres != gheight) { XSelectInput(ourdisplay, gwind, 0); - XResizeWindow(ourdisplay, gwind, xres, yres+COMHEIGHT); - comline = xt_open(ourdisplay, - DefaultGC(ourdisplay,ourscreen), - gwind, 0, yres, xres, COMHEIGHT, 0, COMFN); - if (comline == NULL) { - stderr_v("Cannot open command line window\n"); - quit(1); - } - XSelectInput(ourdisplay, comline->w, ExposureMask); + XResizeWindow(ourdisplay, gwind, xres, yres+comheight); gwidth = xres; gheight = yres; - XSync(ourdisplay, 1); /* discard input */ + XFlush(ourdisplay); sleep(2); /* wait for window manager */ + XSync(ourdisplay, 1); /* discard input */ } XClearWindow(ourdisplay, gwind); /* reinitialize color table */ - if (getpixels() == 0) - stderr_v("cannot allocate colors\n"); - else - new_ctab(ncolors); - - XSelectInput(ourdisplay, gwind, + if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale) + if (getpixels() == 0) + eputs("cannot allocate colors\n"); + else + new_ctab(ncolors); + /* get new command line */ + if (comline != NULL) + xt_close(comline); + if (comheight) { + comline = xt_open(ourdisplay, gwind, 0, gheight, gwidth, + comheight, 0, ourblack, ourwhite, COMFN); + if (comline == NULL) { + eputs("cannot open command line window\n"); + quit(1); + } + XSelectInput(ourdisplay, comline->w, ExposureMask); + /* remove earmuffs */ + XSelectInput(ourdisplay, gwind, StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask); + } else /* remove earmuffs */ + XSelectInput(ourdisplay, gwind, + StructureNotifyMask|ExposureMask|ButtonPressMask); } -static +static void x11_paintr(col, xmin, ymin, xmax, ymax) /* fill a rectangle */ COLOR col; int xmin, ymin, xmax, ymax; { - extern long nrays; /* global ray count */ - extern int xnewcolr(); /* pixel assignment routine */ - static long lastflush = 0; /* ray count at last flush */ + unsigned long pixel; - if (ncolors > 0) { - XSetForeground(ourdisplay, ourgc, - pixval[get_pixel(col, xnewcolr)]); - XFillRectangle(ourdisplay, gwind, - ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); + if (!mapped) + return; + if (ncolors > 0) + pixel = pixval[get_pixel(col, xnewcolr)]; + else + pixel = true_pixel(col); + XSetForeground(ourdisplay, ourgc, pixel); + XFillRectangle(ourdisplay, gwind, + ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); +} + + +static void +x11_flush() /* flush output */ +{ + char buf[256]; + int n; + /* check for input */ + XNoOp(ourdisplay); + n = XPending(ourdisplay); /* from X server */ + while (n-- > 0) + getevent(); +#ifdef FNDELAY + if (inpcheck == IC_IOCTL) { /* from stdin */ +#ifdef FIONREAD + if (ioctl(fileno(stdin), FIONREAD, &n) < 0) { +#else + if (1) { +#endif + if (fcntl(fileno(stdin), F_SETFL, FNDELAY) < 0) { + eputs("cannot change input mode\n"); + quit(1); + } + inpcheck = IC_READ; + } else + x11_driver.inpready += n; } - if (nrays - lastflush >= WFLUSH) { - if (ncolors <= 0) /* output necessary for death */ - XFillRectangle(ourdisplay, gwind, - ourgc, 0, 0, 1 ,1); - checkinp(); - lastflush = nrays; + if (inpcheck == IC_READ) { + n = read(fileno(stdin), buf, sizeof(buf)-1); + if (n > 0) { + buf[n] = '\0'; + tocombuf(buf, &x11_driver); + } } +#endif } -static +static void x11_comin(inp, prompt) /* read in a command line */ char *inp, *prompt; { - int x11_getc(), x11_comout(); - - if (prompt != NULL) + if (prompt != NULL) { + x11_flush(); /* make sure we get everything */ if (fromcombuf(inp, &x11_driver)) return; - else - xt_puts(prompt, comline); + xt_puts(prompt, comline); + } xt_cursor(comline, TBLKCURS); editline(inp, x11_getc, x11_comout); xt_cursor(comline, TNOCURS); } -static -x11_comout(out) /* output a string to command line */ -char *out; +static void +x11_comout(outp) /* output a string to command line */ +char *outp; { - if (comline != NULL) - xt_puts(out, comline); - XFlush(ourdisplay); + if (comline == NULL || outp == NULL || !outp[0]) + return; + xt_puts(outp, comline); + if (outp[strlen(outp)-1] == '\n') + XFlush(ourdisplay); } -static +static void x11_errout(msg) /* output an error message */ char *msg; { + eputs(msg); /* send to stderr also! */ x11_comout(msg); - stderr_v(msg); /* send to stderr also! */ } +static void +std_comin(inp, prompt) /* read in command line from stdin */ +char *inp, *prompt; +{ + if (prompt != NULL) { + if (fromcombuf(inp, &x11_driver)) + return; + if (!x11_driver.inpready) + std_comout(prompt); + } +#ifdef FNDELAY + if (inpcheck == IC_READ) { /* turn off FNDELAY */ + if (fcntl(fileno(stdin), F_SETFL, 0) < 0) { + eputs("cannot change input mode\n"); + quit(1); + } + inpcheck = IC_IOCTL; + } +#endif + if (gets(inp) == NULL) { + strcpy(inp, "quit"); + return; + } + x11_driver.inpready -= strlen(inp) + 1; + if (x11_driver.inpready < 0) + x11_driver.inpready = 0; +} + + +static void +std_comout(outp) /* write out string to stdout */ +char *outp; +{ + fputs(outp, stdout); + fflush(stdout); +} + + static int x11_getcur(xp, yp) /* get cursor position */ int *xp, *yp; @@ -270,19 +480,17 @@ int *xp, *yp; if (c_last > c_first) /* key pressed */ return(x11_getc()); /* button pressed */ - if (levptr(XButtonPressedEvent)->button & Button1) + if (levptr(XButtonPressedEvent)->button == Button1) return(MB1); - if (levptr(XButtonPressedEvent)->button & Button2) + if (levptr(XButtonPressedEvent)->button == Button2) return(MB2); - if (levptr(XButtonPressedEvent)->button & Button3) + if (levptr(XButtonPressedEvent)->button == Button3) return(MB3); - if (levptr(XButtonPressedEvent)->button & (Button4|Button5)) - return(MB1); return(ABORT); } -static +static void xnewcolr(ndx, r, g, b) /* enter a color into hardware table */ int ndx; int r, g, b; @@ -302,33 +510,85 @@ int r, g, b; static int getpixels() /* get the color map */ { - Visual *ourvis = DefaultVisual(ourdisplay,ourscreen); + XColor thiscolor; + register int i, j; if (ncolors > 0) return(ncolors); - for (ncolors=(ourvis->map_entries)-3; ncolors>12; ncolors=ncolors*.937){ - pixval = (int *)malloc(ncolors*sizeof(int)); + if (ourvinfo.visual == DefaultVisual(ourdisplay,ourscreen)) { + ourmap = DefaultColormap(ourdisplay,ourscreen); + goto loop; + } +newmap: + ourmap = XCreateColormap(ourdisplay,gwind,ourvinfo.visual,AllocNone); +loop: + for (ncolors = ourvinfo.colormap_size; + ncolors > ourvinfo.colormap_size/3; + ncolors = ncolors*.937) { + pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); if (pixval == NULL) + return(ncolors = 0); + if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) break; - if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, - pixval,ncolors) != 0) - return(ncolors); - free((char *)pixval); + free((void *)pixval); + pixval = NULL; } - return(ncolors = 0); + if (pixval == NULL) { + if (ourmap == DefaultColormap(ourdisplay,ourscreen)) + goto newmap; /* try it with our map */ + else + return(ncolors = 0); /* failed */ + } + if (ourmap != DefaultColormap(ourdisplay,ourscreen)) + for (i = 0; i < ncolors; i++) { /* reset black and white */ + if (pixval[i] != ourblack && pixval[i] != ourwhite) + continue; + thiscolor.pixel = pixval[i]; + thiscolor.flags = DoRed|DoGreen|DoBlue; + XQueryColor(ourdisplay, + DefaultColormap(ourdisplay,ourscreen), + &thiscolor); + XStoreColor(ourdisplay, ourmap, &thiscolor); + for (j = i; j+1 < ncolors; j++) + pixval[j] = pixval[j+1]; + ncolors--; + i--; + } + XSetWindowColormap(ourdisplay, gwind, ourmap); + return(ncolors); } -static +static void freepixels() /* free our pixels */ { if (ncolors == 0) return; XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); + free((void *)pixval); + pixval = NULL; ncolors = 0; + if (ourmap != DefaultColormap(ourdisplay,ourscreen)) + XFreeColormap(ourdisplay, ourmap); + ourmap = 0; } +static unsigned long +true_pixel(col) /* return true pixel value for color */ +COLOR col; +{ + unsigned long rval; + BYTE rgb[3]; + + map_color(rgb, col); + rval = ourvinfo.red_mask*rgb[RED]/255 & ourvinfo.red_mask; + rval |= ourvinfo.green_mask*rgb[GRN]/255 & ourvinfo.green_mask; + rval |= ourvinfo.blue_mask*rgb[BLU]/255 & ourvinfo.blue_mask; + return(rval); +} + + static int x11_getc() /* get a command character */ { @@ -341,7 +601,7 @@ x11_getc() /* get a command character */ } -static +static void getevent() /* get next event */ { XNextEvent(ourdisplay, levptr(XEvent)); @@ -350,13 +610,17 @@ getevent() /* get next event */ resizewindow(levptr(XConfigureEvent)); break; case UnmapNotify: + mapped = 0; freepixels(); break; case MapNotify: - if (getpixels() == 0) - stderr_v("Cannot allocate colors\n"); - else - new_ctab(ncolors); + if (ourvinfo.class == PseudoColor || + ourvinfo.class == GrayScale) + if (getpixels() == 0) + eputs("cannot allocate colors\n"); + else + new_ctab(ncolors); + mapped = 1; break; case Expose: fixwindow(levptr(XExposeEvent)); @@ -370,24 +634,30 @@ getevent() /* get next event */ } -static +static void getkey(ekey) /* get input key */ register XKeyPressedEvent *ekey; { - c_last += XLookupString(ekey, c_queue+c_last, sizeof(c_queue)-c_last, + register int n; + + n = XLookupString(ekey, c_queue+c_last, sizeof(c_queue)-c_last, NULL, NULL); - x11_driver.inpready = c_last-c_first; + c_last += n; + x11_driver.inpready += n; } -static +static void fixwindow(eexp) /* repair damage to window */ register XExposeEvent *eexp; { + char buf[80]; + if (eexp->window == gwind) { - sprintf(getcombuf(&x11_driver), "repaint %d %d %d %d\n", + sprintf(buf, "repaint %d %d %d %d\n", eexp->x, gheight - eexp->y - eexp->height, eexp->x + eexp->width, gheight - eexp->y); + tocombuf(buf, &x11_driver); } else if (eexp->window == comline->w) { if (eexp->count == 0) xt_redraw(comline); @@ -395,17 +665,17 @@ register XExposeEvent *eexp; } -static +static void resizewindow(ersz) /* resize window */ register XConfigureEvent *ersz; { - if (ersz->width == gwidth && ersz->height-COMHEIGHT == gheight) + if (ersz->width == gwidth && ersz->height-comheight == gheight) return; gwidth = ersz->width; - gheight = ersz->height-COMHEIGHT; + gheight = ersz->height-comheight; x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight; - strcpy(getcombuf(&x11_driver), "new\n"); + tocombuf("new\n", &x11_driver); }