1 |
< |
/* Copyright (c) 1992 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1993 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
21 |
|
|
22 |
|
#include "standard.h" |
23 |
|
|
24 |
+ |
#include <signal.h> |
25 |
|
#include <X11/Xlib.h> |
26 |
|
#include <X11/cursorfont.h> |
27 |
|
#include <X11/Xutil.h> |
28 |
+ |
#include <X11/Xatom.h> |
29 |
|
|
30 |
|
#include "color.h" |
31 |
|
#include "view.h" |
33 |
|
#include "random.h" |
34 |
|
#include "resolu.h" |
35 |
|
|
36 |
+ |
#ifdef __alpha |
37 |
+ |
#define int4 int |
38 |
+ |
#endif |
39 |
+ |
#ifndef int4 |
40 |
+ |
#define int4 long |
41 |
+ |
#endif |
42 |
+ |
|
43 |
|
#define FONTNAME "8x13" /* text font we'll use */ |
44 |
|
|
45 |
|
#define CTRL(c) ((c)-'@') |
64 |
|
|
65 |
|
Window wind = 0; /* our output window */ |
66 |
|
unsigned long ourblack=0, ourwhite=1; /* black and white for this visual */ |
58 |
– |
Font fontid; /* our font */ |
59 |
– |
|
67 |
|
int maxcolors = 0; /* maximum colors */ |
68 |
|
int greyscale = 0; /* in grey */ |
69 |
|
|
72 |
|
int xoff = 0; /* x image offset */ |
73 |
|
int yoff = 0; /* y image offset */ |
74 |
|
|
75 |
+ |
int parent = 0; /* number of children, -1 if child */ |
76 |
+ |
|
77 |
|
VIEW ourview = STDVIEW; /* image view parameters */ |
78 |
|
int gotview = 0; /* got parameters from file */ |
79 |
|
|
116 |
|
|
117 |
|
extern long ftell(); |
118 |
|
|
110 |
– |
extern char *malloc(), *calloc(); |
111 |
– |
|
119 |
|
Display *thedisplay; |
120 |
+ |
Atom closedownAtom, wmProtocolsAtom; |
121 |
|
|
122 |
+ |
int sigrecv; |
123 |
|
|
124 |
+ |
int onsig() { sigrecv++; } |
125 |
+ |
|
126 |
+ |
|
127 |
|
main(argc, argv) |
128 |
|
int argc; |
129 |
|
char *argv[]; |
132 |
|
char *gv; |
133 |
|
int headline(); |
134 |
|
int i; |
135 |
+ |
int pid; |
136 |
|
|
137 |
|
progname = argv[0]; |
138 |
|
if ((gv = getenv("GAMMA")) != NULL) |
178 |
|
else |
179 |
|
break; |
180 |
|
|
181 |
< |
if (i == argc-1) { |
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; |
189 |
> |
} |
190 |
> |
if (pid < 0) |
191 |
> |
quiterr("fork failed"); |
192 |
> |
parent++; |
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); |
202 |
< |
quiterr(errmsg); |
174 |
< |
} |
175 |
< |
} else if (i != argc) |
176 |
< |
goto userr; |
200 |
> |
if (fin == NULL) |
201 |
> |
quiterr("cannot open picture file"); |
202 |
> |
} |
203 |
|
/* get header */ |
204 |
|
getheader(fin, headline, NULL); |
205 |
|
/* get picture dimensions */ |
213 |
|
if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL) |
214 |
|
quiterr("out of memory"); |
215 |
|
|
216 |
< |
init(); /* get file and open window */ |
216 |
> |
init(argc, argv); /* get file and open window */ |
217 |
|
|
218 |
+ |
if (parent < 0) { |
219 |
+ |
kill(getppid(), SIGCONT); /* signal parent if child */ |
220 |
+ |
sigrecv--; |
221 |
+ |
} |
222 |
|
for ( ; ; ) |
223 |
|
getevent(); /* main loop */ |
224 |
|
userr: |
225 |
|
fprintf(stderr, |
226 |
< |
"Usage: %s [-display disp][-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", |
226 |
> |
"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic ..\n", |
227 |
|
progname); |
228 |
< |
quit(1); |
228 |
> |
exit(1); |
229 |
|
} |
230 |
|
|
231 |
|
|
244 |
|
} |
245 |
|
|
246 |
|
|
247 |
< |
init() /* get data and open window */ |
247 |
> |
init(argc, argv) /* get data and open window */ |
248 |
> |
int argc; |
249 |
> |
char **argv; |
250 |
|
{ |
219 |
– |
XWMHints ourxwmhints; |
251 |
|
XSetWindowAttributes ourwinattr; |
252 |
< |
XSizeHints oursizhints; |
252 |
> |
XClassHint xclshints; |
253 |
> |
XWMHints xwmhints; |
254 |
> |
XSizeHints xszhints; |
255 |
> |
XTextProperty windowName, iconName; |
256 |
> |
XGCValues xgcv; |
257 |
> |
char *name; |
258 |
|
register int i; |
259 |
|
|
260 |
|
if (fname != NULL) { |
261 |
|
scanpos = (long *)malloc(ymax*sizeof(long)); |
262 |
|
if (scanpos == NULL) |
263 |
< |
goto memerr; |
263 |
> |
quiterr("out of memory"); |
264 |
|
for (i = 0; i < ymax; i++) |
265 |
|
scanpos[i] = -1; |
266 |
< |
} |
266 |
> |
name = fname; |
267 |
> |
} else |
268 |
> |
name = progname; |
269 |
> |
/* remove directory prefix from name */ |
270 |
> |
for (i = strlen(name); i-- > 0; ) |
271 |
> |
if (name[i] == '/') |
272 |
> |
break; |
273 |
> |
name += i+1; |
274 |
|
if ((thedisplay = XOpenDisplay(dispname)) == NULL) |
275 |
|
quiterr("cannot open display"); |
276 |
|
/* get best visual for default screen */ |
277 |
|
getbestvis(); |
278 |
|
/* store image */ |
279 |
|
getras(); |
280 |
< |
/* open window */ |
281 |
< |
ourwinattr.border_pixel = ourblack; |
282 |
< |
ourwinattr.background_pixel = ourwhite; |
240 |
< |
ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, |
241 |
< |
ourvis.visual, AllocNone); |
242 |
< |
wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH, |
243 |
< |
ourvis.depth, InputOutput, ourvis.visual, |
244 |
< |
CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
245 |
< |
if (wind == 0) |
246 |
< |
quiterr("cannot create window"); |
247 |
< |
XFreeColormap(thedisplay, ourwinattr.colormap); |
248 |
< |
width = xmax; |
249 |
< |
height = ymax; |
250 |
< |
ourgc = XCreateGC(thedisplay, wind, 0, 0); |
251 |
< |
XSetState(thedisplay, ourgc, ourblack, ourwhite, GXcopy, AllPlanes); |
252 |
< |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
253 |
< |
XSetFunction(thedisplay, revgc, GXinvert); |
254 |
< |
fontid = XLoadFont(thedisplay, FONTNAME); |
255 |
< |
if (fontid == 0) |
256 |
< |
quiterr("cannot get font"); |
257 |
< |
XSetFont(thedisplay, ourgc, fontid); |
258 |
< |
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
259 |
< |
XC_diamond_cross)); |
260 |
< |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
280 |
> |
/* get size and position */ |
281 |
> |
xszhints.flags = 0; |
282 |
> |
xszhints.width = xmax; xszhints.height = ymax; |
283 |
|
if (geometry != NULL) { |
284 |
< |
bzero((char *)&oursizhints, sizeof(oursizhints)); |
285 |
< |
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
286 |
< |
(unsigned *)&oursizhints.width, |
265 |
< |
(unsigned *)&oursizhints.height); |
284 |
> |
i = XParseGeometry(geometry, &xszhints.x, &xszhints.y, |
285 |
> |
(unsigned *)&xszhints.width, |
286 |
> |
(unsigned *)&xszhints.height); |
287 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
288 |
< |
oursizhints.flags |= USSize; |
289 |
< |
else { |
290 |
< |
oursizhints.width = xmax; |
270 |
< |
oursizhints.height = ymax; |
271 |
< |
oursizhints.flags |= PSize; |
272 |
< |
} |
288 |
> |
xszhints.flags |= USSize; |
289 |
> |
else |
290 |
> |
xszhints.flags |= PSize; |
291 |
|
if ((i&(XValue|YValue)) == (XValue|YValue)) { |
292 |
< |
oursizhints.flags |= USPosition; |
292 |
> |
xszhints.flags |= USPosition; |
293 |
|
if (i & XNegative) |
294 |
< |
oursizhints.x += DisplayWidth(thedisplay, |
295 |
< |
ourscreen)-1-oursizhints.width-2*BORWIDTH; |
294 |
> |
xszhints.x += DisplayWidth(thedisplay, |
295 |
> |
ourscreen)-1-xszhints.width-2*BORWIDTH; |
296 |
|
if (i & YNegative) |
297 |
< |
oursizhints.y += DisplayHeight(thedisplay, |
298 |
< |
ourscreen)-1-oursizhints.height-2*BORWIDTH; |
297 |
> |
xszhints.y += DisplayHeight(thedisplay, |
298 |
> |
ourscreen)-1-xszhints.height-2*BORWIDTH; |
299 |
|
} |
282 |
– |
XSetNormalHints(thedisplay, wind, &oursizhints); |
300 |
|
} |
301 |
< |
ourxwmhints.flags = InputHint|IconPixmapHint; |
302 |
< |
ourxwmhints.input = True; |
303 |
< |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
301 |
> |
/* open window */ |
302 |
> |
ourwinattr.border_pixel = ourwhite; |
303 |
> |
ourwinattr.background_pixel = ourblack; |
304 |
> |
ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, |
305 |
> |
ourvis.visual, AllocNone); |
306 |
> |
ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask| |
307 |
> |
ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask; |
308 |
> |
ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross); |
309 |
> |
wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y, |
310 |
> |
xszhints.width, xszhints.height, BORWIDTH, |
311 |
> |
ourvis.depth, InputOutput, ourvis.visual, CWEventMask| |
312 |
> |
CWCursor|CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
313 |
> |
if (wind == 0) |
314 |
> |
quiterr("cannot create window"); |
315 |
> |
width = xmax; |
316 |
> |
height = ymax; |
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; |
325 |
> |
revgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
326 |
> |
GCFunction, &xgcv); |
327 |
> |
|
328 |
> |
/* set up the window manager */ |
329 |
> |
xwmhints.flags = InputHint|IconPixmapHint; |
330 |
> |
xwmhints.input = True; |
331 |
> |
xwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
332 |
|
wind, icondata, iconwidth, iconheight); |
333 |
< |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
334 |
< |
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
335 |
< |
|ButtonMotionMask|StructureNotifyMask |
336 |
< |
|KeyPressMask|ExposureMask); |
333 |
> |
|
334 |
> |
windowName.encoding = iconName.encoding = XA_STRING; |
335 |
> |
windowName.format = iconName.format = 8; |
336 |
> |
windowName.value = (u_char *)name; |
337 |
> |
windowName.nitems = strlen(windowName.value); |
338 |
> |
iconName.value = (u_char *)name; |
339 |
> |
iconName.nitems = strlen(windowName.value); |
340 |
> |
|
341 |
> |
xclshints.res_name = NULL; |
342 |
> |
xclshints.res_class = "Ximage"; |
343 |
> |
XSetWMProperties(thedisplay, wind, &windowName, &iconName, |
344 |
> |
argv, argc, &xszhints, &xwmhints, &xclshints); |
345 |
> |
closedownAtom = XInternAtom(thedisplay, "WM_DELETE_WINDOW", False); |
346 |
> |
wmProtocolsAtom = XInternAtom(thedisplay, "WM_PROTOCOLS", False); |
347 |
> |
XSetWMProtocols(thedisplay, wind, &closedownAtom, 1); |
348 |
> |
|
349 |
|
XMapWindow(thedisplay, wind); |
350 |
|
return; |
294 |
– |
memerr: |
295 |
– |
quiterr("out of memory"); |
351 |
|
} /* end of init */ |
352 |
|
|
353 |
|
|
354 |
|
quiterr(err) /* print message and exit */ |
355 |
|
char *err; |
356 |
|
{ |
357 |
< |
if (err != NULL) { |
358 |
< |
fprintf(stderr, "%s: %s\n", progname, err); |
359 |
< |
exit(1); |
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 (parent > 0 & wind != 0) { |
364 |
> |
XDestroyWindow(thedisplay, wind); |
365 |
> |
XFlush(thedisplay); |
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 |
|
} |
373 |
< |
exit(0); |
373 |
> |
exit(es); |
374 |
|
} |
375 |
|
|
376 |
|
|
511 |
|
goto fail; |
512 |
|
getmono(); |
513 |
|
} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) { |
514 |
< |
ourdata = (unsigned char *)malloc(4*xmax*ymax); |
514 |
> |
ourdata = (unsigned char *)malloc(sizeof(int4)*xmax*ymax); |
515 |
|
if (ourdata == NULL) |
516 |
|
goto fail; |
517 |
< |
ourras = make_raster(thedisplay, &ourvis, 32, |
517 |
> |
ourras = make_raster(thedisplay, &ourvis, sizeof(int4)*8, |
518 |
|
ourdata, xmax, ymax, 32); |
519 |
|
if (ourras == NULL) |
520 |
|
goto fail; |
542 |
|
|
543 |
|
getevent() /* process the next event */ |
544 |
|
{ |
545 |
< |
union { |
479 |
< |
XEvent u; |
480 |
< |
XConfigureEvent c; |
481 |
< |
XExposeEvent e; |
482 |
< |
XButtonPressedEvent b; |
483 |
< |
XKeyPressedEvent k; |
484 |
< |
} e; |
545 |
> |
XEvent xev; |
546 |
|
|
547 |
< |
XNextEvent(thedisplay, &e.u); |
548 |
< |
switch (e.u.type) { |
547 |
> |
XNextEvent(thedisplay, &xev); |
548 |
> |
switch ((int)xev.type) { |
549 |
|
case KeyPress: |
550 |
< |
docom(&e.k); |
550 |
> |
docom(&xev.xkey); |
551 |
|
break; |
552 |
|
case ConfigureNotify: |
553 |
< |
width = e.c.width; |
554 |
< |
height = e.c.height; |
553 |
> |
width = xev.xconfigure.width; |
554 |
> |
height = xev.xconfigure.height; |
555 |
|
break; |
556 |
|
case MapNotify: |
557 |
|
map_rcolors(ourras, wind); |
563 |
|
unmap_rcolors(ourras); |
564 |
|
break; |
565 |
|
case Expose: |
566 |
< |
redraw(e.e.x, e.e.y, e.e.width, e.e.height); |
566 |
> |
redraw(xev.xexpose.x, xev.xexpose.y, |
567 |
> |
xev.xexpose.width, xev.xexpose.height); |
568 |
|
break; |
569 |
|
case ButtonPress: |
570 |
< |
if (e.b.state & (ShiftMask|ControlMask)) |
571 |
< |
moveimage(&e.b); |
570 |
> |
if (xev.xbutton.state & (ShiftMask|ControlMask)) |
571 |
> |
moveimage(&xev.xbutton); |
572 |
> |
else if (xev.xbutton.button == Button2) |
573 |
> |
traceray(xev.xbutton.x, xev.xbutton.y); |
574 |
|
else |
575 |
< |
getbox(&e.b); |
575 |
> |
getbox(&xev.xbutton); |
576 |
|
break; |
577 |
+ |
case ClientMessage: |
578 |
+ |
if ((xev.xclient.message_type == wmProtocolsAtom) && |
579 |
+ |
(xev.xclient.data.l[0] == closedownAtom)) |
580 |
+ |
quiterr(NULL); |
581 |
+ |
break; |
582 |
|
} |
583 |
|
} |
584 |
|
|
585 |
|
|
586 |
< |
docom(ekey) /* execute command */ |
586 |
> |
traceray(xpos, ypos) /* print ray corresponding to pixel */ |
587 |
> |
int xpos, ypos; |
588 |
> |
{ |
589 |
> |
FLOAT hv[2]; |
590 |
> |
FVECT rorg, rdir; |
591 |
> |
|
592 |
> |
if (!gotview) { /* no view, no can do */ |
593 |
> |
XBell(thedisplay, 0); |
594 |
> |
return(-1); |
595 |
> |
} |
596 |
> |
pix2loc(hv, &inpres, xpos-xoff, ypos-yoff); |
597 |
> |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
598 |
> |
return(-1); |
599 |
> |
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
600 |
> |
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
601 |
> |
fflush(stdout); |
602 |
> |
return(0); |
603 |
> |
} |
604 |
> |
|
605 |
> |
|
606 |
> |
docom(ekey) /* execute command */ |
607 |
|
XKeyPressedEvent *ekey; |
608 |
|
{ |
609 |
|
char buf[80]; |
612 |
|
int com, n; |
613 |
|
double comp; |
614 |
|
FLOAT hv[2]; |
526 |
– |
FVECT rorg, rdir; |
615 |
|
|
616 |
|
n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); |
617 |
|
if (n == 0) |
619 |
|
com = buf[0]; |
620 |
|
switch (com) { /* interpret command */ |
621 |
|
case 'q': |
622 |
+ |
case 'Q': |
623 |
|
case CTRL('D'): /* quit */ |
624 |
< |
quit(0); |
624 |
> |
quiterr(NULL); |
625 |
|
case '\n': |
626 |
|
case '\r': |
627 |
|
case 'l': |
667 |
|
buf, strlen(buf)); |
668 |
|
return(0); |
669 |
|
case 't': /* trace */ |
670 |
< |
if (!gotview) { |
582 |
< |
XBell(thedisplay, 0); |
583 |
< |
return(-1); |
584 |
< |
} |
585 |
< |
pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); |
586 |
< |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
587 |
< |
return(-1); |
588 |
< |
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
589 |
< |
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
590 |
< |
fflush(stdout); |
591 |
< |
return(0); |
670 |
> |
return(traceray(ekey->x, ekey->y)); |
671 |
|
case '=': /* adjust exposure */ |
672 |
+ |
case '@': /* adaptation level */ |
673 |
|
if (avgbox(cval) == -1) |
674 |
|
return(-1); |
675 |
< |
n = log(.5/bright(cval))/.69315 - scale; /* truncate */ |
675 |
> |
comp = com=='@' |
676 |
> |
? 106./pow(1.219+pow(luminance(cval)/exposure,.4),2.5)/exposure |
677 |
> |
: .5/bright(cval) ; |
678 |
> |
comp = log(comp)/.69315 - scale; |
679 |
> |
n = comp < 0 ? comp-.5 : comp+.5 ; /* round */ |
680 |
|
if (n == 0) |
681 |
|
return(0); |
682 |
|
scale_rcolors(ourras, pow(2.0, (double)n)); |
698 |
|
make_rpixmap(ourras, wind); |
699 |
|
redraw(0, 0, width, height); |
700 |
|
return(0); |
701 |
+ |
case 'f': /* turn on fast redraw */ |
702 |
+ |
fast = 1; |
703 |
+ |
make_rpixmap(ourras, wind); |
704 |
+ |
return(0); |
705 |
+ |
case 'F': /* turn off fast redraw */ |
706 |
+ |
fast = 0; |
707 |
+ |
free_rpixmap(ourras); |
708 |
+ |
return(0); |
709 |
+ |
case '0': /* recenter origin */ |
710 |
+ |
if (xoff == 0 & yoff == 0) |
711 |
+ |
return(0); |
712 |
+ |
xoff = yoff = 0; |
713 |
+ |
XClearWindow(thedisplay, wind); |
714 |
+ |
redraw(0, 0, width, height); |
715 |
+ |
return(0); |
716 |
|
case ' ': /* clear */ |
717 |
|
redraw(box.xmin, box.ymin, box.xsiz, box.ysiz); |
718 |
|
return(0); |
726 |
|
moveimage(ebut) /* shift the image */ |
727 |
|
XButtonPressedEvent *ebut; |
728 |
|
{ |
729 |
< |
union { |
631 |
< |
XEvent u; |
632 |
< |
XButtonReleasedEvent b; |
633 |
< |
XPointerMovedEvent m; |
634 |
< |
} e; |
729 |
> |
XEvent e; |
730 |
|
int mxo, myo; |
731 |
|
|
732 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
733 |
< |
while (e.u.type == MotionNotify) { |
734 |
< |
mxo = e.m.x; |
735 |
< |
myo = e.m.y; |
732 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
733 |
> |
while (e.type == MotionNotify) { |
734 |
> |
mxo = e.xmotion.x; |
735 |
> |
myo = e.xmotion.y; |
736 |
|
revline(ebut->x, ebut->y, mxo, myo); |
737 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
738 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
739 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
739 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
740 |
|
revline(ebut->x, ebut->y, mxo, myo); |
741 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
742 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
743 |
|
} |
744 |
< |
xoff += e.b.x - ebut->x; |
745 |
< |
yoff += e.b.y - ebut->y; |
744 |
> |
xoff += e.xbutton.x - ebut->x; |
745 |
> |
yoff += e.xbutton.y - ebut->y; |
746 |
|
XClearWindow(thedisplay, wind); |
747 |
|
redraw(0, 0, width, height); |
748 |
|
} |
751 |
|
getbox(ebut) /* get new box */ |
752 |
|
XButtonPressedEvent *ebut; |
753 |
|
{ |
754 |
< |
union { |
660 |
< |
XEvent u; |
661 |
< |
XButtonReleasedEvent b; |
662 |
< |
XPointerMovedEvent m; |
663 |
< |
} e; |
754 |
> |
XEvent e; |
755 |
|
|
756 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
757 |
< |
while (e.u.type == MotionNotify) { |
758 |
< |
revbox(ebut->x, ebut->y, box.xmin = e.m.x, box.ymin = e.m.y); |
759 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
756 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
757 |
> |
while (e.type == MotionNotify) { |
758 |
> |
revbox(ebut->x, ebut->y, box.xmin = e.xmotion.x, box.ymin = e.xmotion.y); |
759 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
760 |
|
revbox(ebut->x, ebut->y, box.xmin, box.ymin); |
761 |
|
} |
762 |
< |
box.xmin = e.b.x<0 ? 0 : (e.b.x>=width ? width-1 : e.b.x); |
763 |
< |
box.ymin = e.b.y<0 ? 0 : (e.b.y>=height ? height-1 : e.b.y); |
762 |
> |
box.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x); |
763 |
> |
box.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y); |
764 |
|
if (box.xmin > ebut->x) { |
765 |
|
box.xsiz = box.xmin - ebut->x + 1; |
766 |
|
box.xmin = ebut->x; |
816 |
|
return(-1); |
817 |
|
if (left == ll && right == lr && top == lt && bottom == lb) { |
818 |
|
copycolor(clr, lc); |
819 |
< |
return; |
819 |
> |
return(0); |
820 |
|
} |
821 |
|
for (y = top; y < bottom; y++) { |
822 |
|
if (getscan(y) == -1) |
845 |
|
quiterr("out of memory in getmono"); |
846 |
|
dp = ourdata - 1; |
847 |
|
for (y = 0; y < ymax; y++) { |
848 |
< |
if (getscan(y) < 0) |
758 |
< |
quiterr("seek error in getmono"); |
759 |
< |
normcolrs(scanline, xmax, scale); |
848 |
> |
getscan(y); |
849 |
|
add2icon(y, scanline); |
850 |
+ |
normcolrs(scanline, xmax, scale); |
851 |
|
err = 0; |
852 |
|
for (x = 0; x < xmax; x++) { |
853 |
|
if (!(x&7)) |
873 |
|
static short cerr[ICONSIZ]; |
874 |
|
static int ynext; |
875 |
|
static char *dp; |
876 |
+ |
COLR clr; |
877 |
|
register int err; |
878 |
|
register int x, ti; |
879 |
|
int errp; |
904 |
|
*++dp = 0; |
905 |
|
errp = err; |
906 |
|
ti = x*xmax/iconwidth; |
907 |
< |
err += normbright(scan[ti]) + cerr[x]; |
907 |
> |
copycolr(clr, scan[ti]); |
908 |
> |
normcolrs(clr, 1, scale); |
909 |
> |
err += normbright(clr) + cerr[x]; |
910 |
|
if (err > 127) |
911 |
|
err -= 255; |
912 |
|
else |
921 |
|
getfull() /* get full (24-bit) data */ |
922 |
|
{ |
923 |
|
int y; |
924 |
< |
register unsigned long *dp; |
924 |
> |
register unsigned int4 *dp; |
925 |
|
register int x; |
926 |
|
/* set gamma correction */ |
927 |
|
setcolrgam(gamcor); |
928 |
|
/* read and convert file */ |
929 |
< |
dp = (unsigned long *)ourdata; |
929 |
> |
dp = (unsigned int4 *)ourdata; |
930 |
|
for (y = 0; y < ymax; y++) { |
931 |
< |
if (getscan(y) < 0) |
932 |
< |
quiterr("seek error in getfull"); |
931 |
> |
getscan(y); |
932 |
> |
add2icon(y, scanline); |
933 |
|
if (scale) |
934 |
|
shiftcolrs(scanline, xmax, scale); |
935 |
|
colrs_gambs(scanline, xmax); |
843 |
– |
add2icon(y, scanline); |
936 |
|
if (ourras->image->blue_mask & 1) |
937 |
|
for (x = 0; x < xmax; x++) |
938 |
|
*dp++ = scanline[x][RED] << 16 | |
957 |
|
/* read and convert file */ |
958 |
|
dp = ourdata; |
959 |
|
for (y = 0; y < ymax; y++) { |
960 |
< |
if (getscan(y) < 0) |
961 |
< |
quiterr("seek error in getgrey"); |
960 |
> |
getscan(y); |
961 |
> |
add2icon(y, scanline); |
962 |
|
if (scale) |
963 |
|
shiftcolrs(scanline, xmax, scale); |
964 |
+ |
for (x = 0; x < xmax; x++) |
965 |
+ |
scanline[x][GRN] = normbright(scanline[x]); |
966 |
|
colrs_gambs(scanline, xmax); |
873 |
– |
add2icon(y, scanline); |
967 |
|
if (maxcolors < 256) |
968 |
|
for (x = 0; x < xmax; x++) |
969 |
< |
*dp++ = ((long)normbright(scanline[x]) * |
970 |
< |
maxcolors + 128) >> 8; |
969 |
> |
*dp++ = ((long)scanline[x][GRN] * |
970 |
> |
maxcolors + maxcolors/2) >> 8; |
971 |
|
else |
972 |
|
for (x = 0; x < xmax; x++) |
973 |
< |
*dp++ = normbright(scanline[x]); |
973 |
> |
*dp++ = scanline[x][GRN]; |
974 |
|
} |
975 |
|
for (x = 0; x < maxcolors; x++) |
976 |
|
clrtab[x][RED] = clrtab[x][GRN] = |
977 |
< |
clrtab[x][BLU] = ((long)x*256+maxcolors/2)/maxcolors; |
977 |
> |
clrtab[x][BLU] = ((long)x*256 + 128)/maxcolors; |
978 |
|
} |
979 |
|
|
980 |
|
|
981 |
|
getmapped() /* get color-mapped data */ |
982 |
|
{ |
983 |
|
int y; |
984 |
+ |
/* make sure we can do it first */ |
985 |
+ |
if (fname == NULL) |
986 |
+ |
quiterr("cannot map colors from standard input"); |
987 |
|
/* set gamma correction */ |
988 |
|
setcolrgam(gamcor); |
989 |
|
/* make histogram */ |
990 |
|
new_histo(); |
991 |
|
for (y = 0; y < ymax; y++) { |
992 |
|
if (getscan(y) < 0) |
993 |
< |
quiterr("seek error in getmapped"); |
993 |
> |
break; |
994 |
> |
add2icon(y, scanline); |
995 |
|
if (scale) |
996 |
|
shiftcolrs(scanline, xmax, scale); |
997 |
|
colrs_gambs(scanline, xmax); |
901 |
– |
add2icon(y, scanline); |
998 |
|
cnt_colrs(scanline, xmax); |
999 |
|
} |
1000 |
|
/* map pixels */ |
1001 |
|
if (!new_clrtab(maxcolors)) |
1002 |
|
quiterr("cannot create color map"); |
1003 |
|
for (y = 0; y < ymax; y++) { |
1004 |
< |
if (getscan(y) < 0) |
909 |
< |
quiterr("seek error in getmapped"); |
1004 |
> |
getscan(y); |
1005 |
|
if (scale) |
1006 |
|
shiftcolrs(scanline, xmax, scale); |
1007 |
|
colrs_gambs(scanline, xmax); |
1044 |
|
getscan(y) |
1045 |
|
int y; |
1046 |
|
{ |
1047 |
+ |
static int trunced = -1; /* truncated file? */ |
1048 |
+ |
skipit: |
1049 |
+ |
if (trunced >= 0 && y >= trunced) { |
1050 |
+ |
bzero(scanline, xmax*sizeof(COLR)); |
1051 |
+ |
return(-1); |
1052 |
+ |
} |
1053 |
|
if (y != cury) { |
1054 |
|
if (scanpos == NULL || scanpos[y] == -1) |
1055 |
|
return(-1); |
1059 |
|
} else if (scanpos != NULL && scanpos[y] == -1) |
1060 |
|
scanpos[y] = ftell(fin); |
1061 |
|
|
1062 |
< |
if (freadcolrs(scanline, xmax, fin) < 0) |
1063 |
< |
quiterr("read error"); |
1064 |
< |
|
1062 |
> |
if (freadcolrs(scanline, xmax, fin) < 0) { |
1063 |
> |
fprintf(stderr, "%s: %s: unfinished picture\n", |
1064 |
> |
progname, fname==NULL?"<stdin>":fname); |
1065 |
> |
trunced = y; |
1066 |
> |
goto skipit; |
1067 |
> |
} |
1068 |
|
cury++; |
1069 |
|
return(0); |
1070 |
|
} |