| 37 |
|
|
| 38 |
|
#define BORWIDTH 5 /* border width */ |
| 39 |
|
|
| 40 |
< |
#define ICONSIZ 80 /* maximum icon dimension */ |
| 40 |
> |
#define ICONSIZ (8*10) /* maximum icon dimension (even 8) */ |
| 41 |
|
|
| 42 |
|
#define ourscreen DefaultScreen(thedisplay) |
| 43 |
|
#define ourblack BlackPixel(thedisplay,ourscreen) |
| 92 |
|
|
| 93 |
|
char *geometry = NULL; /* geometry specification */ |
| 94 |
|
|
| 95 |
< |
char icondata[(ICONSIZ+7)/8*ICONSIZ]; /* icon bitmap data */ |
| 95 |
> |
char icondata[ICONSIZ*ICONSIZ/8]; /* icon bitmap data */ |
| 96 |
|
int iconwidth = 0, iconheight = 0; |
| 97 |
|
|
| 98 |
|
char *progname; |
| 246 |
|
XSetFont(thedisplay, ourgc, fontid); |
| 247 |
|
revgc = XCreateGC(thedisplay, wind, 0, 0); |
| 248 |
|
XSetFunction(thedisplay, revgc, GXinvert); |
| 249 |
– |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
| 249 |
|
XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, |
| 250 |
|
XC_diamond_cross)); |
| 251 |
+ |
XStoreName(thedisplay, wind, fname == NULL ? progname : fname); |
| 252 |
|
if (geometry != NULL) { |
| 253 |
|
bzero((char *)&oursizhints, sizeof(oursizhints)); |
| 254 |
|
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
| 621 |
|
{ |
| 622 |
|
register unsigned char *dp; |
| 623 |
|
register int x, err; |
| 624 |
< |
int y; |
| 624 |
> |
int y, errp; |
| 625 |
|
short *cerr; |
| 626 |
|
|
| 627 |
|
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
| 636 |
|
for (x = 0; x < xmax; x++) { |
| 637 |
|
if (!(x&7)) |
| 638 |
|
*++dp = 0; |
| 639 |
+ |
errp = err; |
| 640 |
|
err += normbright(scanline[x]) + cerr[x]; |
| 641 |
|
if (err > 127) |
| 642 |
|
err -= 255; |
| 643 |
|
else |
| 644 |
|
*dp |= 1<<(7-(x&07)); |
| 645 |
< |
cerr[x] = err >>= 1; |
| 645 |
> |
err /= 3; |
| 646 |
> |
cerr[x] = err + errp; |
| 647 |
|
} |
| 648 |
|
} |
| 649 |
|
free((char *)cerr); |
| 654 |
|
int y; |
| 655 |
|
COLR *scan; |
| 656 |
|
{ |
| 655 |
– |
static char *dp = NULL; |
| 657 |
|
static short cerr[ICONSIZ]; |
| 658 |
+ |
static int ynext; |
| 659 |
+ |
static char *dp; |
| 660 |
|
register int err; |
| 661 |
< |
register int x, xi; |
| 661 |
> |
register int x, ti; |
| 662 |
> |
int errp; |
| 663 |
|
|
| 664 |
|
if (iconheight == 0) { /* initialize */ |
| 665 |
< |
if (xmax < ICONSIZ && ymax < ICONSIZ) { |
| 665 |
> |
if (xmax <= ICONSIZ && ymax <= ICONSIZ) { |
| 666 |
|
iconwidth = xmax; |
| 667 |
|
iconheight = ymax; |
| 668 |
|
} else if (xmax > ymax) { |
| 672 |
|
iconwidth = ICONSIZ*xmax/ymax; |
| 673 |
|
iconheight = ICONSIZ; |
| 674 |
|
} |
| 675 |
+ |
ynext = 0; |
| 676 |
|
dp = icondata - 1; |
| 677 |
|
} |
| 678 |
< |
if (dp == NULL) /* done already */ |
| 678 |
> |
if (y < ynext*ymax/iconheight) /* skip this one */ |
| 679 |
|
return; |
| 675 |
– |
if (y % (ymax/iconheight)) /* skip this one */ |
| 676 |
– |
return; |
| 680 |
|
err = 0; |
| 681 |
|
for (x = 0; x < iconwidth; x++) { |
| 682 |
|
if (!(x&7)) |
| 683 |
|
*++dp = 0; |
| 684 |
< |
xi = x*xmax/iconwidth; |
| 685 |
< |
err += normbright(scan[xi]) + cerr[x]; |
| 684 |
> |
errp = err; |
| 685 |
> |
ti = x*xmax/iconwidth; |
| 686 |
> |
err += normbright(scan[ti]) + cerr[x]; |
| 687 |
|
if (err > 127) |
| 688 |
|
err -= 255; |
| 689 |
|
else |
| 690 |
|
*dp |= 1<<(x&07); |
| 691 |
< |
cerr[x] = err >>= 1; |
| 691 |
> |
err /= 3; |
| 692 |
> |
cerr[x] = err + errp; |
| 693 |
|
} |
| 694 |
< |
if (y >= ymax-ymax/iconheight) /* all done */ |
| 690 |
< |
dp = NULL; |
| 694 |
> |
ynext++; |
| 695 |
|
} |
| 696 |
|
|
| 697 |
|
|
