43 |
|
#define ourroot RootWindow(thedisplay,ourscreen) |
44 |
|
#define ourgc DefaultGC(thedisplay,ourscreen) |
45 |
|
|
46 |
+ |
#define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) |
47 |
+ |
|
48 |
|
#define redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras) |
49 |
|
|
50 |
|
double gamcor = 2.2; /* gamma correction */ |
77 |
|
|
78 |
|
double exposure = 1.0; /* exposure compensation used */ |
79 |
|
|
80 |
+ |
GC revgc; /* graphics context with GXinvert */ |
81 |
+ |
|
82 |
|
XRASTER *ourras; /* our stored image */ |
83 |
|
unsigned char *ourdata; /* our image data */ |
84 |
|
|
226 |
|
CWBackPixel|CWBorderPixel, &ourwinattr); |
227 |
|
if (wind == 0) |
228 |
|
quiterr("can't create window"); |
229 |
+ |
width = xmax; |
230 |
+ |
height = ymax; |
231 |
|
fontid = XLoadFont(thedisplay, FONTNAME); |
232 |
|
if (fontid == 0) |
233 |
|
quiterr("can't get font"); |
234 |
|
XSetFont(thedisplay, ourgc, fontid); |
235 |
+ |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
236 |
+ |
XSetFunction(thedisplay, revgc, GXinvert); |
237 |
|
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
238 |
|
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
239 |
|
XC_diamond_cross)); |
240 |
|
if (geometry != NULL) { |
241 |
|
bzero((char *)&oursizhints, sizeof(oursizhints)); |
242 |
|
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
243 |
< |
&oursizhints.width, &oursizhints.height); |
243 |
> |
(unsigned *)&oursizhints.width, |
244 |
> |
(unsigned *)&oursizhints.height); |
245 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
246 |
|
oursizhints.flags |= USSize; |
247 |
|
else { |
309 |
|
if (ourras == NULL) |
310 |
|
goto fail; |
311 |
|
getmono(); |
312 |
< |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) { |
312 |
> |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) |
313 |
> |
/* kludge for DirectColor */ |
314 |
> |
|| XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { |
315 |
|
ourdata = (unsigned char *)malloc(xmax*ymax*3); |
316 |
|
if (ourdata == NULL) |
317 |
|
goto fail; |
337 |
|
} |
338 |
|
return; |
339 |
|
fail: |
340 |
< |
quit("could not create raster image"); |
340 |
> |
quiterr("could not create raster image"); |
341 |
|
} |
342 |
|
|
343 |
|
|
446 |
|
XBell(thedisplay, 0); |
447 |
|
return(-1); |
448 |
|
} |
449 |
< |
viewray(rorg, rdir, &ourview, |
449 |
> |
if (viewray(rorg, rdir, &ourview, |
450 |
|
(ekey->x-xoff+.5)/xmax, |
451 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax); |
451 |
> |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
452 |
> |
return(-1); |
453 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
454 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
455 |
|
fflush(stdout); |
497 |
|
XButtonReleasedEvent b; |
498 |
|
XPointerMovedEvent m; |
499 |
|
} e; |
500 |
< |
int nxo, nyo; |
500 |
> |
int mxo, myo; |
501 |
|
|
502 |
|
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
503 |
|
while (e.u.type == MotionNotify) { |
504 |
< |
nxo = xoff + e.m.x - ebut->x; |
505 |
< |
nyo = yoff + e.m.y - ebut->y; |
506 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
504 |
> |
mxo = e.m.x; |
505 |
> |
myo = e.m.y; |
506 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
507 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
508 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
509 |
|
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
510 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
510 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
511 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
512 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
513 |
|
} |
514 |
|
xoff += e.b.x - ebut->x; |
515 |
|
yoff += e.b.y - ebut->y; |
553 |
|
revbox(x0, y0, x1, y1) /* draw box with reversed lines */ |
554 |
|
int x0, y0, x1, y1; |
555 |
|
{ |
556 |
< |
static GC mygc = 0; |
556 |
> |
revline(x0, y0, x1, y0); |
557 |
> |
revline(x0, y1, x1, y1); |
558 |
> |
revline(x0, y0, x0, y1); |
559 |
> |
revline(x1, y0, x1, y1); |
560 |
> |
} |
561 |
|
|
542 |
– |
if (mygc == 0) { |
543 |
– |
mygc = XCreateGC(thedisplay, wind, 0, 0); |
544 |
– |
XSetFunction(thedisplay, mygc, GXinvert); |
545 |
– |
} |
546 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y0, x1, y0); |
547 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y1, x1, y1); |
548 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y0, x0, y1); |
549 |
– |
XDrawLine(thedisplay, wind, mygc, x1, y0, x1, y1); |
550 |
– |
} /* end of revbox */ |
562 |
|
|
552 |
– |
|
563 |
|
avgbox(clr) /* average color over current box */ |
564 |
|
COLOR clr; |
565 |
|
{ |
605 |
|
register unsigned char *dp; |
606 |
|
register int x, err; |
607 |
|
int y; |
598 |
– |
rgbpixel *inline; |
608 |
|
short *cerr; |
609 |
|
|
610 |
< |
if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL |
611 |
< |
|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
603 |
< |
quit("out of memory in getmono"); |
610 |
> |
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
611 |
> |
quiterr("out of memory in getmono"); |
612 |
|
dp = ourdata - 1; |
613 |
|
for (y = 0; y < ymax; y++) { |
614 |
< |
picreadline3(y, inline); |
614 |
> |
if (getscan(y) < 0) |
615 |
> |
quiterr("seek error in getmono"); |
616 |
> |
normcolrs(scanline, xmax, scale); |
617 |
|
err = 0; |
618 |
|
for (x = 0; x < xmax; x++) { |
619 |
|
if (!(x&7)) |
620 |
|
*++dp = 0; |
621 |
< |
err += rgb_bright(&inline[x]) + cerr[x]; |
621 |
> |
err += normbright(scanline[x]) + cerr[x]; |
622 |
|
if (err > 127) |
623 |
|
err -= 255; |
624 |
|
else |
626 |
|
cerr[x] = err >>= 1; |
627 |
|
} |
628 |
|
} |
619 |
– |
free((char *)inline); |
629 |
|
free((char *)cerr); |
630 |
|
} |
631 |
|
|
633 |
|
getfull() /* get full (24-bit) data */ |
634 |
|
{ |
635 |
|
int y; |
636 |
< |
|
637 |
< |
for (y = 0; y < ymax; y++) |
638 |
< |
picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); |
636 |
> |
register unsigned char *dp; |
637 |
> |
register int x; |
638 |
> |
/* set gamma correction */ |
639 |
> |
setcolrgam(gamcor); |
640 |
> |
/* read and convert file */ |
641 |
> |
dp = ourdata; |
642 |
> |
for (y = 0; y < ymax; y++) { |
643 |
> |
if (getscan(y) < 0) |
644 |
> |
quiterr("seek error in getfull"); |
645 |
> |
if (scale) |
646 |
> |
shiftcolrs(scanline, xmax, scale); |
647 |
> |
colrs_gambs(scanline, xmax); |
648 |
> |
for (x = 0; x < xmax; x++) { |
649 |
> |
*dp++ = scanline[x][RED]; |
650 |
> |
*dp++ = scanline[x][GRN]; |
651 |
> |
*dp++ = scanline[x][BLU]; |
652 |
> |
} |
653 |
> |
} |
654 |
|
} |
655 |
|
|
656 |
|
|
689 |
|
if (scanpos == NULL || scanpos[y] == -1) |
690 |
|
return(-1); |
691 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
692 |
< |
quit("fseek error"); |
692 |
> |
quiterr("fseek error"); |
693 |
|
cury = y; |
694 |
|
} else if (scanpos != NULL) |
695 |
|
scanpos[y] = ftell(fin); |
735 |
|
register int i, val; |
736 |
|
|
737 |
|
for (i = 0; i < 256; i++) { |
738 |
< |
val = pow(i/256.0, 1.0/gamcor) * 256.0; |
738 |
> |
val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; |
739 |
|
map[0][i] = map[1][i] = map[2][i] = val; |
740 |
|
} |
741 |
|
} |