--- ray/src/px/x11image.c 1990/10/17 14:56:18 1.9 +++ ray/src/px/x11image.c 1992/06/24 09:17:39 2.10 @@ -1,4 +1,4 @@ -/* Copyright (c) 1990 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -30,18 +30,18 @@ static char SCCSid[] = "$SunId$ LBL"; #include "pic.h" #include "x11raster.h" #include "random.h" +#include "resolu.h" #define FONTNAME "8x13" /* text font we'll use */ -#define CTRL(c) ('c'-'@') +#define CTRL(c) ((c)-'@') #define BORWIDTH 5 /* border width */ +#define ICONSIZ (8*10) /* maximum icon dimension (even 8) */ + #define ourscreen DefaultScreen(thedisplay) -#define ourblack BlackPixel(thedisplay,ourscreen) -#define ourwhite WhitePixel(thedisplay,ourscreen) #define ourroot RootWindow(thedisplay,ourscreen) -#define ourgc DefaultGC(thedisplay,ourscreen) #define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) @@ -52,7 +52,10 @@ double gamcor = 2.2; /* gamma correction */ int dither = 1; /* dither colors? */ int fast = 0; /* keep picture in Pixmap? */ +char *dispname = NULL; /* our display name */ + Window wind = 0; /* our output window */ +unsigned long ourblack=0, ourwhite=1; /* black and white for this visual */ Font fontid; /* our font */ int maxcolors = 0; /* maximum colors */ @@ -68,7 +71,8 @@ int gotview = 0; /* got parameters from file */ COLR *scanline; /* scan line buffer */ -int xmax, ymax; /* picture resolution */ +RESOLU inpres; /* input resolution and ordering */ +int xmax, ymax; /* picture dimensions */ int width, height; /* window size */ char *fname = NULL; /* input file name */ FILE *fin = stdin; /* input file */ @@ -77,9 +81,14 @@ int cury = 0; /* current scan location */ double exposure = 1.0; /* exposure compensation used */ +int wrongformat = 0; /* input in another format? */ + +GC ourgc; /* standard graphics context */ GC revgc; /* graphics context with GXinvert */ -XRASTER *ourras; /* our stored image */ +int *ourrank; /* our visual class ranking */ +XVisualInfo ourvis; /* our visual */ +XRASTER *ourras; /* our stored image */ unsigned char *ourdata; /* our image data */ struct { @@ -88,6 +97,9 @@ struct { char *geometry = NULL; /* geometry specification */ +char icondata[ICONSIZ*ICONSIZ/8]; /* icon bitmap data */ +int iconwidth = 0, iconheight = 0; + char *progname; char errmsg[128]; @@ -96,7 +108,7 @@ extern long ftell(); extern char *malloc(), *calloc(); -extern double atof(), pow(), log(); +extern double pow(), log(); Display *thedisplay; @@ -104,10 +116,14 @@ main(argc, argv) int argc; char *argv[]; { + extern char *getenv(); + char *gv; int headline(); int i; progname = argv[0]; + if ((gv = getenv("GAMMA")) != NULL) + gamcor = atof(gv); for (i = 1; i < argc; i++) if (argv[i][0] == '-') @@ -122,7 +138,10 @@ char *argv[]; maxcolors = 2; break; case 'd': - dither = !dither; + if (argv[i][2] == 'i') + dispname = argv[++i]; + else + dither = !dither; break; case 'f': fast = !fast; @@ -133,7 +152,7 @@ char *argv[]; scale = atoi(argv[++i]); break; case 'g': - if (!strcmp(argv[i], "-geometry")) + if (argv[i][2] == 'e') geometry = argv[++i]; else gamcor = atof(argv[++i]); @@ -150,16 +169,18 @@ char *argv[]; fname = argv[i]; fin = fopen(fname, "r"); if (fin == NULL) { - sprintf(errmsg, "can't open file \"%s\"", fname); + sprintf(errmsg, "cannot open file \"%s\"", fname); quiterr(errmsg); } } else if (i != argc) goto userr; /* get header */ - getheader(fin, headline); + getheader(fin, headline, NULL); /* get picture dimensions */ - if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) - quiterr("bad picture size"); + if (wrongformat || !fgetsresolu(&inpres, fin)) + quiterr("bad picture format"); + xmax = scanlen(&inpres); + ymax = numscans(&inpres); /* set view parameters */ if (gotview && setview(&ourview) != NULL) gotview = 0; @@ -172,7 +193,7 @@ char *argv[]; getevent(); /* main loop */ userr: fprintf(stderr, - "Usage: %s [-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", + "Usage: %s [-display disp][-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", progname); quit(1); } @@ -181,26 +202,24 @@ userr: headline(s) /* get relevant info from header */ char *s; { - static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; - register char **an; + char fmt[32]; if (isexpos(s)) exposure *= exposval(s); - else - for (an = altname; *an != NULL; an++) - if (!strncmp(*an, s, strlen(*an))) { - if (sscanview(&ourview, s+strlen(*an)) > 0) - gotview++; - return; - } + else if (isformat(s)) { + formatval(fmt, s); + wrongformat = strcmp(fmt, COLRFMT); + } else if (isview(s) && sscanview(&ourview, s) > 0) + gotview++; } init() /* get data and open window */ { + XWMHints ourxwmhints; XSetWindowAttributes ourwinattr; - XSizeHints oursizhints; - register int i; + XSizeHints oursizhints; + register int i; if (fname != NULL) { scanpos = (long *)malloc(ymax*sizeof(long)); @@ -209,38 +228,41 @@ init() /* get data and open window */ for (i = 0; i < ymax; i++) scanpos[i] = -1; } - if ((thedisplay = XOpenDisplay(NULL)) == NULL) - quiterr("can't open display; DISPLAY variable set?"); - if (maxcolors == 0) { /* get number of available colors */ - i = DisplayPlanes(thedisplay,ourscreen); - maxcolors = i > 8 ? 256 : 1< 4) maxcolors -= 2; - } + if ((thedisplay = XOpenDisplay(dispname)) == NULL) + quiterr("cannot open display"); + /* get best visual for default screen */ + getbestvis(); /* store image */ getras(); /* open window */ ourwinattr.border_pixel = ourblack; ourwinattr.background_pixel = ourwhite; + ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, + ourvis.visual, AllocNone); wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH, - 0, InputOutput, ourras->visual, - CWBackPixel|CWBorderPixel, &ourwinattr); + ourvis.depth, InputOutput, ourvis.visual, + CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); if (wind == 0) - quiterr("can't create window"); + quiterr("cannot create window"); + XFreeColormap(thedisplay, ourwinattr.colormap); width = xmax; height = ymax; + ourgc = XCreateGC(thedisplay, wind, 0, 0); + XSetState(thedisplay, ourgc, ourblack, ourwhite, GXcopy, AllPlanes); + revgc = XCreateGC(thedisplay, wind, 0, 0); + XSetFunction(thedisplay, revgc, GXinvert); fontid = XLoadFont(thedisplay, FONTNAME); if (fontid == 0) - quiterr("can't get font"); + quiterr("cannot get font"); XSetFont(thedisplay, ourgc, fontid); - revgc = XCreateGC(thedisplay, wind, 0, 0); - XSetFunction(thedisplay, revgc, GXinvert); - XStoreName(thedisplay, wind, fname == NULL ? progname : fname); XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, XC_diamond_cross)); + XStoreName(thedisplay, wind, fname == NULL ? progname : fname); if (geometry != NULL) { bzero((char *)&oursizhints, sizeof(oursizhints)); i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, - &oursizhints.width, &oursizhints.height); + (unsigned *)&oursizhints.width, + (unsigned *)&oursizhints.height); if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) oursizhints.flags |= USSize; else { @@ -259,6 +281,11 @@ init() /* get data and open window */ } XSetNormalHints(thedisplay, wind, &oursizhints); } + ourxwmhints.flags = InputHint|IconPixmapHint; + ourxwmhints.input = True; + ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, + wind, icondata, iconwidth, iconheight); + XSetWMHints(thedisplay, wind, &ourxwmhints); XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |ButtonMotionMask|StructureNotifyMask |KeyPressMask|ExposureMask); @@ -294,6 +321,129 @@ int code; } +static int +viscmp(v1,v2) /* compare visual to see which is better, descending */ +register XVisualInfo *v1, *v2; +{ + int bad1 = 0, bad2 = 0; + register int *rp; + + if (v1->class == v2->class) { + if (v1->class == TrueColor || v1->class == DirectColor) { + /* prefer 24-bit to 32-bit */ + if (v1->depth == 24 && v2->depth == 32) + return(-1); + if (v1->depth == 32 && v2->depth == 24) + return(1); + return(0); + } + /* don't be too greedy */ + if (maxcolors <= 1<depth && maxcolors <= 1<depth) + return(v1->depth - v2->depth); + return(v2->depth - v1->depth); + } + /* prefer Pseudo when < 24-bit */ + if ((v1->class == TrueColor || v1->class == DirectColor) && + v1->depth < 24) + bad1 = 1; + if ((v2->class == TrueColor || v2->class == DirectColor) && + v2->depth < 24) + bad2 = -1; + if (bad1 | bad2) + return(bad1+bad2); + /* otherwise, use class ranking */ + for (rp = ourrank; *rp != -1; rp++) { + if (v1->class == *rp) + return(-1); + if (v2->class == *rp) + return(1); + } + return(0); +} + + +getbestvis() /* get the best visual for this screen */ +{ +#ifdef DEBUG +static char vistype[][12] = { + "StaticGray", + "GrayScale", + "StaticColor", + "PseudoColor", + "TrueColor", + "DirectColor" +}; +#endif + static int rankings[3][6] = { + {TrueColor,DirectColor,PseudoColor,GrayScale,StaticGray,-1}, + {PseudoColor,GrayScale,StaticGray,-1}, + {PseudoColor,GrayScale,StaticGray,-1} + }; + XVisualInfo *xvi; + int vismatched; + register int i, j; + + if (greyscale) { + ourrank = rankings[2]; + if (maxcolors < 2) maxcolors = 256; + } else if (maxcolors >= 2 && maxcolors <= 256) + ourrank = rankings[1]; + else { + ourrank = rankings[0]; + maxcolors = 256; + } + /* find best visual */ + ourvis.screen = ourscreen; + xvi = XGetVisualInfo(thedisplay,VisualScreenMask,&ourvis,&vismatched); + if (xvi == NULL) + quiterr("no visuals for this screen!"); +#ifdef DEBUG + fprintf(stderr, "Supported visuals:\n"); + for (i = 0; i < vismatched; i++) + fprintf(stderr, "\ttype %s, depth %d\n", + vistype[xvi[i].class], xvi[i].depth); +#endif + for (i = 0, j = 1; j < vismatched; j++) + if (viscmp(&xvi[i],&xvi[j]) > 0) + i = j; + /* compare to least acceptable */ + for (j = 0; ourrank[j++] != -1; ) + ; + ourvis.class = ourrank[--j]; + ourvis.depth = 1; + if (viscmp(&xvi[i],&ourvis) > 0) + quiterr("inadequate visuals on this screen"); + /* OK, we'll use it */ + copystruct(&ourvis, &xvi[i]); +#ifdef DEBUG + fprintf(stderr, "Selected visual type %s, depth %d\n", + vistype[ourvis.class], ourvis.depth); +#endif + /* make appropriate adjustments */ + if (ourvis.class == GrayScale || ourvis.class == StaticGray) + greyscale = 1; + if (ourvis.depth <= 8 && ourvis.colormap_size < maxcolors) + maxcolors = ourvis.colormap_size; + if (maxcolors > 4) + maxcolors -= 2; + if (ourvis.class == StaticGray) { + ourblack = 0; + ourwhite = 255; + } else if (ourvis.class == PseudoColor) { + ourblack = BlackPixel(thedisplay,ourscreen); + ourwhite = WhitePixel(thedisplay,ourscreen); + if ((ourblack|ourwhite) & ~255L) { + ourblack = 0; + ourwhite = 1; + } + } else { + ourblack = 0; + ourwhite = ourvis.red_mask|ourvis.green_mask|ourvis.blue_mask; + } + XFree((char *)xvi); +} + + getras() /* get raster file */ { colormap ourmap; @@ -303,19 +453,17 @@ getras() /* get raster file */ ourdata = (unsigned char *)malloc(ymax*((xmax+7)/8)); if (ourdata == NULL) goto fail; - ourras = make_raster(thedisplay, ourscreen, 1, ourdata, + ourras = make_raster(thedisplay, &ourvis, 1, ourdata, xmax, ymax, 8); if (ourras == NULL) goto fail; getmono(); - } else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) - /* kludge for DirectColor */ - || XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { - ourdata = (unsigned char *)malloc(xmax*ymax*3); + } else if (ourvis.class == TrueColor || ourvis.class == DirectColor) { + ourdata = (unsigned char *)malloc(4*xmax*ymax); if (ourdata == NULL) goto fail; - ourras = make_raster(thedisplay, ourscreen, 24, ourdata, - xmax, ymax, 8); + ourras = make_raster(thedisplay, &ourvis, 32, + ourdata, xmax, ymax, 32); if (ourras == NULL) goto fail; getfull(); @@ -323,18 +471,23 @@ getras() /* get raster file */ ourdata = (unsigned char *)malloc(xmax*ymax); if (ourdata == NULL) goto fail; - ourras = make_raster(thedisplay, ourscreen, 8, ourdata, + ourras = make_raster(thedisplay, &ourvis, 8, ourdata, xmax, ymax, 8); if (ourras == NULL) goto fail; - if (greyscale) - biq(dither,maxcolors,1,ourmap); - else - ciq(dither,maxcolors,1,ourmap); - if (init_rcolors(ourras, ourmap[0], ourmap[1], ourmap[2]) == 0) - goto fail; + if (ourvis.class == StaticGray) + getgrey(); + else { + if (greyscale) + biq(dither,maxcolors,1,ourmap); + else + ciq(dither,maxcolors,1,ourmap); + if (init_rcolors(ourras, ourmap[0], + ourmap[1], ourmap[2]) == 0) + goto fail; + } } - return; + return; fail: quiterr("could not create raster image"); } @@ -362,10 +515,11 @@ getevent() /* process the next event */ case MapNotify: map_rcolors(ourras, wind); if (fast) - make_rpixmap(ourras); + make_rpixmap(ourras, wind); break; case UnmapNotify: - unmap_rcolors(ourras); + if (!fast) + unmap_rcolors(ourras); break; case Expose: redraw(e.e.x, e.e.y, e.e.width, e.e.height); @@ -388,6 +542,7 @@ XKeyPressedEvent *ekey; XColor cvx; int com, n; double comp; + FLOAT hv[2]; FVECT rorg, rdir; n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); @@ -396,7 +551,7 @@ XKeyPressedEvent *ekey; com = buf[0]; switch (com) { /* interpret command */ case 'q': - case CTRL(D): /* quit */ + case CTRL('D'): /* quit */ quit(0); case '\n': case '\r': @@ -410,7 +565,7 @@ XKeyPressedEvent *ekey; sprintf(buf, "%.3f", intens(cval)/exposure); break; case 'l': /* luminance */ - sprintf(buf, "%.0fn", bright(cval)*683.0/exposure); + sprintf(buf, "%.0fL", luminance(cval)/exposure); break; case 'c': /* color */ comp = pow(2.0, (double)scale); @@ -436,7 +591,9 @@ XKeyPressedEvent *ekey; XStoreColor(thedisplay, ourras->cmap, &cvx); return(0); case 'p': /* position */ - sprintf(buf, "(%d,%d)", ekey->x-xoff, ymax-1-ekey->y+yoff); + pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); + sprintf(buf, "(%d,%d)", (int)(hv[0]*inpres.xr), + (int)(hv[1]*inpres.yr)); XDrawImageString(thedisplay, wind, ourgc, ekey->x, ekey->y, buf, strlen(buf)); return(0); @@ -445,9 +602,8 @@ XKeyPressedEvent *ekey; XBell(thedisplay, 0); return(-1); } - if (viewray(rorg, rdir, &ourview, - (ekey->x-xoff+.5)/xmax, - (ymax-1-ekey->y+yoff+.5)/ymax) < 0) + pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); + if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) return(-1); printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); @@ -469,8 +625,8 @@ XKeyPressedEvent *ekey; free_raster(ourras); getras(); /* fall through */ - case CTRL(R): /* redraw */ - case CTRL(L): + case CTRL('R'): /* redraw */ + case CTRL('L'): unmap_rcolors(ourras); XClearWindow(thedisplay, wind); map_rcolors(ourras, wind); @@ -562,6 +718,8 @@ int x0, y0, x1, y1; avgbox(clr) /* average color over current box */ COLOR clr; { + static COLOR lc; + static int ll, lr, lt, lb; int left, right, top, bottom; int y; double d; @@ -585,6 +743,10 @@ COLOR clr; bottom = ymax; if (top >= bottom) return(-1); + if (left == ll && right == lr && top == lt && bottom == lb) { + copycolor(clr, lc); + return; + } for (y = top; y < bottom; y++) { if (getscan(y) == -1) return(-1); @@ -595,6 +757,8 @@ COLOR clr; } d = 1.0/((right-left)*(bottom-top)); scalecolor(clr, d); + ll = left; lr = right; lt = top; lb = bottom; + copycolor(lc, clr); return(0); } @@ -603,39 +767,138 @@ getmono() /* get monochrome data */ { register unsigned char *dp; register int x, err; - int y; - rgbpixel *inl; + int y, errp; short *cerr; - if ((inl = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL - || (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) + if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) quiterr("out of memory in getmono"); dp = ourdata - 1; for (y = 0; y < ymax; y++) { - picreadline3(y, inl); + if (getscan(y) < 0) + quiterr("seek error in getmono"); + normcolrs(scanline, xmax, scale); + add2icon(y, scanline); err = 0; for (x = 0; x < xmax; x++) { if (!(x&7)) *++dp = 0; - err += rgb_bright(&inl[x]) + cerr[x]; + errp = err; + err += normbright(scanline[x]) + cerr[x]; if (err > 127) err -= 255; else *dp |= 1<<(7-(x&07)); - cerr[x] = err >>= 1; + err /= 3; + cerr[x] = err + errp; } } - free((char *)inl); free((char *)cerr); } +add2icon(y, scan) /* add a scanline to our icon data */ +int y; +COLR *scan; +{ + static short cerr[ICONSIZ]; + static int ynext; + static char *dp; + register int err; + register int x, ti; + int errp; + + if (iconheight == 0) { /* initialize */ + if (xmax <= ICONSIZ && ymax <= ICONSIZ) { + iconwidth = xmax; + iconheight = ymax; + } else if (xmax > ymax) { + iconwidth = ICONSIZ; + iconheight = ICONSIZ*ymax/xmax; + if (iconheight < 1) + iconheight = 1; + } else { + iconwidth = ICONSIZ*xmax/ymax; + if (iconwidth < 1) + iconwidth = 1; + iconheight = ICONSIZ; + } + ynext = 0; + dp = icondata - 1; + } + if (y < ynext*ymax/iconheight) /* skip this one */ + return; + err = 0; + for (x = 0; x < iconwidth; x++) { + if (!(x&7)) + *++dp = 0; + errp = err; + ti = x*xmax/iconwidth; + err += normbright(scan[ti]) + cerr[x]; + if (err > 127) + err -= 255; + else + *dp |= 1<<(x&07); + err /= 3; + cerr[x] = err + errp; + } + ynext++; +} + + getfull() /* get full (24-bit) data */ { int y; + register unsigned long *dp; + register int x; + /* set gamma correction */ + setcolrgam(gamcor); + /* read and convert file */ + dp = (unsigned long *)ourdata; + for (y = 0; y < ymax; y++) { + if (getscan(y) < 0) + quiterr("seek error in getfull"); + if (scale) + shiftcolrs(scanline, xmax, scale); + colrs_gambs(scanline, xmax); + add2icon(y, scanline); + if (ourras->image->blue_mask & 1) + for (x = 0; x < xmax; x++) + *dp++ = scanline[x][RED] << 16 | + scanline[x][GRN] << 8 | + scanline[x][BLU] ; + else + for (x = 0; x < xmax; x++) + *dp++ = scanline[x][RED] | + scanline[x][GRN] << 8 | + scanline[x][BLU] << 16 ; + } +} - for (y = 0; y < ymax; y++) - picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); + +getgrey() /* get greyscale data */ +{ + int y; + register unsigned char *dp; + register int x; + /* set gamma correction */ + setcolrgam(gamcor); + /* read and convert file */ + dp = ourdata; + for (y = 0; y < ymax; y++) { + if (getscan(y) < 0) + quiterr("seek error in getfull"); + if (scale) + shiftcolrs(scanline, xmax, scale); + colrs_gambs(scanline, xmax); + add2icon(y, scanline); + if (ourvis.colormap_size < 256) + for (x = 0; x < xmax; x++) + *dp++ = ((long)normbright(scanline[x]) * + ourvis.colormap_size + 128) >> 8; + else + for (x = 0; x < xmax; x++) + *dp++ = normbright(scanline[x]); + } } @@ -697,6 +960,7 @@ register rgbpixel *l3; quiterr("cannot seek for picreadline"); /* convert scanline */ normcolrs(scanline, xmax, scale); + add2icon(y, scanline); for (i = 0; i < xmax; i++) { l3[i].r = scanline[i][RED]; l3[i].g = scanline[i][GRN]; @@ -720,7 +984,7 @@ colormap map; register int i, val; for (i = 0; i < 256; i++) { - val = pow(i/256.0, 1.0/gamcor) * 256.0; + val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; map[0][i] = map[1][i] = map[2][i] = val; } } @@ -729,7 +993,7 @@ colormap map; picwritecm(map) /* handled elsewhere */ colormap map; { -#ifdef DEBUG +#if 0 register int i; for (i = 0; i < 256; i++)