X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmoire.c;h=d55a9b85db7264ec07b166913a6f3011a13d1348;hb=dba664f31aa87285db4d76cf8c5e66335299703a;hp=c52d2236bc7207af9bf2707be974e64539500918;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/moire.c b/hacks/moire.c
index c52d2236..d55a9b85 100644
--- a/hacks/moire.c
+++ b/hacks/moire.c
@@ -1,5 +1,4 @@
-/* xscreensaver, Copyright (c) 1997, 1998, 2001, 2006
- *  Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-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
@@ -121,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)));
-      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);
@@ -251,6 +250,7 @@ moire_draw (Display *dpy, Window window, void *closure)
 static const char *moire_defaults [] = {
   ".background:		blue",
   ".foreground:		red",
+  "*fpsSolid:		true",
   "*random:		true",
   "*delay:		5",
   "*ncolors:		64",
@@ -259,6 +259,9 @@ static const char *moire_defaults [] = {
   "*useSHM:	      True",
 #else
   "*useSHM:	      False",
+#endif
+#ifdef USE_IPHONE
+  "*ignoreRotation: True",
 #endif
   0
 };