81 |
|
|
82 |
|
int wrongformat = 0; /* input in another format? */ |
83 |
|
|
84 |
+ |
int imready = 0; /* is image up? */ |
85 |
+ |
|
86 |
|
GC revgc; /* graphics context with GXinvert */ |
87 |
|
|
88 |
|
XRASTER *ourras; /* our stored image */ |
248 |
|
XSetFont(thedisplay, ourgc, fontid); |
249 |
|
revgc = XCreateGC(thedisplay, wind, 0, 0); |
250 |
|
XSetFunction(thedisplay, revgc, GXinvert); |
249 |
– |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
251 |
|
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
252 |
|
XC_diamond_cross)); |
253 |
|
if (geometry != NULL) { |
282 |
|
|ButtonMotionMask|StructureNotifyMask |
283 |
|
|KeyPressMask|ExposureMask); |
284 |
|
XMapWindow(thedisplay, wind); |
285 |
+ |
/* make sure the image is up */ |
286 |
+ |
do |
287 |
+ |
getevent(); |
288 |
+ |
while (!imready); |
289 |
+ |
/* store name as ready signal */ |
290 |
+ |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
291 |
|
return; |
292 |
|
memerr: |
293 |
|
quiterr("out of memory"); |
394 |
|
break; |
395 |
|
case Expose: |
396 |
|
redraw(e.e.x, e.e.y, e.e.width, e.e.height); |
397 |
+ |
imready++; |
398 |
|
break; |
399 |
|
case ButtonPress: |
400 |
|
if (e.b.state & (ShiftMask|ControlMask)) |
660 |
|
int y; |
661 |
|
COLR *scan; |
662 |
|
{ |
655 |
– |
static char *dp = NULL; |
663 |
|
static short cerr[ICONSIZ]; |
664 |
+ |
static int ynext; |
665 |
+ |
static char *dp; |
666 |
|
register int err; |
667 |
< |
register int x, xi; |
667 |
> |
register int x, ti; |
668 |
|
|
669 |
|
if (iconheight == 0) { /* initialize */ |
670 |
|
if (xmax <= ICONSIZ && ymax <= ICONSIZ) { |
677 |
|
iconwidth = ICONSIZ*xmax/ymax; |
678 |
|
iconheight = ICONSIZ; |
679 |
|
} |
680 |
+ |
ynext = 0; |
681 |
|
dp = icondata - 1; |
682 |
|
} |
683 |
< |
if (dp == NULL) /* done already */ |
683 |
> |
if (y < ynext*ymax/iconheight) /* skip this one */ |
684 |
|
return; |
675 |
– |
if (y % (ymax/iconheight)) /* skip this one */ |
676 |
– |
return; |
685 |
|
err = 0; |
686 |
|
for (x = 0; x < iconwidth; x++) { |
687 |
|
if (!(x&7)) |
688 |
|
*++dp = 0; |
689 |
< |
xi = x*xmax/iconwidth; |
690 |
< |
err += normbright(scan[xi]) + cerr[x]; |
689 |
> |
ti = x*xmax/iconwidth; |
690 |
> |
err += normbright(scan[ti]) + cerr[x]; |
691 |
|
if (err > 127) |
692 |
|
err -= 255; |
693 |
|
else |
694 |
|
*dp |= 1<<(x&07); |
695 |
|
cerr[x] = err >>= 1; |
696 |
|
} |
697 |
< |
if (y >= ymax - ymax/iconheight) /* all done */ |
690 |
< |
dp = NULL; |
697 |
> |
ynext++; |
698 |
|
} |
699 |
|
|
700 |
|
|