--- ray/src/rt/x11.c 1992/06/18 14:55:24 2.5 +++ ray/src/rt/x11.c 1994/09/12 15:57:55 2.17 @@ -11,7 +11,7 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include - +#include #include #include @@ -23,10 +23,10 @@ static char SCCSid[] = "$SunId$ LBL"; #include "x11twind.h" #include "x11icon.h" -#define GAMMA 2.2 /* exponent for color correction */ +#define GAMMA 2.2 /* default exponent correction */ #define MINWIDTH (32*COMCW) /* minimum graphics window width */ -#define MINHEIGHT MINWIDTH /* minimum graphics window height */ +#define MINHEIGHT (MINWIDTH/2) /* minimum graphics window height */ #define BORWIDTH 5 /* border width */ #define COMHEIGHT (COMLH*COMCH) /* command line height (pixels) */ @@ -44,6 +44,7 @@ static char SCCSid[] = "$SunId$ LBL"; static XEvent currentevent; /* current event */ static int ncolors = 0; /* color table size */ +static int mapped = 0; /* window is mapped? */ static unsigned long *pixval = NULL; /* allocated pixels */ static unsigned long ourblack=0, ourwhite=1; @@ -57,6 +58,7 @@ static Cursor pickcursor = 0; /* cursor used for pic 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 */ @@ -72,21 +74,29 @@ extern char *malloc(), *getcombuf(); static int x11_close(), x11_clear(), x11_paintr(), x11_errout(), x11_getcur(), x11_comout(), x11_comin(), x11_flush(); +static int std_comin(), std_comout(); + static struct driver x11_driver = { x11_close, x11_clear, x11_paintr, x11_getcur, - x11_comout, x11_comin, x11_flush, 1.0 + NULL, NULL, x11_flush, 1.0 }; +static int getpixels(), xnewcolr(), freepixels(), resizewindow(), + getevent(), getkey(), fixwindow(), x11_getc(); +static unsigned long true_pixel(); + struct driver * x11_init(name, id) /* initialize driver */ char *name, *id; { + extern char *getenv(); + char *gv; int nplanes; XSetWindowAttributes ourwinattr; XWMHints ourxwmhints; XSizeHints oursizhints; - + /* open display server */ ourdisplay = XOpenDisplay(NULL); if (ourdisplay == NULL) { stderr_v("cannot open X-windows; DISPLAY variable set?\n"); @@ -117,8 +127,18 @@ char *name, *id; ourblack = BlackPixel(ourdisplay,ourscreen); ourwhite = WhitePixel(ourdisplay,ourscreen); } - make_gmap(GAMMA); - /* open window */ + /* set gamma */ + if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL + || (gv = getenv("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; + /* open window */ ourwinattr.background_pixel = ourblack; ourwinattr.border_pixel = ourblack; /* this is stupid */ @@ -143,20 +163,30 @@ char *name, *id; gwind, x11icon_bits, x11icon_width, x11icon_height); XSetWMHints(ourdisplay, gwind, &ourxwmhints); oursizhints.min_width = MINWIDTH; - oursizhints.min_height = MINHEIGHT+COMHEIGHT; + oursizhints.min_height = MINHEIGHT+comheight; oursizhints.flags = PMinSize; XSetNormalHints(ourdisplay, gwind, &oursizhints); XSelectInput(ourdisplay, gwind, ExposureMask); XMapWindow(ourdisplay, gwind); 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; + cmdvec = x11_comout; + if (wrnvec != NULL) + wrnvec = x11_errout; + } else { + x11_driver.comin = std_comin; + x11_driver.comout = std_comout; + cmdvec = std_comout; + } return(&x11_driver); } @@ -196,7 +226,7 @@ int xres, yres; /* resize window */ if (xres != gwidth || yres != gheight) { XSelectInput(ourdisplay, gwind, 0); - XResizeWindow(ourdisplay, gwind, xres, yres+COMHEIGHT); + XResizeWindow(ourdisplay, gwind, xres, yres+comheight); gwidth = xres; gheight = yres; XFlush(ourdisplay); @@ -213,16 +243,20 @@ int xres, yres; /* get new command line */ if (comline != NULL) xt_close(comline); - comline = xt_open(ourdisplay, gwind, 0, gheight, - gwidth, COMHEIGHT, 0, ourblack, ourwhite, COMFN); - if (comline == NULL) { - stderr_v("Cannot open command line window\n"); - quit(1); - } - XSelectInput(ourdisplay, comline->w, ExposureMask); + if (comheight) { + comline = xt_open(ourdisplay, gwind, 0, gheight, gwidth, + comheight, 0, ourblack, ourwhite, COMFN); + if (comline == NULL) { + stderr_v("Cannot open command line window\n"); + quit(1); + } + XSelectInput(ourdisplay, comline->w, ExposureMask); /* remove earmuffs */ - XSelectInput(ourdisplay, gwind, + XSelectInput(ourdisplay, gwind, StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask); + } else /* remove earmuffs */ + XSelectInput(ourdisplay, gwind, + StructureNotifyMask|ExposureMask|ButtonPressMask); } @@ -231,16 +265,14 @@ x11_paintr(col, xmin, ymin, xmax, ymax) /* fill a rec COLOR col; int xmin, ymin, xmax, ymax; { - extern int xnewcolr(); /* pixel assignment routine */ - extern unsigned long true_pixel(); unsigned long pixel; + if (!mapped) + return; if (ncolors > 0) pixel = pixval[get_pixel(col, xnewcolr)]; - else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor) - pixel = true_pixel(col); else - return; + pixel = true_pixel(col); XSetForeground(ourdisplay, ourgc, pixel); XFillRectangle(ourdisplay, gwind, ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); @@ -250,9 +282,19 @@ int xmin, ymin, xmax, ymax; static x11_flush() /* flush output */ { + int n; + /* check for input */ XNoOp(ourdisplay); - while (XPending(ourdisplay) > 0) + n = XPending(ourdisplay); /* from X server */ + while (n-- > 0) getevent(); + if (x11_driver.comin == std_comin) { /* from stdin */ + if (ioctl(fileno(stdin), FIONREAD, &n) < 0) { + stderr_v("ioctl error on stdin\n"); + quit(1); + } + x11_driver.inpready += n; + } } @@ -260,13 +302,12 @@ static x11_comin(inp, prompt) /* read in a command line */ char *inp, *prompt; { - extern int x11_getc(); - - 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); @@ -274,13 +315,13 @@ char *inp, *prompt; static -x11_comout(out) /* output a string to command line */ -char *out; +x11_comout(outp) /* output a string to command line */ +char *outp; { if (comline == NULL) return; - xt_puts(out, comline); - if (out[strlen(out)-1] == '\n') + xt_puts(outp, comline); + if (outp[strlen(outp)-1] == '\n') XFlush(ourdisplay); } @@ -294,6 +335,36 @@ char *msg; } +static +std_comin(inp, prompt) /* read in command line from stdin */ +char *inp, *prompt; +{ + extern char *gets(); + + if (prompt != NULL) { + if (fromcombuf(inp, &x11_driver)) + return; + if (!x11_driver.inpready) + fputs(prompt, stdout); + } + if (gets(inp) == NULL) { + strcpy(inp, "quit"); + return; + } + x11_driver.inpready -= strlen(inp) + 1; + if (x11_driver.inpready < 0) + x11_driver.inpready = 0; +} + + +static +std_comout(outp) /* write out string to stdout */ +char *outp; +{ + fputs(outp, stdout); +} + + static int x11_getcur(xp, yp) /* get cursor position */ int *xp, *yp; @@ -313,14 +384,12 @@ 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); } @@ -363,8 +432,7 @@ loop: pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); if (pixval == NULL) return(ncolors = 0); - if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, - pixval,ncolors) != 0) + if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) break; free((char *)pixval); pixval = NULL; @@ -401,6 +469,8 @@ freepixels() /* free our pixels */ if (ncolors == 0) return; XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); + free((char *)pixval); + pixval = NULL; ncolors = 0; if (ourmap != DefaultColormap(ourdisplay,ourscreen)) XFreeColormap(ourdisplay, ourmap); @@ -444,6 +514,7 @@ getevent() /* get next event */ resizewindow(levptr(XConfigureEvent)); break; case UnmapNotify: + mapped = 0; freepixels(); break; case MapNotify: @@ -453,6 +524,7 @@ getevent() /* get next event */ stderr_v("Cannot allocate colors\n"); else new_ctab(ncolors); + mapped = 1; break; case Expose: fixwindow(levptr(XExposeEvent)); @@ -498,11 +570,11 @@ static 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;