--- ray/src/px/x11image.c 1990/03/02 14:58:57 1.4 +++ ray/src/px/x11image.c 1990/12/21 17:20:11 1.12 @@ -43,6 +43,8 @@ static char SCCSid[] = "$SunId$ LBL"; #define ourroot RootWindow(thedisplay,ourscreen) #define ourgc DefaultGC(thedisplay,ourscreen) +#define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) + #define redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras) double gamcor = 2.2; /* gamma correction */ @@ -75,6 +77,8 @@ int cury = 0; /* current scan location */ double exposure = 1.0; /* exposure compensation used */ +GC revgc; /* graphics context with GXinvert */ + XRASTER *ourras; /* our stored image */ unsigned char *ourdata; /* our image data */ @@ -222,17 +226,22 @@ init() /* get data and open window */ CWBackPixel|CWBorderPixel, &ourwinattr); if (wind == 0) quiterr("can't create window"); + width = xmax; + height = ymax; fontid = XLoadFont(thedisplay, FONTNAME); if (fontid == 0) quiterr("can't 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)); 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 { @@ -300,7 +309,9 @@ getras() /* get raster file */ if (ourras == NULL) goto fail; getmono(); - } else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) { + } else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) + /* kludge for DirectColor */ + || XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { ourdata = (unsigned char *)malloc(xmax*ymax*3); if (ourdata == NULL) goto fail; @@ -326,7 +337,7 @@ getras() /* get raster file */ } return; fail: - quit("could not create raster image"); + quiterr("could not create raster image"); } @@ -435,9 +446,10 @@ XKeyPressedEvent *ekey; XBell(thedisplay, 0); return(-1); } - viewray(rorg, rdir, &ourview, + if (viewray(rorg, rdir, &ourview, (ekey->x-xoff+.5)/xmax, - (ymax-1-ekey->y+yoff+.5)/ymax); + (ymax-1-ekey->y+yoff+.5)/ymax) < 0) + return(-1); printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); fflush(stdout); @@ -485,15 +497,19 @@ XButtonPressedEvent *ebut; XButtonReleasedEvent b; XPointerMovedEvent m; } e; - int nxo, nyo; + int mxo, myo; XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); while (e.u.type == MotionNotify) { - nxo = xoff + e.m.x - ebut->x; - nyo = yoff + e.m.y - ebut->y; - revbox(nxo, nyo, nxo+xmax, nyo+ymax); + mxo = e.m.x; + myo = e.m.y; + revline(ebut->x, ebut->y, mxo, myo); + revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, + xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); - revbox(nxo, nyo, nxo+xmax, nyo+ymax); + revline(ebut->x, ebut->y, mxo, myo); + revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, + xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); } xoff += e.b.x - ebut->x; yoff += e.b.y - ebut->y; @@ -537,19 +553,13 @@ XButtonPressedEvent *ebut; revbox(x0, y0, x1, y1) /* draw box with reversed lines */ int x0, y0, x1, y1; { - static GC mygc = 0; + revline(x0, y0, x1, y0); + revline(x0, y1, x1, y1); + revline(x0, y0, x0, y1); + revline(x1, y0, x1, y1); +} - if (mygc == 0) { - mygc = XCreateGC(thedisplay, wind, 0, 0); - XSetFunction(thedisplay, mygc, GXinvert); - } - XDrawLine(thedisplay, wind, mygc, x0, y0, x1, y0); - XDrawLine(thedisplay, wind, mygc, x0, y1, x1, y1); - XDrawLine(thedisplay, wind, mygc, x0, y0, x0, y1); - XDrawLine(thedisplay, wind, mygc, x1, y0, x1, y1); -} /* end of revbox */ - avgbox(clr) /* average color over current box */ COLOR clr; { @@ -595,20 +605,20 @@ getmono() /* get monochrome data */ register unsigned char *dp; register int x, err; int y; - rgbpixel *inline; short *cerr; - if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL - || (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) - quit("out of memory in getmono"); + 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, inline); + if (getscan(y) < 0) + quiterr("seek error in getmono"); + normcolrs(scanline, xmax, scale); err = 0; for (x = 0; x < xmax; x++) { if (!(x&7)) *++dp = 0; - err += rgb_bright(&inline[x]) + cerr[x]; + err += normbright(scanline[x]) + cerr[x]; if (err > 127) err -= 255; else @@ -616,7 +626,6 @@ getmono() /* get monochrome data */ cerr[x] = err >>= 1; } } - free((char *)inline); free((char *)cerr); } @@ -624,9 +633,24 @@ getmono() /* get monochrome data */ getfull() /* get full (24-bit) data */ { int y; - - for (y = 0; y < ymax; y++) - picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); + 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); + for (x = 0; x < xmax; x++) { + *dp++ = scanline[x][RED]; + *dp++ = scanline[x][GRN]; + *dp++ = scanline[x][BLU]; + } + } } @@ -665,7 +689,7 @@ int y; if (scanpos == NULL || scanpos[y] == -1) return(-1); if (fseek(fin, scanpos[y], 0) == -1) - quit("fseek error"); + quiterr("fseek error"); cury = y; } else if (scanpos != NULL) scanpos[y] = ftell(fin); @@ -711,7 +735,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; } }