1 |
< |
/* Copyright (c) 1991 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"; |
24 |
|
#include <X11/Xlib.h> |
25 |
|
#include <X11/cursorfont.h> |
26 |
|
#include <X11/Xutil.h> |
27 |
+ |
#include <X11/Xatom.h> |
28 |
|
|
29 |
|
#include "color.h" |
30 |
|
#include "view.h" |
30 |
– |
#include "pic.h" |
31 |
|
#include "x11raster.h" |
32 |
|
#include "random.h" |
33 |
|
#include "resolu.h" |
41 |
|
#define ICONSIZ (8*10) /* maximum icon dimension (even 8) */ |
42 |
|
|
43 |
|
#define ourscreen DefaultScreen(thedisplay) |
44 |
– |
#define ourblack BlackPixel(thedisplay,ourscreen) |
45 |
– |
#define ourwhite WhitePixel(thedisplay,ourscreen) |
44 |
|
#define ourroot RootWindow(thedisplay,ourscreen) |
45 |
|
|
46 |
|
#define revline(x0,y0,x1,y1) XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1) |
55 |
|
char *dispname = NULL; /* our display name */ |
56 |
|
|
57 |
|
Window wind = 0; /* our output window */ |
58 |
< |
Font fontid; /* our font */ |
61 |
< |
|
58 |
> |
unsigned long ourblack=0, ourwhite=1; /* black and white for this visual */ |
59 |
|
int maxcolors = 0; /* maximum colors */ |
60 |
|
int greyscale = 0; /* in grey */ |
61 |
|
|
102 |
|
|
103 |
|
char errmsg[128]; |
104 |
|
|
105 |
+ |
extern BYTE clrtab[256][3]; /* global color map */ |
106 |
+ |
|
107 |
|
extern long ftell(); |
108 |
|
|
110 |
– |
extern char *malloc(), *calloc(); |
111 |
– |
|
112 |
– |
extern double pow(), log(); |
113 |
– |
|
109 |
|
Display *thedisplay; |
110 |
+ |
Atom closedownAtom, wmProtocolsAtom; |
111 |
|
|
112 |
+ |
|
113 |
|
main(argc, argv) |
114 |
|
int argc; |
115 |
|
char *argv[]; |
116 |
|
{ |
117 |
+ |
extern char *getenv(); |
118 |
+ |
char *gv; |
119 |
|
int headline(); |
120 |
|
int i; |
121 |
|
|
122 |
|
progname = argv[0]; |
123 |
+ |
if ((gv = getenv("GAMMA")) != NULL) |
124 |
+ |
gamcor = atof(gv); |
125 |
|
|
126 |
|
for (i = 1; i < argc; i++) |
127 |
|
if (argv[i][0] == '-') |
185 |
|
if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL) |
186 |
|
quiterr("out of memory"); |
187 |
|
|
188 |
< |
init(); /* get file and open window */ |
188 |
> |
init(argc, argv); /* get file and open window */ |
189 |
|
|
190 |
|
for ( ; ; ) |
191 |
|
getevent(); /* main loop */ |
192 |
|
userr: |
193 |
|
fprintf(stderr, |
194 |
< |
"Usage: %s [-display disp][-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", |
194 |
> |
"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic\n", |
195 |
|
progname); |
196 |
< |
quit(1); |
196 |
> |
exit(1); |
197 |
|
} |
198 |
|
|
199 |
|
|
212 |
|
} |
213 |
|
|
214 |
|
|
215 |
< |
init() /* get data and open window */ |
215 |
> |
init(argc, argv) /* get data and open window */ |
216 |
> |
int argc; |
217 |
> |
char **argv; |
218 |
|
{ |
216 |
– |
XWMHints ourxwmhints; |
219 |
|
XSetWindowAttributes ourwinattr; |
220 |
< |
XSizeHints oursizhints; |
220 |
> |
XClassHint xclshints; |
221 |
> |
XWMHints xwmhints; |
222 |
> |
XSizeHints xszhints; |
223 |
> |
XTextProperty windowName, iconName; |
224 |
> |
XGCValues xgcv; |
225 |
> |
char *name; |
226 |
|
register int i; |
227 |
|
|
228 |
|
if (fname != NULL) { |
229 |
|
scanpos = (long *)malloc(ymax*sizeof(long)); |
230 |
|
if (scanpos == NULL) |
231 |
< |
goto memerr; |
231 |
> |
quiterr("out of memory"); |
232 |
|
for (i = 0; i < ymax; i++) |
233 |
|
scanpos[i] = -1; |
234 |
< |
} |
234 |
> |
name = fname; |
235 |
> |
} else |
236 |
> |
name = progname; |
237 |
> |
/* remove directory prefix from name */ |
238 |
> |
for (i = strlen(name); i-- > 0; ) |
239 |
> |
if (name[i] == '/') |
240 |
> |
break; |
241 |
> |
name += i+1; |
242 |
|
if ((thedisplay = XOpenDisplay(dispname)) == NULL) |
243 |
|
quiterr("cannot open display"); |
244 |
|
/* get best visual for default screen */ |
245 |
|
getbestvis(); |
246 |
|
/* store image */ |
247 |
|
getras(); |
248 |
< |
/* open window */ |
249 |
< |
ourwinattr.border_pixel = ourblack; |
250 |
< |
ourwinattr.background_pixel = ourwhite; |
237 |
< |
ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, |
238 |
< |
ourvis.visual, AllocNone); |
239 |
< |
wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH, |
240 |
< |
ourvis.depth, InputOutput, ourvis.visual, |
241 |
< |
CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
242 |
< |
if (wind == 0) |
243 |
< |
quiterr("cannot create window"); |
244 |
< |
width = xmax; |
245 |
< |
height = ymax; |
246 |
< |
ourgc = XCreateGC(thedisplay, wind, 0, 0); |
247 |
< |
XSetState(thedisplay, ourgc, BlackPixel(thedisplay,ourscreen), |
248 |
< |
WhitePixel(thedisplay,ourscreen), GXcopy, AllPlanes); |
249 |
< |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
250 |
< |
XSetFunction(thedisplay, revgc, GXinvert); |
251 |
< |
fontid = XLoadFont(thedisplay, FONTNAME); |
252 |
< |
if (fontid == 0) |
253 |
< |
quiterr("cannot get font"); |
254 |
< |
XSetFont(thedisplay, ourgc, fontid); |
255 |
< |
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
256 |
< |
XC_diamond_cross)); |
257 |
< |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
248 |
> |
/* get size and position */ |
249 |
> |
xszhints.flags = 0; |
250 |
> |
xszhints.width = xmax; xszhints.height = ymax; |
251 |
|
if (geometry != NULL) { |
252 |
< |
bzero((char *)&oursizhints, sizeof(oursizhints)); |
253 |
< |
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
254 |
< |
(unsigned *)&oursizhints.width, |
262 |
< |
(unsigned *)&oursizhints.height); |
252 |
> |
i = XParseGeometry(geometry, &xszhints.x, &xszhints.y, |
253 |
> |
(unsigned *)&xszhints.width, |
254 |
> |
(unsigned *)&xszhints.height); |
255 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
256 |
< |
oursizhints.flags |= USSize; |
257 |
< |
else { |
258 |
< |
oursizhints.width = xmax; |
267 |
< |
oursizhints.height = ymax; |
268 |
< |
oursizhints.flags |= PSize; |
269 |
< |
} |
256 |
> |
xszhints.flags |= USSize; |
257 |
> |
else |
258 |
> |
xszhints.flags |= PSize; |
259 |
|
if ((i&(XValue|YValue)) == (XValue|YValue)) { |
260 |
< |
oursizhints.flags |= USPosition; |
260 |
> |
xszhints.flags |= USPosition; |
261 |
|
if (i & XNegative) |
262 |
< |
oursizhints.x += DisplayWidth(thedisplay, |
263 |
< |
ourscreen)-1-oursizhints.width-2*BORWIDTH; |
262 |
> |
xszhints.x += DisplayWidth(thedisplay, |
263 |
> |
ourscreen)-1-xszhints.width-2*BORWIDTH; |
264 |
|
if (i & YNegative) |
265 |
< |
oursizhints.y += DisplayHeight(thedisplay, |
266 |
< |
ourscreen)-1-oursizhints.height-2*BORWIDTH; |
265 |
> |
xszhints.y += DisplayHeight(thedisplay, |
266 |
> |
ourscreen)-1-xszhints.height-2*BORWIDTH; |
267 |
|
} |
279 |
– |
XSetNormalHints(thedisplay, wind, &oursizhints); |
268 |
|
} |
269 |
< |
ourxwmhints.flags = InputHint|IconPixmapHint; |
270 |
< |
ourxwmhints.input = True; |
271 |
< |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
269 |
> |
/* open window */ |
270 |
> |
ourwinattr.border_pixel = ourwhite; |
271 |
> |
ourwinattr.background_pixel = ourblack; |
272 |
> |
ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, |
273 |
> |
ourvis.visual, AllocNone); |
274 |
> |
ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask| |
275 |
> |
ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask; |
276 |
> |
ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross); |
277 |
> |
wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y, |
278 |
> |
xszhints.width, xszhints.height, BORWIDTH, |
279 |
> |
ourvis.depth, InputOutput, ourvis.visual, CWEventMask| |
280 |
> |
CWCursor|CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
281 |
> |
if (wind == 0) |
282 |
> |
quiterr("cannot create window"); |
283 |
> |
width = xmax; |
284 |
> |
height = ymax; |
285 |
> |
xgcv.foreground = ourblack; |
286 |
> |
xgcv.background = ourwhite; |
287 |
> |
if ((xgcv.font = XLoadFont(thedisplay, FONTNAME)) == 0) |
288 |
> |
quiterr("cannot get font"); |
289 |
> |
ourgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
290 |
> |
GCFont, &xgcv); |
291 |
> |
xgcv.function = GXinvert; |
292 |
> |
revgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
293 |
> |
GCFunction, &xgcv); |
294 |
> |
|
295 |
> |
/* set up the window manager */ |
296 |
> |
xwmhints.flags = InputHint|IconPixmapHint; |
297 |
> |
xwmhints.input = True; |
298 |
> |
xwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
299 |
|
wind, icondata, iconwidth, iconheight); |
300 |
< |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
301 |
< |
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
302 |
< |
|ButtonMotionMask|StructureNotifyMask |
303 |
< |
|KeyPressMask|ExposureMask); |
300 |
> |
|
301 |
> |
windowName.encoding = iconName.encoding = XA_STRING; |
302 |
> |
windowName.format = iconName.format = 8; |
303 |
> |
windowName.value = (u_char *)name; |
304 |
> |
windowName.nitems = strlen(windowName.value); |
305 |
> |
iconName.value = (u_char *)name; |
306 |
> |
iconName.nitems = strlen(windowName.value); |
307 |
> |
|
308 |
> |
xclshints.res_name = NULL; |
309 |
> |
xclshints.res_class = "Ximage"; |
310 |
> |
XSetWMProperties(thedisplay, wind, &windowName, &iconName, |
311 |
> |
argv, argc, &xszhints, &xwmhints, &xclshints); |
312 |
> |
closedownAtom = XInternAtom(thedisplay, "WM_DELETE_WINDOW", False); |
313 |
> |
wmProtocolsAtom = XInternAtom(thedisplay, "WM_PROTOCOLS", False); |
314 |
> |
XSetWMProtocols(thedisplay, wind, &closedownAtom, 1); |
315 |
> |
|
316 |
|
XMapWindow(thedisplay, wind); |
317 |
|
return; |
291 |
– |
memerr: |
292 |
– |
quiterr("out of memory"); |
318 |
|
} /* end of init */ |
319 |
|
|
320 |
|
|
329 |
|
} |
330 |
|
|
331 |
|
|
307 |
– |
eputs(s) |
308 |
– |
char *s; |
309 |
– |
{ |
310 |
– |
fputs(s, stderr); |
311 |
– |
} |
312 |
– |
|
313 |
– |
|
314 |
– |
quit(code) |
315 |
– |
int code; |
316 |
– |
{ |
317 |
– |
exit(code); |
318 |
– |
} |
319 |
– |
|
320 |
– |
|
332 |
|
static int |
333 |
|
viscmp(v1,v2) /* compare visual to see which is better, descending */ |
334 |
|
register XVisualInfo *v1, *v2; |
427 |
|
fprintf(stderr, "Selected visual type %s, depth %d\n", |
428 |
|
vistype[ourvis.class], ourvis.depth); |
429 |
|
#endif |
430 |
+ |
/* make appropriate adjustments */ |
431 |
|
if (ourvis.class == GrayScale || ourvis.class == StaticGray) |
432 |
|
greyscale = 1; |
433 |
|
if (ourvis.depth <= 8 && ourvis.colormap_size < maxcolors) |
434 |
|
maxcolors = ourvis.colormap_size; |
435 |
< |
if (maxcolors > 4) |
436 |
< |
maxcolors -= 2; |
435 |
> |
if (ourvis.class == StaticGray) { |
436 |
> |
ourblack = 0; |
437 |
> |
ourwhite = 255; |
438 |
> |
} else if (ourvis.class == PseudoColor) { |
439 |
> |
ourblack = BlackPixel(thedisplay,ourscreen); |
440 |
> |
ourwhite = WhitePixel(thedisplay,ourscreen); |
441 |
> |
if ((ourblack|ourwhite) & ~255L) { |
442 |
> |
ourblack = 0; |
443 |
> |
ourwhite = 1; |
444 |
> |
} |
445 |
> |
if (maxcolors > 4) |
446 |
> |
maxcolors -= 2; |
447 |
> |
} else { |
448 |
> |
ourblack = 0; |
449 |
> |
ourwhite = ourvis.red_mask|ourvis.green_mask|ourvis.blue_mask; |
450 |
> |
} |
451 |
|
XFree((char *)xvi); |
452 |
|
} |
453 |
|
|
454 |
|
|
455 |
|
getras() /* get raster file */ |
456 |
|
{ |
431 |
– |
colormap ourmap; |
457 |
|
XVisualInfo vinfo; |
458 |
|
|
459 |
|
if (maxcolors <= 2) { /* monochrome */ |
465 |
|
if (ourras == NULL) |
466 |
|
goto fail; |
467 |
|
getmono(); |
468 |
< |
} else if (ourvis.class == TrueColor || ourvis.class == DirectColor) { |
468 |
> |
} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) { |
469 |
|
ourdata = (unsigned char *)malloc(4*xmax*ymax); |
470 |
|
if (ourdata == NULL) |
471 |
|
goto fail; |
482 |
|
xmax, ymax, 8); |
483 |
|
if (ourras == NULL) |
484 |
|
goto fail; |
485 |
< |
if (ourvis.class == StaticGray) |
485 |
> |
if (greyscale | ourvis.class == StaticGray) |
486 |
|
getgrey(); |
487 |
< |
else { |
488 |
< |
if (greyscale) |
489 |
< |
biq(dither,maxcolors,1,ourmap); |
490 |
< |
else |
466 |
< |
ciq(dither,maxcolors,1,ourmap); |
467 |
< |
if (init_rcolors(ourras, ourmap[0], |
468 |
< |
ourmap[1], ourmap[2]) == 0) |
469 |
< |
goto fail; |
470 |
< |
} |
487 |
> |
else |
488 |
> |
getmapped(); |
489 |
> |
if (ourvis.class != StaticGray && !init_rcolors(ourras,clrtab)) |
490 |
> |
goto fail; |
491 |
|
} |
492 |
< |
return; |
492 |
> |
return; |
493 |
|
fail: |
494 |
|
quiterr("could not create raster image"); |
495 |
|
} |
497 |
|
|
498 |
|
getevent() /* process the next event */ |
499 |
|
{ |
500 |
< |
union { |
481 |
< |
XEvent u; |
482 |
< |
XConfigureEvent c; |
483 |
< |
XExposeEvent e; |
484 |
< |
XButtonPressedEvent b; |
485 |
< |
XKeyPressedEvent k; |
486 |
< |
} e; |
500 |
> |
XEvent xev; |
501 |
|
|
502 |
< |
XNextEvent(thedisplay, &e.u); |
503 |
< |
switch (e.u.type) { |
502 |
> |
XNextEvent(thedisplay, &xev); |
503 |
> |
switch ((int)xev.type) { |
504 |
|
case KeyPress: |
505 |
< |
docom(&e.k); |
505 |
> |
docom(&xev.xkey); |
506 |
|
break; |
507 |
|
case ConfigureNotify: |
508 |
< |
width = e.c.width; |
509 |
< |
height = e.c.height; |
508 |
> |
width = xev.xconfigure.width; |
509 |
> |
height = xev.xconfigure.height; |
510 |
|
break; |
511 |
|
case MapNotify: |
512 |
|
map_rcolors(ourras, wind); |
518 |
|
unmap_rcolors(ourras); |
519 |
|
break; |
520 |
|
case Expose: |
521 |
< |
redraw(e.e.x, e.e.y, e.e.width, e.e.height); |
521 |
> |
redraw(xev.xexpose.x, xev.xexpose.y, |
522 |
> |
xev.xexpose.width, xev.xexpose.height); |
523 |
|
break; |
524 |
|
case ButtonPress: |
525 |
< |
if (e.b.state & (ShiftMask|ControlMask)) |
526 |
< |
moveimage(&e.b); |
525 |
> |
if (xev.xbutton.state & (ShiftMask|ControlMask)) |
526 |
> |
moveimage(&xev.xbutton); |
527 |
> |
else if (xev.xbutton.button == Button2) |
528 |
> |
traceray(xev.xbutton.x, xev.xbutton.y); |
529 |
|
else |
530 |
< |
getbox(&e.b); |
530 |
> |
getbox(&xev.xbutton); |
531 |
|
break; |
532 |
+ |
case ClientMessage: |
533 |
+ |
if ((xev.xclient.message_type == wmProtocolsAtom) && |
534 |
+ |
(xev.xclient.data.l[0] == closedownAtom)) |
535 |
+ |
quiterr(NULL); |
536 |
+ |
break; |
537 |
|
} |
538 |
|
} |
539 |
|
|
540 |
|
|
541 |
< |
docom(ekey) /* execute command */ |
541 |
> |
traceray(xpos, ypos) /* print ray corresponding to pixel */ |
542 |
> |
int xpos, ypos; |
543 |
> |
{ |
544 |
> |
FLOAT hv[2]; |
545 |
> |
FVECT rorg, rdir; |
546 |
> |
|
547 |
> |
if (!gotview) { /* no view, no can do */ |
548 |
> |
XBell(thedisplay, 0); |
549 |
> |
return(-1); |
550 |
> |
} |
551 |
> |
pix2loc(hv, &inpres, xpos-xoff, ypos-yoff); |
552 |
> |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
553 |
> |
return(-1); |
554 |
> |
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
555 |
> |
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
556 |
> |
fflush(stdout); |
557 |
> |
return(0); |
558 |
> |
} |
559 |
> |
|
560 |
> |
|
561 |
> |
docom(ekey) /* execute command */ |
562 |
|
XKeyPressedEvent *ekey; |
563 |
|
{ |
564 |
|
char buf[80]; |
567 |
|
int com, n; |
568 |
|
double comp; |
569 |
|
FLOAT hv[2]; |
528 |
– |
FVECT rorg, rdir; |
570 |
|
|
571 |
|
n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); |
572 |
|
if (n == 0) |
574 |
|
com = buf[0]; |
575 |
|
switch (com) { /* interpret command */ |
576 |
|
case 'q': |
577 |
+ |
case 'Q': |
578 |
|
case CTRL('D'): /* quit */ |
579 |
< |
quit(0); |
579 |
> |
quiterr(NULL); |
580 |
|
case '\n': |
581 |
|
case '\r': |
582 |
|
case 'l': |
622 |
|
buf, strlen(buf)); |
623 |
|
return(0); |
624 |
|
case 't': /* trace */ |
625 |
< |
if (!gotview) { |
584 |
< |
XBell(thedisplay, 0); |
585 |
< |
return(-1); |
586 |
< |
} |
587 |
< |
pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); |
588 |
< |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
589 |
< |
return(-1); |
590 |
< |
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
591 |
< |
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
592 |
< |
fflush(stdout); |
593 |
< |
return(0); |
625 |
> |
return(traceray(ekey->x, ekey->y)); |
626 |
|
case '=': /* adjust exposure */ |
627 |
+ |
case '@': /* adaptation level */ |
628 |
|
if (avgbox(cval) == -1) |
629 |
|
return(-1); |
630 |
< |
n = log(.5/bright(cval))/.69315 - scale; /* truncate */ |
630 |
> |
comp = com=='@' |
631 |
> |
? 59.2/pow(1.219+pow(luminance(cval)/exposure,.4),2.5)/exposure |
632 |
> |
: .5/bright(cval) ; |
633 |
> |
comp = log(comp)/.69315 - scale; |
634 |
> |
n = comp < 0 ? comp-.5 : comp+.5 ; /* round */ |
635 |
|
if (n == 0) |
636 |
|
return(0); |
637 |
|
scale_rcolors(ourras, pow(2.0, (double)n)); |
650 |
|
XClearWindow(thedisplay, wind); |
651 |
|
map_rcolors(ourras, wind); |
652 |
|
if (fast) |
653 |
< |
make_rpixmap(ourras); |
653 |
> |
make_rpixmap(ourras, wind); |
654 |
|
redraw(0, 0, width, height); |
655 |
|
return(0); |
656 |
+ |
case '0': /* recenter origin */ |
657 |
+ |
if (xoff == 0 & yoff == 0) |
658 |
+ |
return(0); |
659 |
+ |
xoff = yoff = 0; |
660 |
+ |
XClearWindow(thedisplay, wind); |
661 |
+ |
redraw(0, 0, width, height); |
662 |
+ |
return(0); |
663 |
|
case ' ': /* clear */ |
664 |
|
redraw(box.xmin, box.ymin, box.xsiz, box.ysiz); |
665 |
|
return(0); |
673 |
|
moveimage(ebut) /* shift the image */ |
674 |
|
XButtonPressedEvent *ebut; |
675 |
|
{ |
676 |
< |
union { |
633 |
< |
XEvent u; |
634 |
< |
XButtonReleasedEvent b; |
635 |
< |
XPointerMovedEvent m; |
636 |
< |
} e; |
676 |
> |
XEvent e; |
677 |
|
int mxo, myo; |
678 |
|
|
679 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
680 |
< |
while (e.u.type == MotionNotify) { |
681 |
< |
mxo = e.m.x; |
682 |
< |
myo = e.m.y; |
679 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
680 |
> |
while (e.type == MotionNotify) { |
681 |
> |
mxo = e.xmotion.x; |
682 |
> |
myo = e.xmotion.y; |
683 |
|
revline(ebut->x, ebut->y, mxo, myo); |
684 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
685 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
686 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
686 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
687 |
|
revline(ebut->x, ebut->y, mxo, myo); |
688 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
689 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
690 |
|
} |
691 |
< |
xoff += e.b.x - ebut->x; |
692 |
< |
yoff += e.b.y - ebut->y; |
691 |
> |
xoff += e.xbutton.x - ebut->x; |
692 |
> |
yoff += e.xbutton.y - ebut->y; |
693 |
|
XClearWindow(thedisplay, wind); |
694 |
|
redraw(0, 0, width, height); |
695 |
|
} |
698 |
|
getbox(ebut) /* get new box */ |
699 |
|
XButtonPressedEvent *ebut; |
700 |
|
{ |
701 |
< |
union { |
662 |
< |
XEvent u; |
663 |
< |
XButtonReleasedEvent b; |
664 |
< |
XPointerMovedEvent m; |
665 |
< |
} e; |
701 |
> |
XEvent e; |
702 |
|
|
703 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
704 |
< |
while (e.u.type == MotionNotify) { |
705 |
< |
revbox(ebut->x, ebut->y, box.xmin = e.m.x, box.ymin = e.m.y); |
706 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
703 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
704 |
> |
while (e.type == MotionNotify) { |
705 |
> |
revbox(ebut->x, ebut->y, box.xmin = e.xmotion.x, box.ymin = e.xmotion.y); |
706 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
707 |
|
revbox(ebut->x, ebut->y, box.xmin, box.ymin); |
708 |
|
} |
709 |
< |
box.xmin = e.b.x<0 ? 0 : (e.b.x>=width ? width-1 : e.b.x); |
710 |
< |
box.ymin = e.b.y<0 ? 0 : (e.b.y>=height ? height-1 : e.b.y); |
709 |
> |
box.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x); |
710 |
> |
box.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y); |
711 |
|
if (box.xmin > ebut->x) { |
712 |
|
box.xsiz = box.xmin - ebut->x + 1; |
713 |
|
box.xmin = ebut->x; |
763 |
|
return(-1); |
764 |
|
if (left == ll && right == lr && top == lt && bottom == lb) { |
765 |
|
copycolor(clr, lc); |
766 |
< |
return; |
766 |
> |
return(0); |
767 |
|
} |
768 |
|
for (y = top; y < bottom; y++) { |
769 |
|
if (getscan(y) == -1) |
792 |
|
quiterr("out of memory in getmono"); |
793 |
|
dp = ourdata - 1; |
794 |
|
for (y = 0; y < ymax; y++) { |
795 |
< |
if (getscan(y) < 0) |
760 |
< |
quiterr("seek error in getmono"); |
761 |
< |
normcolrs(scanline, xmax, scale); |
795 |
> |
getscan(y); |
796 |
|
add2icon(y, scanline); |
797 |
+ |
normcolrs(scanline, xmax, scale); |
798 |
|
err = 0; |
799 |
|
for (x = 0; x < xmax; x++) { |
800 |
|
if (!(x&7)) |
820 |
|
static short cerr[ICONSIZ]; |
821 |
|
static int ynext; |
822 |
|
static char *dp; |
823 |
+ |
COLR clr; |
824 |
|
register int err; |
825 |
|
register int x, ti; |
826 |
|
int errp; |
851 |
|
*++dp = 0; |
852 |
|
errp = err; |
853 |
|
ti = x*xmax/iconwidth; |
854 |
< |
err += normbright(scan[ti]) + cerr[x]; |
854 |
> |
copycolr(clr, scan[ti]); |
855 |
> |
normcolrs(clr, 1, scale); |
856 |
> |
err += normbright(clr) + cerr[x]; |
857 |
|
if (err > 127) |
858 |
|
err -= 255; |
859 |
|
else |
875 |
|
/* read and convert file */ |
876 |
|
dp = (unsigned long *)ourdata; |
877 |
|
for (y = 0; y < ymax; y++) { |
878 |
< |
if (getscan(y) < 0) |
879 |
< |
quiterr("seek error in getfull"); |
878 |
> |
getscan(y); |
879 |
> |
add2icon(y, scanline); |
880 |
|
if (scale) |
881 |
|
shiftcolrs(scanline, xmax, scale); |
882 |
|
colrs_gambs(scanline, xmax); |
845 |
– |
add2icon(y, scanline); |
883 |
|
if (ourras->image->blue_mask & 1) |
884 |
|
for (x = 0; x < xmax; x++) |
885 |
|
*dp++ = scanline[x][RED] << 16 | |
904 |
|
/* read and convert file */ |
905 |
|
dp = ourdata; |
906 |
|
for (y = 0; y < ymax; y++) { |
907 |
< |
if (getscan(y) < 0) |
908 |
< |
quiterr("seek error in getfull"); |
907 |
> |
getscan(y); |
908 |
> |
add2icon(y, scanline); |
909 |
|
if (scale) |
910 |
|
shiftcolrs(scanline, xmax, scale); |
911 |
+ |
for (x = 0; x < xmax; x++) |
912 |
+ |
scanline[x][GRN] = normbright(scanline[x]); |
913 |
|
colrs_gambs(scanline, xmax); |
914 |
< |
add2icon(y, scanline); |
876 |
< |
if (ourvis.colormap_size < 256) |
914 |
> |
if (maxcolors < 256) |
915 |
|
for (x = 0; x < xmax; x++) |
916 |
< |
*dp++ = ((long)normbright(scanline[x]) * |
917 |
< |
ourvis.colormap_size + 128) >> 8; |
916 |
> |
*dp++ = ((long)scanline[x][GRN] * |
917 |
> |
maxcolors + maxcolors/2) >> 8; |
918 |
|
else |
919 |
|
for (x = 0; x < xmax; x++) |
920 |
< |
*dp++ = normbright(scanline[x]); |
920 |
> |
*dp++ = scanline[x][GRN]; |
921 |
|
} |
922 |
+ |
for (x = 0; x < maxcolors; x++) |
923 |
+ |
clrtab[x][RED] = clrtab[x][GRN] = |
924 |
+ |
clrtab[x][BLU] = ((long)x*256 + 128)/maxcolors; |
925 |
|
} |
926 |
|
|
927 |
|
|
928 |
+ |
getmapped() /* get color-mapped data */ |
929 |
+ |
{ |
930 |
+ |
int y; |
931 |
+ |
/* set gamma correction */ |
932 |
+ |
setcolrgam(gamcor); |
933 |
+ |
/* make histogram */ |
934 |
+ |
new_histo(); |
935 |
+ |
for (y = 0; y < ymax; y++) { |
936 |
+ |
if (getscan(y) < 0) |
937 |
+ |
quiterr("seek error in getmapped"); |
938 |
+ |
add2icon(y, scanline); |
939 |
+ |
if (scale) |
940 |
+ |
shiftcolrs(scanline, xmax, scale); |
941 |
+ |
colrs_gambs(scanline, xmax); |
942 |
+ |
cnt_colrs(scanline, xmax); |
943 |
+ |
} |
944 |
+ |
/* map pixels */ |
945 |
+ |
if (!new_clrtab(maxcolors)) |
946 |
+ |
quiterr("cannot create color map"); |
947 |
+ |
for (y = 0; y < ymax; y++) { |
948 |
+ |
if (getscan(y) < 0) |
949 |
+ |
quiterr("seek error in getmapped"); |
950 |
+ |
if (scale) |
951 |
+ |
shiftcolrs(scanline, xmax, scale); |
952 |
+ |
colrs_gambs(scanline, xmax); |
953 |
+ |
if (dither) |
954 |
+ |
dith_colrs(ourdata+y*xmax, scanline, xmax); |
955 |
+ |
else |
956 |
+ |
map_colrs(ourdata+y*xmax, scanline, xmax); |
957 |
+ |
} |
958 |
+ |
} |
959 |
+ |
|
960 |
+ |
|
961 |
|
scale_rcolors(xr, sf) /* scale color map */ |
962 |
|
register XRASTER *xr; |
963 |
|
double sf; |
995 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
996 |
|
quiterr("fseek error"); |
997 |
|
cury = y; |
998 |
< |
} else if (scanpos != NULL) |
998 |
> |
} else if (scanpos != NULL && scanpos[y] == -1) |
999 |
|
scanpos[y] = ftell(fin); |
1000 |
|
|
1001 |
|
if (freadcolrs(scanline, xmax, fin) < 0) |
1003 |
|
|
1004 |
|
cury++; |
1005 |
|
return(0); |
932 |
– |
} |
933 |
– |
|
934 |
– |
|
935 |
– |
picreadline3(y, l3) /* read in 3-byte scanline */ |
936 |
– |
int y; |
937 |
– |
register rgbpixel *l3; |
938 |
– |
{ |
939 |
– |
register int i; |
940 |
– |
/* read scanline */ |
941 |
– |
if (getscan(y) < 0) |
942 |
– |
quiterr("cannot seek for picreadline"); |
943 |
– |
/* convert scanline */ |
944 |
– |
normcolrs(scanline, xmax, scale); |
945 |
– |
add2icon(y, scanline); |
946 |
– |
for (i = 0; i < xmax; i++) { |
947 |
– |
l3[i].r = scanline[i][RED]; |
948 |
– |
l3[i].g = scanline[i][GRN]; |
949 |
– |
l3[i].b = scanline[i][BLU]; |
950 |
– |
} |
951 |
– |
} |
952 |
– |
|
953 |
– |
|
954 |
– |
picwriteline(y, l) /* add 8-bit scanline to image */ |
955 |
– |
int y; |
956 |
– |
pixel *l; |
957 |
– |
{ |
958 |
– |
bcopy((char *)l, (char *)ourdata+y*xmax, xmax); |
959 |
– |
} |
960 |
– |
|
961 |
– |
|
962 |
– |
picreadcm(map) /* do gamma correction */ |
963 |
– |
colormap map; |
964 |
– |
{ |
965 |
– |
extern double pow(); |
966 |
– |
register int i, val; |
967 |
– |
|
968 |
– |
for (i = 0; i < 256; i++) { |
969 |
– |
val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; |
970 |
– |
map[0][i] = map[1][i] = map[2][i] = val; |
971 |
– |
} |
972 |
– |
} |
973 |
– |
|
974 |
– |
|
975 |
– |
picwritecm(map) /* handled elsewhere */ |
976 |
– |
colormap map; |
977 |
– |
{ |
978 |
– |
#if 0 |
979 |
– |
register int i; |
980 |
– |
|
981 |
– |
for (i = 0; i < 256; i++) |
982 |
– |
printf("%d %d %d\n", map[0][i],map[1][i],map[2][i]); |
983 |
– |
#endif |
1006 |
|
} |