37 |
|
|
38 |
|
#define BORWIDTH 5 /* border width */ |
39 |
|
|
40 |
+ |
#define ICONSIZ (8*10) /* maximum icon dimension (even 8) */ |
41 |
+ |
|
42 |
|
#define ourscreen DefaultScreen(thedisplay) |
43 |
|
#define ourblack BlackPixel(thedisplay,ourscreen) |
44 |
|
#define ourwhite WhitePixel(thedisplay,ourscreen) |
45 |
|
#define ourroot RootWindow(thedisplay,ourscreen) |
46 |
|
#define ourgc DefaultGC(thedisplay,ourscreen) |
47 |
|
|
48 |
+ |
#define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) |
49 |
+ |
|
50 |
|
#define redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras) |
51 |
|
|
52 |
|
double gamcor = 2.2; /* gamma correction */ |
79 |
|
|
80 |
|
double exposure = 1.0; /* exposure compensation used */ |
81 |
|
|
82 |
+ |
int wrongformat = 0; /* input in another format? */ |
83 |
+ |
|
84 |
+ |
GC revgc; /* graphics context with GXinvert */ |
85 |
+ |
|
86 |
|
XRASTER *ourras; /* our stored image */ |
87 |
|
unsigned char *ourdata; /* our image data */ |
88 |
|
|
92 |
|
|
93 |
|
char *geometry = NULL; /* geometry specification */ |
94 |
|
|
95 |
+ |
char icondata[ICONSIZ*ICONSIZ/8]; /* icon bitmap data */ |
96 |
+ |
int iconwidth = 0, iconheight = 0; |
97 |
+ |
|
98 |
|
char *progname; |
99 |
|
|
100 |
|
char errmsg[128]; |
163 |
|
} else if (i != argc) |
164 |
|
goto userr; |
165 |
|
/* get header */ |
166 |
< |
getheader(fin, headline); |
166 |
> |
getheader(fin, headline, NULL); |
167 |
|
/* get picture dimensions */ |
168 |
< |
if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
169 |
< |
quiterr("bad picture size"); |
168 |
> |
if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
169 |
> |
quiterr("bad picture format"); |
170 |
|
/* set view parameters */ |
171 |
|
if (gotview && setview(&ourview) != NULL) |
172 |
|
gotview = 0; |
190 |
|
{ |
191 |
|
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
192 |
|
register char **an; |
193 |
+ |
char fmt[32]; |
194 |
|
|
195 |
|
if (isexpos(s)) |
196 |
|
exposure *= exposval(s); |
197 |
< |
else |
197 |
> |
else if (isformat(s)) { |
198 |
> |
formatval(fmt, s); |
199 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
200 |
> |
} else |
201 |
|
for (an = altname; *an != NULL; an++) |
202 |
|
if (!strncmp(*an, s, strlen(*an))) { |
203 |
|
if (sscanview(&ourview, s+strlen(*an)) > 0) |
209 |
|
|
210 |
|
init() /* get data and open window */ |
211 |
|
{ |
212 |
+ |
XWMHints ourxwmhints; |
213 |
+ |
XSetWindowAttributes ourwinattr; |
214 |
|
XSizeHints oursizhints; |
215 |
|
register int i; |
216 |
|
|
223 |
|
} |
224 |
|
if ((thedisplay = XOpenDisplay(NULL)) == NULL) |
225 |
|
quiterr("can't open display; DISPLAY variable set?"); |
209 |
– |
wind = XCreateSimpleWindow(thedisplay, |
210 |
– |
ourroot, 0, 0, xmax, ymax, BORWIDTH, ourblack, ourwhite); |
211 |
– |
if (wind == 0) |
212 |
– |
quiterr("can't create window"); |
226 |
|
if (maxcolors == 0) { /* get number of available colors */ |
227 |
|
i = DisplayPlanes(thedisplay,ourscreen); |
228 |
|
maxcolors = i > 8 ? 256 : 1<<i; |
229 |
|
if (maxcolors > 4) maxcolors -= 2; |
230 |
|
} |
231 |
+ |
/* store image */ |
232 |
+ |
getras(); |
233 |
+ |
/* open window */ |
234 |
+ |
ourwinattr.border_pixel = ourblack; |
235 |
+ |
ourwinattr.background_pixel = ourwhite; |
236 |
+ |
wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH, |
237 |
+ |
0, InputOutput, ourras->visual, |
238 |
+ |
CWBackPixel|CWBorderPixel, &ourwinattr); |
239 |
+ |
if (wind == 0) |
240 |
+ |
quiterr("can't create window"); |
241 |
+ |
width = xmax; |
242 |
+ |
height = ymax; |
243 |
|
fontid = XLoadFont(thedisplay, FONTNAME); |
244 |
|
if (fontid == 0) |
245 |
|
quiterr("can't get font"); |
246 |
|
XSetFont(thedisplay, ourgc, fontid); |
247 |
< |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
247 |
> |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
248 |
> |
XSetFunction(thedisplay, revgc, GXinvert); |
249 |
|
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
250 |
|
XC_diamond_cross)); |
251 |
|
if (geometry != NULL) { |
252 |
|
bzero((char *)&oursizhints, sizeof(oursizhints)); |
253 |
|
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
254 |
< |
&oursizhints.width, &oursizhints.height); |
254 |
> |
(unsigned *)&oursizhints.width, |
255 |
> |
(unsigned *)&oursizhints.height); |
256 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
257 |
|
oursizhints.flags |= USSize; |
258 |
|
else { |
271 |
|
} |
272 |
|
XSetNormalHints(thedisplay, wind, &oursizhints); |
273 |
|
} |
274 |
< |
/* store image */ |
275 |
< |
getras(); |
274 |
> |
ourxwmhints.flags = InputHint|IconPixmapHint; |
275 |
> |
ourxwmhints.input = True; |
276 |
> |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
277 |
> |
wind, icondata, iconwidth, iconheight); |
278 |
> |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
279 |
|
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
280 |
|
|ButtonMotionMask|StructureNotifyMask |
281 |
|
|KeyPressMask|ExposureMask); |
282 |
|
XMapWindow(thedisplay, wind); |
283 |
+ |
/* store name last as ready signal */ |
284 |
+ |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
285 |
|
return; |
286 |
|
memerr: |
287 |
|
quiterr("out of memory"); |
327 |
|
if (ourras == NULL) |
328 |
|
goto fail; |
329 |
|
getmono(); |
330 |
< |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) { |
330 |
> |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) |
331 |
> |
/* kludge for DirectColor */ |
332 |
> |
|| XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { |
333 |
|
ourdata = (unsigned char *)malloc(xmax*ymax*3); |
334 |
|
if (ourdata == NULL) |
335 |
|
goto fail; |
355 |
|
} |
356 |
|
return; |
357 |
|
fail: |
358 |
< |
quit("could not create raster image"); |
358 |
> |
quiterr("could not create raster image"); |
359 |
|
} |
360 |
|
|
361 |
|
|
429 |
|
sprintf(buf, "%.3f", intens(cval)/exposure); |
430 |
|
break; |
431 |
|
case 'l': /* luminance */ |
432 |
< |
sprintf(buf, "%.0fn", bright(cval)*683.0/exposure); |
432 |
> |
sprintf(buf, "%.0fL", luminance(cval)/exposure); |
433 |
|
break; |
434 |
|
case 'c': /* color */ |
435 |
|
comp = pow(2.0, (double)scale); |
464 |
|
XBell(thedisplay, 0); |
465 |
|
return(-1); |
466 |
|
} |
467 |
< |
viewray(rorg, rdir, &ourview, |
467 |
> |
if (viewray(rorg, rdir, &ourview, |
468 |
|
(ekey->x-xoff+.5)/xmax, |
469 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax); |
469 |
> |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
470 |
> |
return(-1); |
471 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
472 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
473 |
|
fflush(stdout); |
515 |
|
XButtonReleasedEvent b; |
516 |
|
XPointerMovedEvent m; |
517 |
|
} e; |
518 |
< |
int nxo, nyo; |
518 |
> |
int mxo, myo; |
519 |
|
|
520 |
|
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
521 |
|
while (e.u.type == MotionNotify) { |
522 |
< |
nxo = xoff + e.m.x - ebut->x; |
523 |
< |
nyo = yoff + e.m.y - ebut->y; |
524 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
522 |
> |
mxo = e.m.x; |
523 |
> |
myo = e.m.y; |
524 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
525 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
526 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
527 |
|
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
528 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
528 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
529 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
530 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
531 |
|
} |
532 |
|
xoff += e.b.x - ebut->x; |
533 |
|
yoff += e.b.y - ebut->y; |
571 |
|
revbox(x0, y0, x1, y1) /* draw box with reversed lines */ |
572 |
|
int x0, y0, x1, y1; |
573 |
|
{ |
574 |
< |
static GC mygc = 0; |
574 |
> |
revline(x0, y0, x1, y0); |
575 |
> |
revline(x0, y1, x1, y1); |
576 |
> |
revline(x0, y0, x0, y1); |
577 |
> |
revline(x1, y0, x1, y1); |
578 |
> |
} |
579 |
|
|
537 |
– |
if (mygc == 0) { |
538 |
– |
mygc = XCreateGC(thedisplay, wind, 0, 0); |
539 |
– |
XSetFunction(thedisplay, mygc, GXinvert); |
540 |
– |
} |
541 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y0, x1, y0); |
542 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y1, x1, y1); |
543 |
– |
XDrawLine(thedisplay, wind, mygc, x0, y0, x0, y1); |
544 |
– |
XDrawLine(thedisplay, wind, mygc, x1, y0, x1, y1); |
545 |
– |
} /* end of revbox */ |
580 |
|
|
547 |
– |
|
581 |
|
avgbox(clr) /* average color over current box */ |
582 |
|
COLOR clr; |
583 |
|
{ |
623 |
|
register unsigned char *dp; |
624 |
|
register int x, err; |
625 |
|
int y; |
593 |
– |
rgbpixel *inline; |
626 |
|
short *cerr; |
627 |
|
|
628 |
< |
if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL |
629 |
< |
|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
598 |
< |
quit("out of memory in getmono"); |
628 |
> |
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
629 |
> |
quiterr("out of memory in getmono"); |
630 |
|
dp = ourdata - 1; |
631 |
|
for (y = 0; y < ymax; y++) { |
632 |
< |
picreadline3(y, inline); |
632 |
> |
if (getscan(y) < 0) |
633 |
> |
quiterr("seek error in getmono"); |
634 |
> |
normcolrs(scanline, xmax, scale); |
635 |
> |
add2icon(y, scanline); |
636 |
|
err = 0; |
637 |
|
for (x = 0; x < xmax; x++) { |
638 |
|
if (!(x&7)) |
639 |
|
*++dp = 0; |
640 |
< |
err += rgb_bright(&inline[x]) + cerr[x]; |
640 |
> |
err += normbright(scanline[x]) + cerr[x]; |
641 |
|
if (err > 127) |
642 |
|
err -= 255; |
643 |
|
else |
645 |
|
cerr[x] = err >>= 1; |
646 |
|
} |
647 |
|
} |
614 |
– |
free((char *)inline); |
648 |
|
free((char *)cerr); |
649 |
|
} |
650 |
|
|
651 |
|
|
652 |
+ |
add2icon(y, scan) /* add a scanline to our icon data */ |
653 |
+ |
int y; |
654 |
+ |
COLR *scan; |
655 |
+ |
{ |
656 |
+ |
static short cerr[ICONSIZ]; |
657 |
+ |
static int ynext; |
658 |
+ |
static char *dp; |
659 |
+ |
register int err; |
660 |
+ |
register int x, ti; |
661 |
+ |
|
662 |
+ |
if (iconheight == 0) { /* initialize */ |
663 |
+ |
if (xmax <= ICONSIZ && ymax <= ICONSIZ) { |
664 |
+ |
iconwidth = xmax; |
665 |
+ |
iconheight = ymax; |
666 |
+ |
} else if (xmax > ymax) { |
667 |
+ |
iconwidth = ICONSIZ; |
668 |
+ |
iconheight = ICONSIZ*ymax/xmax; |
669 |
+ |
} else { |
670 |
+ |
iconwidth = ICONSIZ*xmax/ymax; |
671 |
+ |
iconheight = ICONSIZ; |
672 |
+ |
} |
673 |
+ |
ynext = 0; |
674 |
+ |
dp = icondata - 1; |
675 |
+ |
} |
676 |
+ |
if (y < ynext*ymax/iconheight) /* skip this one */ |
677 |
+ |
return; |
678 |
+ |
err = 0; |
679 |
+ |
for (x = 0; x < iconwidth; x++) { |
680 |
+ |
if (!(x&7)) |
681 |
+ |
*++dp = 0; |
682 |
+ |
ti = x*xmax/iconwidth; |
683 |
+ |
err += normbright(scan[ti]) + cerr[x]; |
684 |
+ |
if (err > 127) |
685 |
+ |
err -= 255; |
686 |
+ |
else |
687 |
+ |
*dp |= 1<<(x&07); |
688 |
+ |
cerr[x] = err >>= 1; |
689 |
+ |
} |
690 |
+ |
ynext++; |
691 |
+ |
} |
692 |
+ |
|
693 |
+ |
|
694 |
|
getfull() /* get full (24-bit) data */ |
695 |
|
{ |
696 |
|
int y; |
697 |
< |
|
698 |
< |
for (y = 0; y < ymax; y++) |
699 |
< |
picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); |
697 |
> |
register unsigned char *dp; |
698 |
> |
register int x; |
699 |
> |
/* set gamma correction */ |
700 |
> |
setcolrgam(gamcor); |
701 |
> |
/* read and convert file */ |
702 |
> |
dp = ourdata; |
703 |
> |
for (y = 0; y < ymax; y++) { |
704 |
> |
if (getscan(y) < 0) |
705 |
> |
quiterr("seek error in getfull"); |
706 |
> |
if (scale) |
707 |
> |
shiftcolrs(scanline, xmax, scale); |
708 |
> |
colrs_gambs(scanline, xmax); |
709 |
> |
add2icon(y, scanline); |
710 |
> |
for (x = 0; x < xmax; x++) { |
711 |
> |
*dp++ = scanline[x][RED]; |
712 |
> |
*dp++ = scanline[x][GRN]; |
713 |
> |
*dp++ = scanline[x][BLU]; |
714 |
> |
} |
715 |
> |
} |
716 |
|
} |
717 |
|
|
718 |
|
|
751 |
|
if (scanpos == NULL || scanpos[y] == -1) |
752 |
|
return(-1); |
753 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
754 |
< |
quit("fseek error"); |
754 |
> |
quiterr("fseek error"); |
755 |
|
cury = y; |
756 |
|
} else if (scanpos != NULL) |
757 |
|
scanpos[y] = ftell(fin); |
774 |
|
quiterr("cannot seek for picreadline"); |
775 |
|
/* convert scanline */ |
776 |
|
normcolrs(scanline, xmax, scale); |
777 |
+ |
add2icon(y, scanline); |
778 |
|
for (i = 0; i < xmax; i++) { |
779 |
|
l3[i].r = scanline[i][RED]; |
780 |
|
l3[i].g = scanline[i][GRN]; |
798 |
|
register int i, val; |
799 |
|
|
800 |
|
for (i = 0; i < 256; i++) { |
801 |
< |
val = pow(i/256.0, 1.0/gamcor) * 256.0; |
801 |
> |
val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; |
802 |
|
map[0][i] = map[1][i] = map[2][i] = val; |
803 |
|
} |
804 |
|
} |