X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fstarfish.c;h=6cfee31db8ddcb89a46fdb174cfd36c180056e53;hb=3f1091236d800c43a3124c44c7da54e53f205b13;hp=2ba693c0811a18ca032a0e8b9eb18503fced0b16;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/starfish.c b/hacks/starfish.c
index 2ba693c0..6cfee31d 100644
--- a/hacks/starfish.c
+++ b/hacks/starfish.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997-2008 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
@@ -341,7 +341,7 @@ reset_starfish (struct state *st)
   if (st->done_once)
     {
       if (st->colors && st->ncolors)
-	free_colors (st->dpy, st->cmap, st->colors, st->ncolors);
+	free_colors (xgwa.screen, st->cmap, st->colors, st->ncolors);
       if (st->colors)
 	free (st->colors);
       st->colors = 0;
@@ -361,10 +361,12 @@ reset_starfish (struct state *st)
   if (mono_p)
     ;
   else if (random() % 3)
-    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);
   else
-    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);
 
   if (st->ncolors < 2) st->ncolors = 2;
@@ -493,6 +495,10 @@ static void
 starfish_reshape (Display *dpy, Window window, void *closure, 
                  unsigned int w, unsigned int h)
 {
+  struct state *st = (struct state *) closure;
+  free_starfish (st->starfish);
+  st->starfish = 0;
+  st->starfish = reset_starfish (st);
 }
 
 static Bool
@@ -522,6 +528,9 @@ static const char *starfish_defaults [] = {
   "*duration:		30",
   "*delay2:		5",
   "*mode:		random",
+#ifdef USE_IPHONE
+  "*ignoreRotation:     True",
+#endif
   0
 };