--- ray/src/rt/x11.c 1990/07/18 12:25:07 1.16 +++ ray/src/rt/x11.c 1993/06/04 14:48:52 2.12 @@ -1,17 +1,17 @@ +/* Copyright (c) 1992 Regents of the University of California */ + #ifndef lint static char SCCSid[] = "$SunId$ LBL"; #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 * * Jan 1990 */ #include - +#include #include #include @@ -21,11 +21,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 (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) */ @@ -37,19 +38,19 @@ static char SCCSid[] = "$SunId$ LBL"; #define ourscreen DefaultScreen(ourdisplay) #define ourroot RootWindow(ourdisplay,ourscreen) -#define ourwhite WhitePixel(ourdisplay,ourscreen) -#define ourblack BlackPixel(ourdisplay,ourscreen) #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 Visual *ourvisual; /* our visual structure */ +static XVisualInfo ourvinfo; /* our visual information */ static Window gwind = 0; /* our graphics window */ @@ -77,13 +78,18 @@ static struct driver x11_driver = { x11_comout, x11_comin, x11_flush, 1.0 }; +static int getpixels(), xnewcolr(), freepixels(), + getevent(), getkey(), fixwindow(); +static unsigned long true_pixel(); + struct driver * x11_init(name, id) /* initialize driver */ char *name, *id; { + extern char *getenv(); + char *gv; int nplanes; - XVisualInfo ourvinfo; XSetWindowAttributes ourwinattr; XWMHints ourxwmhints; XSizeHints oursizhints; @@ -93,44 +99,59 @@ char *name, *id; stderr_v("cannot open X-windows; DISPLAY variable set?\n"); return(NULL); } + /* find a usable visual */ nplanes = DisplayPlanes(ourdisplay, ourscreen); - if (nplanes < 4) { - stderr_v("not enough colors\n"); - return(NULL); - } else if (nplanes <= 12) { + if (XMatchVisualInfo(ourdisplay,ourscreen, + 24,TrueColor,&ourvinfo) || + XMatchVisualInfo(ourdisplay,ourscreen, + 24,DirectColor,&ourvinfo)) { + ourblack = 0; + ourwhite = ourvinfo.red_mask | + ourvinfo.green_mask | + ourvinfo.blue_mask ; + } else { + if (nplanes < 4) { + stderr_v("not enough colors\n"); + return(NULL); + } if (!XMatchVisualInfo(ourdisplay,ourscreen, - nplanes,PseudoColor,&ourvinfo)) { - stderr_v("PseudoColor server required\n"); + nplanes,PseudoColor,&ourvinfo) && + !XMatchVisualInfo(ourdisplay,ourscreen, + nplanes,GrayScale,&ourvinfo)) { + stderr_v("unsupported visual type\n"); return(NULL); } - } else if (!XMatchVisualInfo(ourdisplay,ourscreen, - nplanes,TrueColor,&ourvinfo) && - /* kludge for DirectColor */ - !XMatchVisualInfo(ourdisplay,ourscreen, - nplanes,DirectColor,&ourvinfo)) { - stderr_v("TrueColor server required\n"); - return(NULL); + ourblack = BlackPixel(ourdisplay,ourscreen); + ourwhite = WhitePixel(ourdisplay,ourscreen); } - ourvisual = ourvinfo.visual; - make_gmap(GAMMA); - /* open window */ + /* set gamma */ + if ((gv = getenv("GAMMA")) != NULL) + make_gmap(atof(gv)); + else + make_gmap(GAMMA); + /* 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, nplanes, InputOutput, ourvisual, - CWBackPixel|CWBorderPixel, &ourwinattr); + BORWIDTH, ourvinfo.depth, InputOutput, ourvinfo.visual, + CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); if (gwind == 0) { stderr_v("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; @@ -138,12 +159,13 @@ char *name, *id; 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; x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight; x11_driver.inpready = 0; + mapped = 1; cmdvec = x11_comout; /* set error vectors */ if (wrnvec != NULL) wrnvec = x11_errout; @@ -195,7 +217,7 @@ int xres, yres; } XClearWindow(ourdisplay, gwind); /* reinitialize color table */ - if (ourvisual->class == PseudoColor) + if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale) if (getpixels() == 0) stderr_v("cannot allocate colors\n"); else @@ -203,9 +225,8 @@ int xres, yres; /* get new command line */ if (comline != NULL) xt_close(comline); - comline = xt_open(ourdisplay, - DefaultGC(ourdisplay,ourscreen), - gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN); + 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); @@ -222,16 +243,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 (ourvisual->class != PseudoColor) - 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); @@ -304,14 +323,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); } @@ -340,22 +357,21 @@ getpixels() /* get the color map */ register int i, j; if (ncolors > 0) - goto donecolors; - if (ourvisual == DefaultVisual(ourdisplay,ourscreen)) { + return(ncolors); + if (ourvinfo.visual == DefaultVisual(ourdisplay,ourscreen)) { ourmap = DefaultColormap(ourdisplay,ourscreen); goto loop; } newmap: - ourmap = XCreateColormap(ourdisplay,gwind,ourvisual,AllocNone); + ourmap = XCreateColormap(ourdisplay,gwind,ourvinfo.visual,AllocNone); loop: - for (ncolors = ourvisual->map_entries; - ncolors > ourvisual->map_entries/3; + for (ncolors = ourvinfo.colormap_size; + ncolors > ourvinfo.colormap_size/3; ncolors = ncolors*.937) { - pixval = (int *)malloc(ncolors*sizeof(int)); + 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; @@ -382,15 +398,6 @@ loop: i--; } XSetWindowColormap(ourdisplay, gwind, ourmap); -donecolors: -#ifdef DEBUG - thiscolor.flags = DoRed|DoGreen|DoBlue; - thiscolor.red = thiscolor.green = thiscolor.blue = 0; - for (i = 0; i < ncolors; i++) { - thiscolor.pixel = pixval[i]; - XStoreColor(ourdisplay, ourmap, &thiscolor); - } -#endif return(ncolors); } @@ -401,6 +408,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); @@ -416,9 +425,9 @@ COLOR col; BYTE rgb[3]; map_color(rgb, col); - rval = ourvisual->red_mask*rgb[RED]/255 & ourvisual->red_mask; - rval |= ourvisual->green_mask*rgb[GRN]/255 & ourvisual->green_mask; - rval |= ourvisual->blue_mask*rgb[BLU]/255 & ourvisual->blue_mask; + 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); } @@ -444,14 +453,17 @@ getevent() /* get next event */ resizewindow(levptr(XConfigureEvent)); break; case UnmapNotify: + mapped = 0; freepixels(); break; case MapNotify: - if (ourvisual->class == PseudoColor) + if (ourvinfo.class == PseudoColor || + ourvinfo.class == GrayScale) if (getpixels() == 0) stderr_v("Cannot allocate colors\n"); else new_ctab(ncolors); + mapped = 1; break; case Expose: fixwindow(levptr(XExposeEvent));