projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz
[xscreensaver]
/
hacks
/
apple2-main.c
diff --git
a/hacks/apple2-main.c
b/hacks/apple2-main.c
index 642efe0b9d3931d368ab2f5b85b462e096656aea..3063b58d787f720324f9d700d7948586d0f420b0 100644
(file)
--- a/
hacks/apple2-main.c
+++ b/
hacks/apple2-main.c
@@
-87,7
+87,7
@@
scale_image (Display *dpy, Window window, XImage *in,
int x, y, i;
unsigned int rpos=0, gpos=0, bpos=0; /* bitfield positions */
unsigned int rsiz=0, gsiz=0, bsiz=0;
int x, y, i;
unsigned int rpos=0, gpos=0, bpos=0; /* bitfield positions */
unsigned int rsiz=0, gsiz=0, bsiz=0;
- unsigned
int
rmsk=0, gmsk=0, bmsk=0;
+ unsigned
long
rmsk=0, gmsk=0, bmsk=0;
unsigned char spread_map[3][256];
XWindowAttributes xgwa;
XColor *colors = 0;
unsigned char spread_map[3][256];
XWindowAttributes xgwa;
XColor *colors = 0;
@@
-112,9
+112,7
@@
scale_image (Display *dpy, Window window, XImage *in,
}
else
{
}
else
{
- rmsk = xgwa.visual->red_mask;
- gmsk = xgwa.visual->green_mask;
- bmsk = xgwa.visual->blue_mask;
+ visual_rgb_masks (xgwa.screen, xgwa.visual, &rmsk, &gmsk, &bmsk);
decode_mask (rmsk, &rpos, &rsiz);
decode_mask (gmsk, &gpos, &gsiz);
decode_mask (bmsk, &bpos, &bsiz);
decode_mask (rmsk, &rpos, &rsiz);
decode_mask (gmsk, &gpos, &gsiz);
decode_mask (bmsk, &bpos, &bsiz);