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
/
halo.c
diff --git
a/hacks/halo.c
b/hacks/halo.c
index 2b7e30fb79616a307fc67a50b7148d224e1a0e3e..40a55402a95b5491908cc6bdea686781dba9c4b5 100644
(file)
--- a/
hacks/halo.c
+++ b/
hacks/halo.c
@@
-1,5
+1,4
@@
-/* xscreensaver, Copyright (c) 1993, 1995, 1996, 1997, 1998, 1999, 2003, 2006
- * Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1993-2013 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
@@
-139,10
+138,12
@@
halo_init (Display *dpy, Window window)
if (mono_p)
;
else if (random() % (cmode == seuss_mode ? 2 : 10))
if (mono_p)
;
else if (random() % (cmode == seuss_mode ? 2 : 10))
- make_uniform_colormap (st->dpy, xgwa.visual, st->cmap, st->colors, &st->ncolors,
+ make_uniform_colormap (xgwa.screen, xgwa.visual, st->cmap,
+ st->colors, &st->ncolors,
True, 0, True);
else
True, 0, True);
else
- make_smooth_colormap (st->dpy, xgwa.visual, st->cmap, st->colors, &st->ncolors,
+ make_smooth_colormap (xgwa.screen, xgwa.visual, st->cmap,
+ st->colors, &st->ncolors,
True, 0, True);
if (st->ncolors <= 2) mono_p = True;
True, 0, True);
if (st->ncolors <= 2) mono_p = True;
@@
-404,6
+405,9
@@
static const char *halo_defaults [] = {
"*delay2: 20",
"*increment: 0",
"*animate: False",
"*delay2: 20",
"*increment: 0",
"*animate: False",
+#ifdef USE_IPHONE
+ "*ignoreRotation: True",
+#endif
0
};
0
};