X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwander.c;h=efe9b94bbb9216ef6bb6b9cf9b40a1edae0025a8;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=9cdd090bd182a4ba06b0ac0afd2b0e5a277a43d9;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/wander.c b/hacks/wander.c
index 9cdd090b..efe9b94b 100644
--- a/hacks/wander.c
+++ b/hacks/wander.c
@@ -33,6 +33,7 @@ struct state {
    int          height;
    unsigned int length;
    unsigned int reset;
+   Bool reset_p;
    unsigned int size;
    int          width;
    int delay;
@@ -64,12 +65,13 @@ wander_init (Display *dpy, Window window)
     st->color_map = attributes.colormap;
     if (st->color_count)
     {
-        free_colors (st->dpy, st->color_map, st->colors, st->color_count);
+        free_colors (attributes.screen, st->color_map,
+                     st->colors, st->color_count);
         st->color_count = 0;
     }
     st->context = XCreateGC (st->dpy, st->window, 0, &values);
     st->color_count = MAXIMUM_COLOR_COUNT;
-    make_color_loop (st->dpy, st->color_map,
+    make_color_loop (attributes.screen, attributes.visual, st->color_map,
                     0,   1, 1,
                     120, 1, 1,
                     240, 1, 1,
@@ -168,8 +170,9 @@ wander_draw (Display *dpy, Window window, void *closure)
             }
         }
 
-      if ((random () % st->reset_limit) == 0)
+      if (st->reset_p || (random () % st->reset_limit) == 0)
         {
+          st->reset_p = 0;
           st->eraser = erase_window (st->dpy, st->window, st->eraser);
           st->color = st->colors [random () % st->color_count].pixel;
           st->x = random () % st->width;
@@ -210,11 +213,22 @@ static void
 wander_reshape (Display *dpy, Window window, void *closure, 
                  unsigned int w, unsigned int h)
 {
+  struct state *st = (struct state *) closure;
+  st->width  = w / st->size;
+  st->height = h / st->size;
+  st->width_1  = st->width - 1;
+  st->height_1 = st->height - 1;
 }
 
 static Bool
 wander_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
+  struct state *st = (struct state *) closure;
+  if (screenhack_event_helper (dpy, window, event))
+    {
+      st->reset_p = 1;
+      return True;
+    }
   return False;
 }
 
@@ -227,6 +241,7 @@ static const char *wander_defaults [] =
 {
     ".background: black",
     ".foreground: white",
+    ".fpsSolid:	  true",
     ".advance:    1",
     ".density:    2",
     ".length:     25000",
@@ -234,6 +249,9 @@ static const char *wander_defaults [] =
     ".reset:      2500000",
     ".circles:    False",
     ".size:       1",
+#ifdef USE_IPHONE
+  "*ignoreRotation: True",
+#endif
     0
 };