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
/
moire.c
diff --git
a/hacks/moire.c
b/hacks/moire.c
index 10797a5f2610ecbfb1b8f6b825f5cedcddb9b534..d55a9b85db7264ec07b166913a6f3011a13d1348 100644
(file)
--- a/
hacks/moire.c
+++ b/
hacks/moire.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 1997-20
08
Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-20
13
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-120,7
+120,7
@@
moire_init_1 (struct state *st)
st->colors = (XColor *) malloc (sizeof (XColor) * (st->ncolors+2));
memset(st->colors, 0, (sizeof (XColor) * (st->ncolors+2)));
st->colors = (XColor *) malloc (sizeof (XColor) * (st->ncolors+2));
memset(st->colors, 0, (sizeof (XColor) * (st->ncolors+2)));
- make_color_ramp (
st->dpy
, xgwa.colormap,
+ make_color_ramp (
xgwa.screen, xgwa.visual
, xgwa.colormap,
fgh, fgs, fgv, bgh, bgs, bgv,
st->colors, &st->ncolors,
True, True, False);
fgh, fgs, fgv, bgh, bgs, bgv,
st->colors, &st->ncolors,
True, True, False);
@@
-259,6
+259,9
@@
static const char *moire_defaults [] = {
"*useSHM: True",
#else
"*useSHM: False",
"*useSHM: True",
#else
"*useSHM: False",
+#endif
+#ifdef USE_IPHONE
+ "*ignoreRotation: True",
#endif
0
};
#endif
0
};