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.22.tar.gz
[xscreensaver]
/
hacks
/
swirl.c
diff --git
a/hacks/swirl.c
b/hacks/swirl.c
index ba959ac692045fc483901291d73a469433863312..efe2f8d1d89b3b57d87c35a0373792294d515c01 100644
(file)
--- a/
hacks/swirl.c
+++ b/
hacks/swirl.c
@@
-35,6
+35,7
@@
static const char sccsid[] = "@(#)swirl.c 4.00 97/01/01 xlockmore";
"*ncolors: 200 \n" \
"*useSHM: True \n" \
"*fpsSolid: true \n" \
"*ncolors: 200 \n" \
"*useSHM: True \n" \
"*fpsSolid: true \n" \
+ "*ignoreRotation: True \n" \
# define SMOOTH_COLORS
# define WRITABLE_COLORS
# define SMOOTH_COLORS
# define WRITABLE_COLORS
@@
-1352,7
+1353,7
@@
draw_swirl(ModeInfo * mi)
if (swirl->drawing) {
#ifdef STANDALONE
if (mi->writable_p)
if (swirl->drawing) {
#ifdef STANDALONE
if (mi->writable_p)
- rotate_colors(
MI_DISPLAY(mi)
, MI_COLORMAP(mi),
+ rotate_colors(
mi->xgwa.screen
, MI_COLORMAP(mi),
swirl->rgb_values, swirl->colours, 1);
#else /* !STANDALONE */
/* rotate the colours */
swirl->rgb_values, swirl->colours, 1);
#else /* !STANDALONE */
/* rotate the colours */
@@
-1374,7
+1375,7
@@
draw_swirl(ModeInfo * mi)
} else {
#ifdef STANDALONE
if (mi->writable_p)
} else {
#ifdef STANDALONE
if (mi->writable_p)
- rotate_colors(
MI_DISPLAY(mi)
, MI_COLORMAP(mi),
+ rotate_colors(
mi->xgwa.screen
, MI_COLORMAP(mi),
swirl->rgb_values, swirl->colours, 1);
#else /* !STANDALONE */
/* rotate the colours */
swirl->rgb_values, swirl->colours, 1);
#else /* !STANDALONE */
/* rotate the colours */
@@
-1412,10
+1413,9
@@
draw_swirl(ModeInfo * mi)
#ifdef STANDALONE
/* Pick a new colormap! */
XClearWindow (MI_DISPLAY(mi), MI_WINDOW(mi));
#ifdef STANDALONE
/* Pick a new colormap! */
XClearWindow (MI_DISPLAY(mi), MI_WINDOW(mi));
- free_colors (
MI_DISPLAY(mi)
, MI_COLORMAP(mi),
+ free_colors (
mi->xgwa.screen
, MI_COLORMAP(mi),
mi->colors, mi->npixels);
mi->colors, mi->npixels);
- make_smooth_colormap (MI_DISPLAY(mi),
- MI_VISUAL(mi),
+ make_smooth_colormap (mi->xgwa.screen, MI_VISUAL(mi),
MI_COLORMAP(mi),
mi->colors, &mi->npixels, True,
&mi->writable_p, True);
MI_COLORMAP(mi),
mi->colors, &mi->npixels, True,
&mi->writable_p, True);