From http://www.jwz.org/xscreensaver/xscreensaver-5.22.tar.gz

[xscreensaver] / hacks / celtic.c

diff --git a/hacks/celtic.c b/hacks/celtic.c
index 92cba9c87c041eefe2683fa51a1e42bcfd1b0250..0bf241c2285599b3b6591c7eb45fdd7c43a4c344 100644 (file)
--- a/hacks/celtic.c
+++ b/hacks/celtic.c
@@ -718,13 +718,11 @@ static int pattern_next_unfilled_couple(Pattern p, Edge *e, Direction *d)
 
 static void pattern_make_curves(Pattern p)
 {
-  int i;
   Edge current_edge, first_edge, next_edge;
   Node current_node, first_node;
   Direction current_direction, first_direction;
   Spline s;
 
-  i=0;
   while (pattern_next_unfilled_couple(p, &first_edge, &first_direction)) {
     /* start a new loop */
     s=spline_new(random()%(p->ncolors-2)+2);
@@ -835,10 +833,14 @@ static void pattern_animate(struct state *st)
 static const char *celtic_defaults[] = {
     ".background: black",
     ".foreground: #333333",
+    "*fpsSolid:        true",
     "*ncolors: 20",
     "*delay: 10000",
     "*delay2: 5",
     "*showGraph: False",
+#ifdef USE_IPHONE
+    "*ignoreRotation: True",
+#endif
     0
 };
 
@@ -920,10 +922,10 @@ celtic_init (Display *d_arg, Window w_arg)
   else
     {
 #if 0
-      make_random_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+      make_random_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
                             st->colors, &st->ncolors, True, True, 0, True);
 #else
-      make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+      make_smooth_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
                             st->colors, &st->ncolors, True, 0, True);
 #endif
       if (st->ncolors < 2)
@@ -980,7 +982,7 @@ celtic_draw (Display *dpy, Window window, void *closure)
     /* recolor each time */
     st->ncolors = get_integer_resource (st->dpy, "ncolors", "Integer");
     if (st->ncolors > 2)
-      make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+      make_smooth_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
                             st->colors, &st->ncolors, True, 0, True);
 
     st->eraser = erase_window (st->dpy, st->window, st->eraser);