--- ray/src/rt/x11.c 1990/02/22 11:46:26 1.5 +++ ray/src/rt/x11.c 1990/12/21 17:27:31 1.17 @@ -24,8 +24,8 @@ static char SCCSid[] = "$SunId$ LBL"; #define GAMMA 2.2 /* exponent for color 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 /* minimum graphics window height */ #define BORWIDTH 5 /* border width */ #define COMHEIGHT (COMLH*COMCH) /* command line height (pixels) */ @@ -45,10 +45,12 @@ static char SCCSid[] = "$SunId$ LBL"; static XEvent currentevent; /* current event */ static int ncolors = 0; /* color table size */ -static int *pixval = NULL; /* allocated pixels */ +static unsigned long *pixval = NULL; /* allocated pixels */ static Display *ourdisplay = NULL; /* our display */ +static Visual *ourvisual; /* our visual structure */ + static Window gwind = 0; /* our graphics window */ static Cursor pickcursor = 0; /* cursor used for picking */ @@ -63,11 +65,11 @@ 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(); +extern char *malloc(), *getcombuf(); -int x11_close(), x11_clear(), x11_paintr(), x11_errout(), +static int x11_close(), x11_clear(), x11_paintr(), x11_errout(), x11_getcur(), x11_comout(), x11_comin(), x11_flush(); static struct driver x11_driver = { @@ -80,39 +82,63 @@ struct driver * x11_init(name, id) /* initialize driver */ char *name, *id; { + int nplanes; + XVisualInfo ourvinfo; + XSetWindowAttributes ourwinattr; XWMHints ourxwmhints; - Pixmap bmCursorSrc, bmCursorMsk; + XSizeHints oursizhints; ourdisplay = XOpenDisplay(NULL); if (ourdisplay == NULL) { stderr_v("cannot open X-windows; DISPLAY variable set?\n"); return(NULL); } - if (DisplayPlanes(ourdisplay, ourscreen) < 4) { + nplanes = DisplayPlanes(ourdisplay, ourscreen); + if (nplanes < 4) { stderr_v("not enough colors\n"); return(NULL); + } else if (nplanes <= 12) { + if (!XMatchVisualInfo(ourdisplay,ourscreen, + nplanes,PseudoColor,&ourvinfo)) { + stderr_v("PseudoColor server required\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); } - ourmap = DefaultColormap(ourdisplay,ourscreen); - make_gmap(GAMMA); /* make color map */ - /* create a cursor */ - pickcursor = XCreateFontCursor (ourdisplay, XC_diamond_cross); + ourvisual = ourvinfo.visual; + make_gmap(GAMMA); /* open window */ - gwind = XCreateSimpleWindow(ourdisplay, ourroot, 0, 0, + ourwinattr.background_pixel = ourblack; + ourwinattr.border_pixel = ourblack; + gwind = XCreateWindow(ourdisplay, ourroot, 0, 0, DisplayWidth(ourdisplay,ourscreen)-2*BORWIDTH, DisplayHeight(ourdisplay,ourscreen)-2*BORWIDTH, - BORWIDTH, ourblack, ourwhite); + BORWIDTH, nplanes, InputOutput, ourvisual, + CWBackPixel|CWBorderPixel, &ourwinattr); if (gwind == 0) { stderr_v("cannot create window\n"); return(NULL); } XStoreName(ourdisplay, gwind, id); + /* create a cursor */ + pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross); ourgc = XCreateGC(ourdisplay, gwind, 0, NULL); ourxwmhints.flags = InputHint; ourxwmhints.input = True; 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; x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; @@ -137,14 +163,12 @@ x11_close() /* close our display */ 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; } @@ -154,31 +178,40 @@ static 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); 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); - + if (ourvisual->class == PseudoColor) + if (getpixels() == 0) + stderr_v("cannot allocate colors\n"); + else + new_ctab(ncolors); + /* get new command line */ + if (comline != NULL) + xt_close(comline); + comline = xt_open(ourdisplay, + DefaultGC(ourdisplay,ourscreen), + gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN); + if (comline == NULL) { + stderr_v("Cannot open command line window\n"); + quit(1); + } + XSelectInput(ourdisplay, comline->w, ExposureMask); + /* remove earmuffs */ XSelectInput(ourdisplay, gwind, StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask); } @@ -190,21 +223,25 @@ COLOR col; int xmin, ymin, xmax, ymax; { extern int xnewcolr(); /* pixel assignment routine */ + extern unsigned long true_pixel(); + 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 (ncolors > 0) + pixel = pixval[get_pixel(col, xnewcolr)]; + else if (ourvisual->class != PseudoColor) + pixel = true_pixel(col); + else + return; + XSetForeground(ourdisplay, ourgc, pixel); + XFillRectangle(ourdisplay, gwind, + ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); } static x11_flush() /* flush output */ { - if (ncolors <= 0) /* output necessary for death */ - XFillRectangle(ourdisplay, gwind, ourgc, 0, 0, 1 ,1); + XNoOp(ourdisplay); while (XPending(ourdisplay) > 0) getevent(); } @@ -214,7 +251,7 @@ static x11_comin(inp, prompt) /* read in a command line */ char *inp, *prompt; { - int x11_getc(), x11_comout(); + extern int x11_getc(); if (prompt != NULL) if (fromcombuf(inp, &x11_driver)) @@ -231,9 +268,11 @@ static x11_comout(out) /* output a string to command line */ char *out; { - if (comline != NULL) - xt_puts(out, comline); - XFlush(ourdisplay); + if (comline == NULL) + return; + xt_puts(out, comline); + if (out[strlen(out)-1] == '\n') + XFlush(ourdisplay); } @@ -241,8 +280,8 @@ static x11_errout(msg) /* output an error message */ char *msg; { - x11_comout(msg); stderr_v(msg); /* send to stderr also! */ + x11_comout(msg); } @@ -297,20 +336,62 @@ 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)); + goto donecolors; + if (ourvisual == DefaultVisual(ourdisplay,ourscreen)) { + ourmap = DefaultColormap(ourdisplay,ourscreen); + goto loop; + } +newmap: + ourmap = XCreateColormap(ourdisplay,gwind,ourvisual,AllocNone); +loop: + for (ncolors = ourvisual->map_entries; + ncolors > ourvisual->map_entries/3; + ncolors = ncolors*.937) { + pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); if (pixval == NULL) - break; + return(ncolors = 0); if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, pixval,ncolors) != 0) - return(ncolors); + break; free((char *)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); +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); } @@ -321,9 +402,27 @@ freepixels() /* free our pixels */ return; XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); 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 = 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; + return(rval); +} + + static int x11_getc() /* get a command character */ { @@ -348,10 +447,11 @@ getevent() /* get next event */ freepixels(); break; case MapNotify: - if (getpixels() == 0) - stderr_v("Cannot allocate colors\n"); - else - new_ctab(ncolors); + if (ourvisual->class == PseudoColor) + if (getpixels() == 0) + stderr_v("Cannot allocate colors\n"); + else + new_ctab(ncolors); break; case Expose: fixwindow(levptr(XExposeEvent)); @@ -369,9 +469,12 @@ static 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; }