1 |
< |
/* Copyright (c) 1990 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
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, |
580 |
|
avgbox(clr) /* average color over current box */ |
581 |
|
COLOR clr; |
582 |
|
{ |
583 |
+ |
static COLOR lc; |
584 |
+ |
static int ll, lr, lt, lb; |
585 |
|
int left, right, top, bottom; |
586 |
|
int y; |
587 |
|
double d; |
605 |
|
bottom = ymax; |
606 |
|
if (top >= bottom) |
607 |
|
return(-1); |
608 |
+ |
if (left == ll && right == lr && top == lt && bottom == lb) { |
609 |
+ |
copycolor(clr, lc); |
610 |
+ |
return; |
611 |
+ |
} |
612 |
|
for (y = top; y < bottom; y++) { |
613 |
|
if (getscan(y) == -1) |
614 |
|
return(-1); |
619 |
|
} |
620 |
|
d = 1.0/((right-left)*(bottom-top)); |
621 |
|
scalecolor(clr, d); |
622 |
+ |
ll = left; lr = right; lt = top; lb = bottom; |
623 |
+ |
copycolor(lc, clr); |
624 |
|
return(0); |
625 |
|
} |
626 |
|
|
629 |
|
{ |
630 |
|
register unsigned char *dp; |
631 |
|
register int x, err; |
632 |
< |
int y; |
632 |
> |
int y, errp; |
633 |
|
short *cerr; |
634 |
|
|
635 |
|
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
644 |
|
for (x = 0; x < xmax; x++) { |
645 |
|
if (!(x&7)) |
646 |
|
*++dp = 0; |
647 |
+ |
errp = err; |
648 |
|
err += normbright(scanline[x]) + cerr[x]; |
649 |
|
if (err > 127) |
650 |
|
err -= 255; |
651 |
|
else |
652 |
|
*dp |= 1<<(7-(x&07)); |
653 |
< |
cerr[x] = err >>= 1; |
653 |
> |
err /= 3; |
654 |
> |
cerr[x] = err + errp; |
655 |
|
} |
656 |
|
} |
657 |
|
free((char *)cerr); |
662 |
|
int y; |
663 |
|
COLR *scan; |
664 |
|
{ |
655 |
– |
static char *dp = NULL; |
665 |
|
static short cerr[ICONSIZ]; |
666 |
+ |
static int ynext; |
667 |
+ |
static char *dp; |
668 |
|
register int err; |
669 |
< |
register int x, xi; |
669 |
> |
register int x, ti; |
670 |
> |
int errp; |
671 |
|
|
672 |
|
if (iconheight == 0) { /* initialize */ |
673 |
< |
if (xmax < ICONSIZ && ymax < ICONSIZ) { |
673 |
> |
if (xmax <= ICONSIZ && ymax <= ICONSIZ) { |
674 |
|
iconwidth = xmax; |
675 |
|
iconheight = ymax; |
676 |
|
} else if (xmax > ymax) { |
677 |
|
iconwidth = ICONSIZ; |
678 |
|
iconheight = ICONSIZ*ymax/xmax; |
679 |
+ |
if (iconheight < 1) |
680 |
+ |
iconheight = 1; |
681 |
|
} else { |
682 |
|
iconwidth = ICONSIZ*xmax/ymax; |
683 |
+ |
if (iconwidth < 1) |
684 |
+ |
iconwidth = 1; |
685 |
|
iconheight = ICONSIZ; |
686 |
|
} |
687 |
+ |
ynext = 0; |
688 |
|
dp = icondata - 1; |
689 |
|
} |
690 |
< |
if (dp == NULL) /* done already */ |
690 |
> |
if (y < ynext*ymax/iconheight) /* skip this one */ |
691 |
|
return; |
675 |
– |
if (y % (ymax/iconheight)) /* skip this one */ |
676 |
– |
return; |
692 |
|
err = 0; |
693 |
|
for (x = 0; x < iconwidth; x++) { |
694 |
|
if (!(x&7)) |
695 |
|
*++dp = 0; |
696 |
< |
xi = x*xmax/iconwidth; |
697 |
< |
err += normbright(scan[xi]) + cerr[x]; |
696 |
> |
errp = err; |
697 |
> |
ti = x*xmax/iconwidth; |
698 |
> |
err += normbright(scan[ti]) + cerr[x]; |
699 |
|
if (err > 127) |
700 |
|
err -= 255; |
701 |
|
else |
702 |
|
*dp |= 1<<(x&07); |
703 |
< |
cerr[x] = err >>= 1; |
703 |
> |
err /= 3; |
704 |
> |
cerr[x] = err + errp; |
705 |
|
} |
706 |
< |
if (y >= ymax-ymax/iconheight) /* all done */ |
690 |
< |
dp = NULL; |
706 |
> |
ynext++; |
707 |
|
} |
708 |
|
|
709 |
|
|