30 |
|
#include "pic.h" |
31 |
|
#include "x11raster.h" |
32 |
|
#include "random.h" |
33 |
+ |
#include "x11icon.h" |
34 |
|
|
35 |
|
#define FONTNAME "8x13" /* text font we'll use */ |
36 |
|
|
44 |
|
#define ourroot RootWindow(thedisplay,ourscreen) |
45 |
|
#define ourgc DefaultGC(thedisplay,ourscreen) |
46 |
|
|
47 |
+ |
#define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) |
48 |
+ |
|
49 |
|
#define redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras) |
50 |
|
|
51 |
|
double gamcor = 2.2; /* gamma correction */ |
78 |
|
|
79 |
|
double exposure = 1.0; /* exposure compensation used */ |
80 |
|
|
81 |
+ |
int wrongformat = 0; /* input in another format? */ |
82 |
+ |
|
83 |
+ |
GC revgc; /* graphics context with GXinvert */ |
84 |
+ |
|
85 |
|
XRASTER *ourras; /* our stored image */ |
86 |
|
unsigned char *ourdata; /* our image data */ |
87 |
|
|
159 |
|
} else if (i != argc) |
160 |
|
goto userr; |
161 |
|
/* get header */ |
162 |
< |
getheader(fin, headline); |
162 |
> |
getheader(fin, headline, NULL); |
163 |
|
/* get picture dimensions */ |
164 |
< |
if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
165 |
< |
quiterr("bad picture size"); |
164 |
> |
if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
165 |
> |
quiterr("bad picture format"); |
166 |
|
/* set view parameters */ |
167 |
|
if (gotview && setview(&ourview) != NULL) |
168 |
|
gotview = 0; |
186 |
|
{ |
187 |
|
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
188 |
|
register char **an; |
189 |
+ |
char fmt[32]; |
190 |
|
|
191 |
|
if (isexpos(s)) |
192 |
|
exposure *= exposval(s); |
193 |
< |
else |
193 |
> |
else if (isformat(s)) { |
194 |
> |
formatval(fmt, s); |
195 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
196 |
> |
} else |
197 |
|
for (an = altname; *an != NULL; an++) |
198 |
|
if (!strncmp(*an, s, strlen(*an))) { |
199 |
|
if (sscanview(&ourview, s+strlen(*an)) > 0) |
205 |
|
|
206 |
|
init() /* get data and open window */ |
207 |
|
{ |
208 |
+ |
XWMHints ourxwmhints; |
209 |
+ |
XSetWindowAttributes ourwinattr; |
210 |
|
XSizeHints oursizhints; |
211 |
|
register int i; |
212 |
|
|
219 |
|
} |
220 |
|
if ((thedisplay = XOpenDisplay(NULL)) == NULL) |
221 |
|
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"); |
222 |
|
if (maxcolors == 0) { /* get number of available colors */ |
223 |
|
i = DisplayPlanes(thedisplay,ourscreen); |
224 |
|
maxcolors = i > 8 ? 256 : 1<<i; |
225 |
|
if (maxcolors > 4) maxcolors -= 2; |
226 |
|
} |
227 |
+ |
/* store image */ |
228 |
+ |
getras(); |
229 |
+ |
/* open window */ |
230 |
+ |
ourwinattr.border_pixel = ourblack; |
231 |
+ |
ourwinattr.background_pixel = ourwhite; |
232 |
+ |
wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH, |
233 |
+ |
0, InputOutput, ourras->visual, |
234 |
+ |
CWBackPixel|CWBorderPixel, &ourwinattr); |
235 |
+ |
if (wind == 0) |
236 |
+ |
quiterr("can't create window"); |
237 |
+ |
width = xmax; |
238 |
+ |
height = ymax; |
239 |
|
fontid = XLoadFont(thedisplay, FONTNAME); |
240 |
|
if (fontid == 0) |
241 |
|
quiterr("can't get font"); |
242 |
|
XSetFont(thedisplay, ourgc, fontid); |
243 |
+ |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
244 |
+ |
XSetFunction(thedisplay, revgc, GXinvert); |
245 |
|
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
246 |
|
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
247 |
|
XC_diamond_cross)); |
248 |
|
if (geometry != NULL) { |
249 |
|
bzero((char *)&oursizhints, sizeof(oursizhints)); |
250 |
|
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
251 |
< |
&oursizhints.width, &oursizhints.height); |
251 |
> |
(unsigned *)&oursizhints.width, |
252 |
> |
(unsigned *)&oursizhints.height); |
253 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
254 |
|
oursizhints.flags |= USSize; |
255 |
|
else { |
268 |
|
} |
269 |
|
XSetNormalHints(thedisplay, wind, &oursizhints); |
270 |
|
} |
271 |
< |
/* store image */ |
272 |
< |
getras(); |
271 |
> |
ourxwmhints.flags = InputHint|IconPixmapHint; |
272 |
> |
ourxwmhints.input = True; |
273 |
> |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
274 |
> |
wind, x11icon_bits, x11icon_width, x11icon_height); |
275 |
> |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
276 |
|
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
277 |
|
|ButtonMotionMask|StructureNotifyMask |
278 |
|
|KeyPressMask|ExposureMask); |
322 |
|
if (ourras == NULL) |
323 |
|
goto fail; |
324 |
|
getmono(); |
325 |
< |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) { |
325 |
> |
} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo) |
326 |
> |
/* kludge for DirectColor */ |
327 |
> |
|| XMatchVisualInfo(thedisplay,ourscreen,24,DirectColor,&vinfo)) { |
328 |
|
ourdata = (unsigned char *)malloc(xmax*ymax*3); |
329 |
|
if (ourdata == NULL) |
330 |
|
goto fail; |
350 |
|
} |
351 |
|
return; |
352 |
|
fail: |
353 |
< |
quit("could not create raster image"); |
353 |
> |
quiterr("could not create raster image"); |
354 |
|
} |
355 |
|
|
356 |
|
|
424 |
|
sprintf(buf, "%.3f", intens(cval)/exposure); |
425 |
|
break; |
426 |
|
case 'l': /* luminance */ |
427 |
< |
sprintf(buf, "%.0fn", bright(cval)*683.0/exposure); |
427 |
> |
sprintf(buf, "%.0fL", luminance(cval)/exposure); |
428 |
|
break; |
429 |
|
case 'c': /* color */ |
430 |
|
comp = pow(2.0, (double)scale); |
459 |
|
XBell(thedisplay, 0); |
460 |
|
return(-1); |
461 |
|
} |
462 |
< |
viewray(rorg, rdir, &ourview, |
462 |
> |
if (viewray(rorg, rdir, &ourview, |
463 |
|
(ekey->x-xoff+.5)/xmax, |
464 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax); |
464 |
> |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
465 |
> |
return(-1); |
466 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
467 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
468 |
|
fflush(stdout); |
510 |
|
XButtonReleasedEvent b; |
511 |
|
XPointerMovedEvent m; |
512 |
|
} e; |
513 |
< |
int nxo, nyo; |
513 |
> |
int mxo, myo; |
514 |
|
|
515 |
|
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
516 |
|
while (e.u.type == MotionNotify) { |
517 |
< |
nxo = xoff + e.m.x - ebut->x; |
518 |
< |
nyo = yoff + e.m.y - ebut->y; |
519 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
517 |
> |
mxo = e.m.x; |
518 |
> |
myo = e.m.y; |
519 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
520 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
521 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
522 |
|
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
523 |
< |
revbox(nxo, nyo, nxo+xmax, nyo+ymax); |
523 |
> |
revline(ebut->x, ebut->y, mxo, myo); |
524 |
> |
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
525 |
> |
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
526 |
|
} |
527 |
|
xoff += e.b.x - ebut->x; |
528 |
|
yoff += e.b.y - ebut->y; |
566 |
|
revbox(x0, y0, x1, y1) /* draw box with reversed lines */ |
567 |
|
int x0, y0, x1, y1; |
568 |
|
{ |
569 |
< |
static GC mygc = 0; |
569 |
> |
revline(x0, y0, x1, y0); |
570 |
> |
revline(x0, y1, x1, y1); |
571 |
> |
revline(x0, y0, x0, y1); |
572 |
> |
revline(x1, y0, x1, y1); |
573 |
> |
} |
574 |
|
|
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 */ |
575 |
|
|
547 |
– |
|
576 |
|
avgbox(clr) /* average color over current box */ |
577 |
|
COLOR clr; |
578 |
|
{ |
618 |
|
register unsigned char *dp; |
619 |
|
register int x, err; |
620 |
|
int y; |
593 |
– |
rgbpixel *inline; |
621 |
|
short *cerr; |
622 |
|
|
623 |
< |
if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL |
624 |
< |
|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
598 |
< |
quit("out of memory in getmono"); |
623 |
> |
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
624 |
> |
quiterr("out of memory in getmono"); |
625 |
|
dp = ourdata - 1; |
626 |
|
for (y = 0; y < ymax; y++) { |
627 |
< |
picreadline3(y, inline); |
627 |
> |
if (getscan(y) < 0) |
628 |
> |
quiterr("seek error in getmono"); |
629 |
> |
normcolrs(scanline, xmax, scale); |
630 |
|
err = 0; |
631 |
|
for (x = 0; x < xmax; x++) { |
632 |
|
if (!(x&7)) |
633 |
|
*++dp = 0; |
634 |
< |
err += rgb_bright(&inline[x]) + cerr[x]; |
634 |
> |
err += normbright(scanline[x]) + cerr[x]; |
635 |
|
if (err > 127) |
636 |
|
err -= 255; |
637 |
|
else |
639 |
|
cerr[x] = err >>= 1; |
640 |
|
} |
641 |
|
} |
614 |
– |
free((char *)inline); |
642 |
|
free((char *)cerr); |
643 |
|
} |
644 |
|
|
646 |
|
getfull() /* get full (24-bit) data */ |
647 |
|
{ |
648 |
|
int y; |
649 |
< |
|
650 |
< |
for (y = 0; y < ymax; y++) |
651 |
< |
picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); |
649 |
> |
register unsigned char *dp; |
650 |
> |
register int x; |
651 |
> |
/* set gamma correction */ |
652 |
> |
setcolrgam(gamcor); |
653 |
> |
/* read and convert file */ |
654 |
> |
dp = ourdata; |
655 |
> |
for (y = 0; y < ymax; y++) { |
656 |
> |
if (getscan(y) < 0) |
657 |
> |
quiterr("seek error in getfull"); |
658 |
> |
if (scale) |
659 |
> |
shiftcolrs(scanline, xmax, scale); |
660 |
> |
colrs_gambs(scanline, xmax); |
661 |
> |
for (x = 0; x < xmax; x++) { |
662 |
> |
*dp++ = scanline[x][RED]; |
663 |
> |
*dp++ = scanline[x][GRN]; |
664 |
> |
*dp++ = scanline[x][BLU]; |
665 |
> |
} |
666 |
> |
} |
667 |
|
} |
668 |
|
|
669 |
|
|
702 |
|
if (scanpos == NULL || scanpos[y] == -1) |
703 |
|
return(-1); |
704 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
705 |
< |
quit("fseek error"); |
705 |
> |
quiterr("fseek error"); |
706 |
|
cury = y; |
707 |
|
} else if (scanpos != NULL) |
708 |
|
scanpos[y] = ftell(fin); |
748 |
|
register int i, val; |
749 |
|
|
750 |
|
for (i = 0; i < 256; i++) { |
751 |
< |
val = pow(i/256.0, 1.0/gamcor) * 256.0; |
751 |
> |
val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; |
752 |
|
map[0][i] = map[1][i] = map[2][i] = val; |
753 |
|
} |
754 |
|
} |