| 119 |
|
Display *thedisplay; |
| 120 |
|
Atom closedownAtom, wmProtocolsAtom; |
| 121 |
|
|
| 122 |
< |
int noop() {} |
| 122 |
> |
int sigrecv; |
| 123 |
|
|
| 124 |
+ |
int onsig() { sigrecv++; } |
| 125 |
|
|
| 126 |
+ |
|
| 127 |
|
main(argc, argv) |
| 128 |
|
int argc; |
| 129 |
|
char *argv[]; |
| 181 |
|
if (i > argc) |
| 182 |
|
goto userr; |
| 183 |
|
while (i < argc-1) { |
| 184 |
+ |
sigrecv = 0; |
| 185 |
+ |
signal(SIGCONT, onsig); |
| 186 |
|
if ((pid=fork()) == 0) { /* a child for each picture */ |
| 187 |
|
parent = -1; |
| 188 |
|
break; |
| 190 |
|
if (pid < 0) |
| 191 |
|
quiterr("fork failed"); |
| 192 |
|
parent++; |
| 193 |
< |
signal(SIGCONT, noop); |
| 194 |
< |
pause(); /* wait for wake-up call */ |
| 193 |
> |
while (!sigrecv) |
| 194 |
> |
pause(); /* wait for wake-up call */ |
| 195 |
|
i++; |
| 196 |
|
} |
| 197 |
|
if (i < argc) { /* open picture file */ |
| 198 |
|
fname = argv[i]; |
| 199 |
|
fin = fopen(fname, "r"); |
| 200 |
< |
if (fin == NULL) { |
| 201 |
< |
sprintf(errmsg, "cannot open file \"%s\"", fname); |
| 198 |
< |
quiterr(errmsg); |
| 199 |
< |
} |
| 200 |
> |
if (fin == NULL) |
| 201 |
> |
quiterr("cannot open picture file"); |
| 202 |
|
} |
| 203 |
|
/* get header */ |
| 204 |
|
getheader(fin, headline, NULL); |
| 215 |
|
|
| 216 |
|
init(argc, argv); /* get file and open window */ |
| 217 |
|
|
| 218 |
< |
if (parent < 0) |
| 218 |
> |
if (parent < 0) { |
| 219 |
|
kill(getppid(), SIGCONT); /* signal parent if child */ |
| 220 |
< |
|
| 220 |
> |
sigrecv--; |
| 221 |
> |
} |
| 222 |
|
for ( ; ; ) |
| 223 |
|
getevent(); /* main loop */ |
| 224 |
|
userr: |
| 314 |
|
quiterr("cannot create window"); |
| 315 |
|
width = xmax; |
| 316 |
|
height = ymax; |
| 317 |
< |
xgcv.foreground = ourblack; |
| 315 |
< |
xgcv.background = ourwhite; |
| 317 |
> |
/* prepare graphics drawing context */ |
| 318 |
|
if ((xgcv.font = XLoadFont(thedisplay, FONTNAME)) == 0) |
| 319 |
|
quiterr("cannot get font"); |
| 320 |
+ |
xgcv.foreground = ourblack; |
| 321 |
+ |
xgcv.background = ourwhite; |
| 322 |
|
ourgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
| 323 |
|
GCFont, &xgcv); |
| 324 |
|
xgcv.function = GXinvert; |
| 354 |
|
quiterr(err) /* print message and exit */ |
| 355 |
|
char *err; |
| 356 |
|
{ |
| 357 |
< |
if (err != NULL) |
| 357 |
> |
register int es; |
| 358 |
> |
int cs; |
| 359 |
> |
|
| 360 |
> |
if (es = err != NULL) |
| 361 |
|
fprintf(stderr, "%s: %s: %s\n", progname, |
| 362 |
|
fname==NULL?"<stdin>":fname, err); |
| 363 |
< |
if (wind) { |
| 363 |
> |
if (parent > 0 & wind != 0) { |
| 364 |
|
XDestroyWindow(thedisplay, wind); |
| 365 |
|
XFlush(thedisplay); |
| 366 |
< |
} |
| 367 |
< |
while (parent > 0 && wait(0) != -1) /* wait for any children */ |
| 366 |
> |
} else if (parent < 0 & sigrecv == 0) |
| 367 |
> |
kill(getppid(), SIGCONT); |
| 368 |
> |
while (parent > 0 && wait(&cs) != -1) { /* wait for any children */ |
| 369 |
> |
if (es == 0) |
| 370 |
> |
es = cs>>8 & 0xff; |
| 371 |
|
parent--; |
| 372 |
< |
exit(err != NULL); |
| 372 |
> |
} |
| 373 |
> |
exit(es); |
| 374 |
|
} |
| 375 |
|
|
| 376 |
|
|
| 672 |
|
case '@': /* adaptation level */ |
| 673 |
|
if (avgbox(cval) == -1) |
| 674 |
|
return(-1); |
| 675 |
< |
comp = com=='@' |
| 676 |
< |
? 106./pow(1.219+pow(luminance(cval)/exposure,.4),2.5)/exposure |
| 677 |
< |
: .5/bright(cval) ; |
| 675 |
> |
comp = bright(cval); |
| 676 |
> |
if (comp < 1e-20) { |
| 677 |
> |
XBell(thedisplay, 0); |
| 678 |
> |
return(-1); |
| 679 |
> |
} |
| 680 |
> |
if (com == '@') |
| 681 |
> |
comp = 106./exposure/ |
| 682 |
> |
pow(1.219+pow(comp*WHTEFFICACY/exposure,.4),2.5); |
| 683 |
> |
else |
| 684 |
> |
comp = .5/comp; |
| 685 |
|
comp = log(comp)/.69315 - scale; |
| 686 |
|
n = comp < 0 ? comp-.5 : comp+.5 ; /* round */ |
| 687 |
|
if (n == 0) |
