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 noop() {} |
123 |
|
|
124 |
+ |
|
125 |
|
main(argc, argv) |
126 |
|
int argc; |
127 |
|
char *argv[]; |
130 |
|
char *gv; |
131 |
|
int headline(); |
132 |
|
int i; |
133 |
+ |
int pid; |
134 |
|
|
135 |
|
progname = argv[0]; |
136 |
|
if ((gv = getenv("GAMMA")) != NULL) |
176 |
|
else |
177 |
|
break; |
178 |
|
|
179 |
< |
if (i == argc-1) { |
179 |
> |
if (i > argc) |
180 |
> |
goto userr; |
181 |
> |
while (i < argc-1) { |
182 |
> |
if ((pid=fork()) == 0) { /* a child for each picture */ |
183 |
> |
parent = -1; |
184 |
> |
break; |
185 |
> |
} |
186 |
> |
if (pid < 0) |
187 |
> |
quiterr("fork failed"); |
188 |
> |
parent++; |
189 |
> |
signal(SIGCONT, noop); |
190 |
> |
pause(); /* wait for wake-up call */ |
191 |
> |
i++; |
192 |
> |
} |
193 |
> |
if (i < argc) { /* open picture file */ |
194 |
|
fname = argv[i]; |
195 |
|
fin = fopen(fname, "r"); |
196 |
|
if (fin == NULL) { |
197 |
|
sprintf(errmsg, "cannot open file \"%s\"", fname); |
198 |
|
quiterr(errmsg); |
199 |
|
} |
200 |
< |
} else if (i != argc) |
176 |
< |
goto userr; |
200 |
> |
} |
201 |
|
/* get header */ |
202 |
|
getheader(fin, headline, NULL); |
203 |
|
/* get picture dimensions */ |
211 |
|
if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL) |
212 |
|
quiterr("out of memory"); |
213 |
|
|
214 |
< |
init(); /* get file and open window */ |
214 |
> |
init(argc, argv); /* get file and open window */ |
215 |
|
|
216 |
+ |
if (parent < 0) |
217 |
+ |
kill(getppid(), SIGCONT); /* signal parent if child */ |
218 |
+ |
|
219 |
|
for ( ; ; ) |
220 |
|
getevent(); /* main loop */ |
221 |
|
userr: |
222 |
|
fprintf(stderr, |
223 |
< |
"Usage: %s [-display disp][-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n", |
223 |
> |
"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic ..\n", |
224 |
|
progname); |
225 |
< |
quit(1); |
225 |
> |
exit(1); |
226 |
|
} |
227 |
|
|
228 |
|
|
241 |
|
} |
242 |
|
|
243 |
|
|
244 |
< |
init() /* get data and open window */ |
244 |
> |
init(argc, argv) /* get data and open window */ |
245 |
> |
int argc; |
246 |
> |
char **argv; |
247 |
|
{ |
219 |
– |
XWMHints ourxwmhints; |
248 |
|
XSetWindowAttributes ourwinattr; |
249 |
< |
XSizeHints oursizhints; |
249 |
> |
XClassHint xclshints; |
250 |
> |
XWMHints xwmhints; |
251 |
> |
XSizeHints xszhints; |
252 |
> |
XTextProperty windowName, iconName; |
253 |
> |
XGCValues xgcv; |
254 |
> |
char *name; |
255 |
|
register int i; |
256 |
|
|
257 |
|
if (fname != NULL) { |
258 |
|
scanpos = (long *)malloc(ymax*sizeof(long)); |
259 |
|
if (scanpos == NULL) |
260 |
< |
goto memerr; |
260 |
> |
quiterr("out of memory"); |
261 |
|
for (i = 0; i < ymax; i++) |
262 |
|
scanpos[i] = -1; |
263 |
< |
} |
263 |
> |
name = fname; |
264 |
> |
} else |
265 |
> |
name = progname; |
266 |
> |
/* remove directory prefix from name */ |
267 |
> |
for (i = strlen(name); i-- > 0; ) |
268 |
> |
if (name[i] == '/') |
269 |
> |
break; |
270 |
> |
name += i+1; |
271 |
|
if ((thedisplay = XOpenDisplay(dispname)) == NULL) |
272 |
|
quiterr("cannot open display"); |
273 |
|
/* get best visual for default screen */ |
275 |
|
/* store image */ |
276 |
|
getras(); |
277 |
|
/* get size and position */ |
278 |
< |
bzero((char *)&oursizhints, sizeof(oursizhints)); |
279 |
< |
oursizhints.width = xmax; oursizhints.height = ymax; |
278 |
> |
xszhints.flags = 0; |
279 |
> |
xszhints.width = xmax; xszhints.height = ymax; |
280 |
|
if (geometry != NULL) { |
281 |
< |
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
282 |
< |
(unsigned *)&oursizhints.width, |
283 |
< |
(unsigned *)&oursizhints.height); |
281 |
> |
i = XParseGeometry(geometry, &xszhints.x, &xszhints.y, |
282 |
> |
(unsigned *)&xszhints.width, |
283 |
> |
(unsigned *)&xszhints.height); |
284 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
285 |
< |
oursizhints.flags |= USSize; |
285 |
> |
xszhints.flags |= USSize; |
286 |
|
else |
287 |
< |
oursizhints.flags |= PSize; |
287 |
> |
xszhints.flags |= PSize; |
288 |
|
if ((i&(XValue|YValue)) == (XValue|YValue)) { |
289 |
< |
oursizhints.flags |= USPosition; |
289 |
> |
xszhints.flags |= USPosition; |
290 |
|
if (i & XNegative) |
291 |
< |
oursizhints.x += DisplayWidth(thedisplay, |
292 |
< |
ourscreen)-1-oursizhints.width-2*BORWIDTH; |
291 |
> |
xszhints.x += DisplayWidth(thedisplay, |
292 |
> |
ourscreen)-1-xszhints.width-2*BORWIDTH; |
293 |
|
if (i & YNegative) |
294 |
< |
oursizhints.y += DisplayHeight(thedisplay, |
295 |
< |
ourscreen)-1-oursizhints.height-2*BORWIDTH; |
294 |
> |
xszhints.y += DisplayHeight(thedisplay, |
295 |
> |
ourscreen)-1-xszhints.height-2*BORWIDTH; |
296 |
|
} |
297 |
|
} |
298 |
< |
/* open window */ |
299 |
< |
ourwinattr.border_pixel = ourblack; |
300 |
< |
ourwinattr.background_pixel = ourwhite; |
298 |
> |
/* open window */ |
299 |
> |
ourwinattr.border_pixel = ourwhite; |
300 |
> |
ourwinattr.background_pixel = ourblack; |
301 |
|
ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, |
302 |
|
ourvis.visual, AllocNone); |
303 |
< |
wind = XCreateWindow(thedisplay, ourroot, oursizhints.x, oursizhints.y, |
304 |
< |
oursizhints.width, oursizhints.height, BORWIDTH, |
305 |
< |
ourvis.depth, InputOutput, ourvis.visual, |
306 |
< |
CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
303 |
> |
ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask| |
304 |
> |
ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask; |
305 |
> |
ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross); |
306 |
> |
wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y, |
307 |
> |
xszhints.width, xszhints.height, BORWIDTH, |
308 |
> |
ourvis.depth, InputOutput, ourvis.visual, CWEventMask| |
309 |
> |
CWCursor|CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); |
310 |
|
if (wind == 0) |
311 |
|
quiterr("cannot create window"); |
269 |
– |
XFreeColormap(thedisplay, ourwinattr.colormap); |
312 |
|
width = xmax; |
313 |
|
height = ymax; |
314 |
< |
ourgc = XCreateGC(thedisplay, wind, 0, 0); |
315 |
< |
XSetState(thedisplay, ourgc, ourblack, ourwhite, GXcopy, AllPlanes); |
316 |
< |
revgc = XCreateGC(thedisplay, wind, 0, 0); |
275 |
< |
XSetFunction(thedisplay, revgc, GXinvert); |
276 |
< |
fontid = XLoadFont(thedisplay, FONTNAME); |
277 |
< |
if (fontid == 0) |
314 |
> |
xgcv.foreground = ourblack; |
315 |
> |
xgcv.background = ourwhite; |
316 |
> |
if ((xgcv.font = XLoadFont(thedisplay, FONTNAME)) == 0) |
317 |
|
quiterr("cannot get font"); |
318 |
< |
XSetFont(thedisplay, ourgc, fontid); |
319 |
< |
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
320 |
< |
XC_diamond_cross)); |
321 |
< |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
322 |
< |
if (oursizhints.flags) |
323 |
< |
XSetNormalHints(thedisplay, wind, &oursizhints); |
324 |
< |
ourxwmhints.flags = InputHint|IconPixmapHint; |
325 |
< |
ourxwmhints.input = True; |
326 |
< |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
318 |
> |
ourgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
319 |
> |
GCFont, &xgcv); |
320 |
> |
xgcv.function = GXinvert; |
321 |
> |
revgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground| |
322 |
> |
GCFunction, &xgcv); |
323 |
> |
|
324 |
> |
/* set up the window manager */ |
325 |
> |
xwmhints.flags = InputHint|IconPixmapHint; |
326 |
> |
xwmhints.input = True; |
327 |
> |
xwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
328 |
|
wind, icondata, iconwidth, iconheight); |
329 |
< |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
330 |
< |
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
331 |
< |
|ButtonMotionMask|StructureNotifyMask |
332 |
< |
|KeyPressMask|ExposureMask); |
329 |
> |
|
330 |
> |
windowName.encoding = iconName.encoding = XA_STRING; |
331 |
> |
windowName.format = iconName.format = 8; |
332 |
> |
windowName.value = (u_char *)name; |
333 |
> |
windowName.nitems = strlen(windowName.value); |
334 |
> |
iconName.value = (u_char *)name; |
335 |
> |
iconName.nitems = strlen(windowName.value); |
336 |
> |
|
337 |
> |
xclshints.res_name = NULL; |
338 |
> |
xclshints.res_class = "Ximage"; |
339 |
> |
XSetWMProperties(thedisplay, wind, &windowName, &iconName, |
340 |
> |
argv, argc, &xszhints, &xwmhints, &xclshints); |
341 |
> |
closedownAtom = XInternAtom(thedisplay, "WM_DELETE_WINDOW", False); |
342 |
> |
wmProtocolsAtom = XInternAtom(thedisplay, "WM_PROTOCOLS", False); |
343 |
> |
XSetWMProtocols(thedisplay, wind, &closedownAtom, 1); |
344 |
> |
|
345 |
|
XMapWindow(thedisplay, wind); |
346 |
|
return; |
295 |
– |
memerr: |
296 |
– |
quiterr("out of memory"); |
347 |
|
} /* end of init */ |
348 |
|
|
349 |
|
|
350 |
|
quiterr(err) /* print message and exit */ |
351 |
|
char *err; |
352 |
|
{ |
353 |
< |
if (err != NULL) { |
354 |
< |
fprintf(stderr, "%s: %s\n", progname, err); |
355 |
< |
exit(1); |
353 |
> |
if (err != NULL) |
354 |
> |
fprintf(stderr, "%s: %s: %s\n", progname, |
355 |
> |
fname==NULL?"<stdin>":fname, err); |
356 |
> |
if (wind) { |
357 |
> |
XDestroyWindow(thedisplay, wind); |
358 |
> |
XFlush(thedisplay); |
359 |
|
} |
360 |
< |
exit(0); |
360 |
> |
while (parent > 0 && wait(0) != -1) /* wait for any children */ |
361 |
> |
parent--; |
362 |
> |
exit(err != NULL); |
363 |
|
} |
364 |
|
|
365 |
|
|
500 |
|
goto fail; |
501 |
|
getmono(); |
502 |
|
} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) { |
503 |
< |
ourdata = (unsigned char *)malloc(4*xmax*ymax); |
503 |
> |
ourdata = (unsigned char *)malloc(sizeof(int4)*xmax*ymax); |
504 |
|
if (ourdata == NULL) |
505 |
|
goto fail; |
506 |
< |
ourras = make_raster(thedisplay, &ourvis, 32, |
506 |
> |
ourras = make_raster(thedisplay, &ourvis, sizeof(int4)*8, |
507 |
|
ourdata, xmax, ymax, 32); |
508 |
|
if (ourras == NULL) |
509 |
|
goto fail; |
531 |
|
|
532 |
|
getevent() /* process the next event */ |
533 |
|
{ |
534 |
< |
union { |
480 |
< |
XEvent u; |
481 |
< |
XConfigureEvent c; |
482 |
< |
XExposeEvent e; |
483 |
< |
XButtonPressedEvent b; |
484 |
< |
XKeyPressedEvent k; |
485 |
< |
} e; |
534 |
> |
XEvent xev; |
535 |
|
|
536 |
< |
XNextEvent(thedisplay, &e.u); |
537 |
< |
switch (e.u.type) { |
536 |
> |
XNextEvent(thedisplay, &xev); |
537 |
> |
switch ((int)xev.type) { |
538 |
|
case KeyPress: |
539 |
< |
docom(&e.k); |
539 |
> |
docom(&xev.xkey); |
540 |
|
break; |
541 |
|
case ConfigureNotify: |
542 |
< |
width = e.c.width; |
543 |
< |
height = e.c.height; |
542 |
> |
width = xev.xconfigure.width; |
543 |
> |
height = xev.xconfigure.height; |
544 |
|
break; |
545 |
|
case MapNotify: |
546 |
|
map_rcolors(ourras, wind); |
552 |
|
unmap_rcolors(ourras); |
553 |
|
break; |
554 |
|
case Expose: |
555 |
< |
redraw(e.e.x, e.e.y, e.e.width, e.e.height); |
555 |
> |
redraw(xev.xexpose.x, xev.xexpose.y, |
556 |
> |
xev.xexpose.width, xev.xexpose.height); |
557 |
|
break; |
558 |
|
case ButtonPress: |
559 |
< |
if (e.b.state & (ShiftMask|ControlMask)) |
560 |
< |
moveimage(&e.b); |
559 |
> |
if (xev.xbutton.state & (ShiftMask|ControlMask)) |
560 |
> |
moveimage(&xev.xbutton); |
561 |
> |
else if (xev.xbutton.button == Button2) |
562 |
> |
traceray(xev.xbutton.x, xev.xbutton.y); |
563 |
|
else |
564 |
< |
getbox(&e.b); |
564 |
> |
getbox(&xev.xbutton); |
565 |
|
break; |
566 |
+ |
case ClientMessage: |
567 |
+ |
if ((xev.xclient.message_type == wmProtocolsAtom) && |
568 |
+ |
(xev.xclient.data.l[0] == closedownAtom)) |
569 |
+ |
quiterr(NULL); |
570 |
+ |
break; |
571 |
|
} |
572 |
|
} |
573 |
|
|
574 |
|
|
575 |
< |
docom(ekey) /* execute command */ |
575 |
> |
traceray(xpos, ypos) /* print ray corresponding to pixel */ |
576 |
> |
int xpos, ypos; |
577 |
> |
{ |
578 |
> |
FLOAT hv[2]; |
579 |
> |
FVECT rorg, rdir; |
580 |
> |
|
581 |
> |
if (!gotview) { /* no view, no can do */ |
582 |
> |
XBell(thedisplay, 0); |
583 |
> |
return(-1); |
584 |
> |
} |
585 |
> |
pix2loc(hv, &inpres, xpos-xoff, ypos-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); |
592 |
> |
} |
593 |
> |
|
594 |
> |
|
595 |
> |
docom(ekey) /* execute command */ |
596 |
|
XKeyPressedEvent *ekey; |
597 |
|
{ |
598 |
|
char buf[80]; |
601 |
|
int com, n; |
602 |
|
double comp; |
603 |
|
FLOAT hv[2]; |
527 |
– |
FVECT rorg, rdir; |
604 |
|
|
605 |
|
n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); |
606 |
|
if (n == 0) |
608 |
|
com = buf[0]; |
609 |
|
switch (com) { /* interpret command */ |
610 |
|
case 'q': |
611 |
+ |
case 'Q': |
612 |
|
case CTRL('D'): /* quit */ |
613 |
< |
quit(0); |
613 |
> |
quiterr(NULL); |
614 |
|
case '\n': |
615 |
|
case '\r': |
616 |
|
case 'l': |
656 |
|
buf, strlen(buf)); |
657 |
|
return(0); |
658 |
|
case 't': /* trace */ |
659 |
< |
if (!gotview) { |
583 |
< |
XBell(thedisplay, 0); |
584 |
< |
return(-1); |
585 |
< |
} |
586 |
< |
pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); |
587 |
< |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
588 |
< |
return(-1); |
589 |
< |
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
590 |
< |
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
591 |
< |
fflush(stdout); |
592 |
< |
return(0); |
659 |
> |
return(traceray(ekey->x, ekey->y)); |
660 |
|
case '=': /* adjust exposure */ |
661 |
+ |
case '@': /* adaptation level */ |
662 |
|
if (avgbox(cval) == -1) |
663 |
|
return(-1); |
664 |
< |
n = log(.5/bright(cval))/.69315 - scale; /* truncate */ |
664 |
> |
comp = com=='@' |
665 |
> |
? 106./pow(1.219+pow(luminance(cval)/exposure,.4),2.5)/exposure |
666 |
> |
: .5/bright(cval) ; |
667 |
> |
comp = log(comp)/.69315 - scale; |
668 |
> |
n = comp < 0 ? comp-.5 : comp+.5 ; /* round */ |
669 |
|
if (n == 0) |
670 |
|
return(0); |
671 |
|
scale_rcolors(ourras, pow(2.0, (double)n)); |
687 |
|
make_rpixmap(ourras, wind); |
688 |
|
redraw(0, 0, width, height); |
689 |
|
return(0); |
690 |
+ |
case 'f': /* turn on fast redraw */ |
691 |
+ |
fast = 1; |
692 |
+ |
make_rpixmap(ourras, wind); |
693 |
+ |
return(0); |
694 |
+ |
case 'F': /* turn off fast redraw */ |
695 |
+ |
fast = 0; |
696 |
+ |
free_rpixmap(ourras); |
697 |
+ |
return(0); |
698 |
|
case '0': /* recenter origin */ |
699 |
|
if (xoff == 0 & yoff == 0) |
700 |
|
return(0); |
715 |
|
moveimage(ebut) /* shift the image */ |
716 |
|
XButtonPressedEvent *ebut; |
717 |
|
{ |
718 |
< |
union { |
639 |
< |
XEvent u; |
640 |
< |
XButtonReleasedEvent b; |
641 |
< |
XPointerMovedEvent m; |
642 |
< |
} e; |
718 |
> |
XEvent e; |
719 |
|
int mxo, myo; |
720 |
|
|
721 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
722 |
< |
while (e.u.type == MotionNotify) { |
723 |
< |
mxo = e.m.x; |
724 |
< |
myo = e.m.y; |
721 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
722 |
> |
while (e.type == MotionNotify) { |
723 |
> |
mxo = e.xmotion.x; |
724 |
> |
myo = e.xmotion.y; |
725 |
|
revline(ebut->x, ebut->y, mxo, myo); |
726 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
727 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
728 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
728 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
729 |
|
revline(ebut->x, ebut->y, mxo, myo); |
730 |
|
revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y, |
731 |
|
xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax); |
732 |
|
} |
733 |
< |
xoff += e.b.x - ebut->x; |
734 |
< |
yoff += e.b.y - ebut->y; |
733 |
> |
xoff += e.xbutton.x - ebut->x; |
734 |
> |
yoff += e.xbutton.y - ebut->y; |
735 |
|
XClearWindow(thedisplay, wind); |
736 |
|
redraw(0, 0, width, height); |
737 |
|
} |
740 |
|
getbox(ebut) /* get new box */ |
741 |
|
XButtonPressedEvent *ebut; |
742 |
|
{ |
743 |
< |
union { |
668 |
< |
XEvent u; |
669 |
< |
XButtonReleasedEvent b; |
670 |
< |
XPointerMovedEvent m; |
671 |
< |
} e; |
743 |
> |
XEvent e; |
744 |
|
|
745 |
< |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u); |
746 |
< |
while (e.u.type == MotionNotify) { |
747 |
< |
revbox(ebut->x, ebut->y, box.xmin = e.m.x, box.ymin = e.m.y); |
748 |
< |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u); |
745 |
> |
XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); |
746 |
> |
while (e.type == MotionNotify) { |
747 |
> |
revbox(ebut->x, ebut->y, box.xmin = e.xmotion.x, box.ymin = e.xmotion.y); |
748 |
> |
XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); |
749 |
|
revbox(ebut->x, ebut->y, box.xmin, box.ymin); |
750 |
|
} |
751 |
< |
box.xmin = e.b.x<0 ? 0 : (e.b.x>=width ? width-1 : e.b.x); |
752 |
< |
box.ymin = e.b.y<0 ? 0 : (e.b.y>=height ? height-1 : e.b.y); |
751 |
> |
box.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x); |
752 |
> |
box.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y); |
753 |
|
if (box.xmin > ebut->x) { |
754 |
|
box.xsiz = box.xmin - ebut->x + 1; |
755 |
|
box.xmin = ebut->x; |
910 |
|
getfull() /* get full (24-bit) data */ |
911 |
|
{ |
912 |
|
int y; |
913 |
< |
register unsigned long *dp; |
913 |
> |
register unsigned int4 *dp; |
914 |
|
register int x; |
915 |
|
/* set gamma correction */ |
916 |
|
setcolrgam(gamcor); |
917 |
|
/* read and convert file */ |
918 |
< |
dp = (unsigned long *)ourdata; |
918 |
> |
dp = (unsigned int4 *)ourdata; |
919 |
|
for (y = 0; y < ymax; y++) { |
920 |
|
getscan(y); |
921 |
|
add2icon(y, scanline); |