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.38.tar.gz
[xscreensaver]
/
hacks
/
wormhole.c
diff --git
a/hacks/wormhole.c
b/hacks/wormhole.c
index 0e55eabd1b81e4e2e421cb0f2ed5cd23f5cd5f49..f28c5b2514640688032bdefd7be59347ab772dcd 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;
}
@@
-304,7
+303,7
@@
static void resizeWormhole( struct state *st, wormhole * worm )
st->SCREEN_X = attr.width;
st->SCREEN_Y = attr.height;
st->SCREEN_X = attr.width;
st->SCREEN_Y = attr.height;
-# ifndef HAVE_
COCOA
/* Don't second-guess Quartz's double-buffering */
+# ifndef HAVE_
JWXYZ
/* Don't second-guess Quartz's double-buffering */
XFreePixmap( st->dpy, worm->work );
worm->work = XCreatePixmap( st->dpy, st->window, st->SCREEN_X, st->SCREEN_Y, attr.depth );
# endif
XFreePixmap( st->dpy, worm->work );
worm->work = XCreatePixmap( st->dpy, st->window, st->SCREEN_X, st->SCREEN_Y, attr.depth );
# endif
@@
-324,7
+323,7
@@
static void initWormhole( struct state *st, wormhole * worm, Display * display,
st->SCREEN_X = attr.width;
st->SCREEN_Y = attr.height;
st->SCREEN_X = attr.width;
st->SCREEN_Y = attr.height;
-# ifdef HAVE_
COCOA
/* Don't second-guess Quartz's double-buffering */
+# ifdef HAVE_
JWXYZ
/* Don't second-guess Quartz's double-buffering */
worm->work = st->window;
# else
worm->work = XCreatePixmap( st->dpy, st->window, st->SCREEN_X, st->SCREEN_Y, attr.depth );
worm->work = st->window;
# else
worm->work = XCreatePixmap( st->dpy, st->window, st->SCREEN_X, st->SCREEN_Y, attr.depth );
@@
-704,11
+703,15
@@
wormhole_free (Display *dpy, Window window, void *closure)
static const char *wormhole_defaults [] = {
static const char *wormhole_defaults [] = {
+ ".lowrez: true",
".background: Black",
".foreground: #E9967A",
"*delay: 10000",
"*zspeed: 10",
"*stars: 20",
".background: Black",
".foreground: #E9967A",
"*delay: 10000",
"*zspeed: 10",
"*stars: 20",
+#ifdef HAVE_MOBILE
+ "*ignoreRotation: True",
+#endif
0
};
0
};