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

[xscreensaver] / hacks / boxfit.c

diff --git a/hacks/boxfit.c b/hacks/boxfit.c
index 41878c0b5f52f52746b02d904975b19fb1ff6959..5daa72cb982f64eca9745a1a079a49140117eb93 100644 (file)
--- a/hacks/boxfit.c
+++ b/hacks/boxfit.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2005, 2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2005-2012 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
@@ -39,6 +39,7 @@ typedef struct {
   int spacing;
   int inc;
 
+  int mode;
   Bool circles_p;
   Bool growing_p;
   Bool color_horiz_p;
@@ -64,8 +65,6 @@ typedef struct {
 static void
 reset_boxes (state *st)
 {
-  int mode = -1;
-
   st->nboxes = 0;
   st->growing_p = True;
   st->color_horiz_p = random() & 1;
@@ -77,11 +76,11 @@ reset_boxes (state *st)
     {
       char *s = get_string_resource (st->dpy, "mode", "Mode");
       if (!s || !*s || !strcasecmp (s, "random"))
-        mode = -1;
+        st->mode = -1;
       else if (!strcasecmp (s, "squares") || !strcasecmp (s, "square"))
-        mode = 0;
+        st->mode = 0;
       else if (!strcasecmp (s, "circles") || !strcasecmp (s, "circle"))
-        mode = 1;
+        st->mode = 1;
       else
         {
           fprintf (stderr,
@@ -91,10 +90,10 @@ reset_boxes (state *st)
         }
     }
 
-  if (mode == -1)
+  if (st->mode == -1)
     st->circles_p = random() & 1;
   else
-    st->circles_p = (mode == 1);
+    st->circles_p = (st->mode == 1);
 
   st->done_once = True;
 
@@ -121,8 +120,10 @@ reset_boxes (state *st)
   else
     {
       st->ncolors = get_integer_resource (st->dpy, "colors", "Colors");  /* re-get */
+      if (st->ncolors < 1) st->ncolors = 1;
       make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
                             st->colors, &st->ncolors, True, 0, False);
+      if (st->ncolors < 1) abort();
       XClearWindow (st->dpy, st->window);
     }
 }
@@ -518,6 +519,7 @@ boxfit_free (Display *dpy, Window window, void *closure)
 static const char *boxfit_defaults [] = {
   ".background:                   black",
   ".foreground:                   #444444",
+  "*fpsSolid:             true",
   "*delay:                20000",
   "*mode:                 random",
   "*colors:               64",
@@ -551,4 +553,4 @@ static XrmOptionDescRec boxfit_options [] = {
 };
 
 
-XSCREENSAVER_MODULE ("Boxfit", boxfit)
+XSCREENSAVER_MODULE ("BoxFit", boxfit)