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
/
wormhole.c
diff --git
a/hacks/wormhole.c
b/hacks/wormhole.c
index 631b42b86ad3f336c02e10f4639e950d4cff1ee1..4529d5d68b1f37eb0a61714af48287a5b7b845a8 100644
(file)
--- a/
hacks/wormhole.c
+++ b/
hacks/wormhole.c
@@
-1,5
+1,4
@@
-/* xscreensaver, Copyright (c) 1992, 1995, 1996, 1997, 1998, 2004, 2006
- * Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2011 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
@@
-87,7
+86,7
@@
struct state {
/*inline*/ static int rnd( int q )
{
/*inline*/ static int rnd( int q )
{
-
+ if (q < 1) q = 1;
return random() % q;
}
return random() % q;
}
@@
-101,16
+100,16
@@
static int gang( int x1, int y1, int x2, int y2 )
tang = 90;
else
tang = 270;
tang = 90;
else
tang = 270;
- }
- if ( y1 == y2 ) {
+ } else if ( y1 == y2 ) {
if ( x1 < x2 )
tang = 0;
else
tang = 180;
if ( x1 < x2 )
tang = 0;
else
tang = 180;
- } else
- tang = (int)(0.5+atan2( -(y2-y1), x2 - x1 ) * 180.0 / M_PI );
+ } else {
+ tang = (int)(0.5+atan2( -(y2-y1), x2 - x1 ) * 180.0 / M_PI );
+ }
while ( tang < 0 )
tang += 360;
while ( tang < 0 )
tang += 360;
@@
-170,7
+169,6
@@
static void initColorChanger( struct state *st, color_changer * ch )
{
int q;
{
int q;
- int min, max;
XColor old_color, new_color;
ch->shade_max = 2048;
XColor old_color, new_color;
ch->shade_max = 2048;
@@
-185,9
+183,6
@@
static void initColorChanger( struct state *st, color_changer * ch )
initXColor( &new_color );
for ( q = 0; q < ch->shade_max; q += ch->shade_use ){
initXColor( &new_color );
for ( q = 0; q < ch->shade_max; q += ch->shade_use ){
- min = q;
- max = q + ch->shade_use;
- if ( max >= ch->shade_max ) max = ch->shade_max-1;
blend_palette( ch->shade + q, ch->shade_use, &old_color, &new_color );
old_color = new_color;
blend_palette( ch->shade + q, ch->shade_use, &old_color, &new_color );
old_color = new_color;
@@
-713,6
+708,9
@@
static const char *wormhole_defaults [] = {
"*delay: 10000",
"*zspeed: 10",
"*stars: 20",
"*delay: 10000",
"*zspeed: 10",
"*stars: 20",
+#ifdef USE_IPHONE
+ "*ignoreRotation: True",
+#endif
0
};
0
};