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
/
metaballs.c
diff --git
a/hacks/metaballs.c
b/hacks/metaballs.c
index 2eb5ed4ad27d2660a38259d3a1d0c326aa227224..b79dd95d94151550f4fd346a4753791a6e410008 100644
(file)
--- a/
hacks/metaballs.c
+++ b/
hacks/metaballs.c
@@
-62,7
+62,7
@@
static void init_blob(struct state *st, BLOB *blob)
static void Execute( struct state *st )
{
static void Execute( struct state *st )
{
-
unsigned
int i, j, k;
+ int i, j, k;
/* clear st->blub array */
for (i = 0; i < st->iWinHeight; ++i)
/* clear st->blub array */
for (i = 0; i < st->iWinHeight; ++i)
@@
-200,7
+200,7
@@
static void Initialize( struct state *st )
{
XGCValues gcValues;
XWindowAttributes XWinAttribs;
{
XGCValues gcValues;
XWindowAttributes XWinAttribs;
- int
iBitsPerPixel,
i, j;
+ int
/*iBitsPerPixel,*/
i, j;
unsigned int distance_squared;
float fraction;
unsigned int distance_squared;
float fraction;
@@
-208,6
+208,7
@@
static void Initialize( struct state *st )
XGetWindowAttributes( st->dpy, st->window, &XWinAttribs );
/* Find the preferred bits-per-pixel. (jwz) */
XGetWindowAttributes( st->dpy, st->window, &XWinAttribs );
/* Find the preferred bits-per-pixel. (jwz) */
+#if 0
{
int pfvc = 0;
XPixmapFormatValues *pfv = XListPixmapFormats( st->dpy, &pfvc );
{
int pfvc = 0;
XPixmapFormatValues *pfv = XListPixmapFormats( st->dpy, &pfvc );
@@
-220,6
+221,7
@@
static void Initialize( struct state *st )
if( pfv )
XFree (pfv);
}
if( pfv )
XFree (pfv);
}
+#endif
/* Create the GC. */
st->gc = XCreateGC( st->dpy, st->window, 0, &gcValues );
/* Create the GC. */
st->gc = XCreateGC( st->dpy, st->window, 0, &gcValues );
@@
-403,9
+405,12
@@
static const char *metaballs_defaults [] = {
"*count: 10",
"*cycles: 1000",
"*ncolors: 256",
"*count: 10",
"*cycles: 1000",
"*ncolors: 256",
- "*delay:
5
000",
+ "*delay:
10
000",
"*radius: 100",
"*delta: 3",
"*radius: 100",
"*delta: 3",
+#ifdef USE_IPHONE
+ "*ignoreRotation: True",
+#endif
0
};
0
};
@@
-421,7
+426,7
@@
static XrmOptionDescRec metaballs_options [] = {
};
};
-XSCREENSAVER_MODULE ("Meta
b
alls", metaballs)
+XSCREENSAVER_MODULE ("Meta
B
alls", metaballs)
/* End of Module - "metaballs.c" */
/* End of Module - "metaballs.c" */