X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Frd-bomb.c;h=0c074ea49f442e928539ab323da3f939e9af6383;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=c4b56391d2044ab9edd07a7953e67d06ab21be9e;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/rd-bomb.c b/hacks/rd-bomb.c
index c4b56391..0c074ea4 100644
--- a/hacks/rd-bomb.c
+++ b/hacks/rd-bomb.c
@@ -1,5 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1995, 1997, 1998, 1999, 2003, 2006
- *  Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
  *
  *  reaction/diffusion textures
  *  Copyright (c) 1997 Scott Draves spot@transmeta.com
@@ -33,7 +32,6 @@ struct state {
   Display *dpy;
   Window window;
 
-  int verbose;
   int ncolors;
   XColor *colors;
   Visual *visual;
@@ -87,22 +85,26 @@ static void random_colors(struct state *st);
 
 /* why strip bit? */
 #define R (random()&((1<<30)-1))
+#define BELLRAND(x) (((random()%(x)) + (random()%(x)) + (random()%(x)))/3)
 
 /* returns number of pixels that the pixack produces.  called once. */
 static void
 pixack_init(struct state *st, int *size_h, int *size_v) 
 {
-  int sz_base;
-  st->width = get_integer_resource (st->dpy, "width", "Integer");
+  st->width  = get_integer_resource (st->dpy, "width",  "Integer");
   st->height = get_integer_resource (st->dpy, "height", "Integer");
-  sz_base = 80 + (R%40);
-  if (st->width <= 0) st->width = (R%20) ? sz_base : (28 + R%10);
-  if (st->height <= 0) st->height = (R%20) ? sz_base : (28 + R%10);
+
+  if (st->width <= 0 && st->height <= 0 && (R & 1))
+    st->width = st->height = 48 + BELLRAND(256);
+
+  if (st->width  <= 0) st->width  = 48 + BELLRAND(256);
+  if (st->height <= 0) st->height = 48 + BELLRAND(256);
 
   /* jwz: when (and only when) XSHM is in use on an SGI 8-bit visual,
      we get shear unless st->width is a multiple of 4.  I don't understand
      why.  This is undoubtedly the wrong fix... */
-  st->width &= ~0x7;
+  if (visual_depth (st->xgwa.screen, st->xgwa.visual) == 8)
+    st->width &= ~0x7;
 
   /* don't go there */
   if (st->width < 10) st->width = 10;
@@ -137,23 +139,7 @@ pixack_frame(struct state *st, char *pix_buf)
   if (st->frame&0x100)
     sleep(1);
 #endif
-  if (st->verbose) {
-    double tm = 0;
-    struct timeval tp;
-    if (!(st->frame%100)) {
-      double tm2;
-#ifdef GETTIMEOFDAY_TWO_ARGS
-      struct timezone tzp;
-      gettimeofday(&tp, &tzp);
-#else
-      gettimeofday(&tp);
-#endif
-      tm2 = tp.tv_sec + tp.tv_usec * 1e-6;
-      if (st->frame > 0)
-	printf("fps = %2.4g\n", 100.0 / (tm2 - tm));
-      tm = tm2;
-    }
-  }
+
   if (!(st->frame%st->epoch_time)) {
     int s;
     if (0 != st->frame) {
@@ -195,10 +181,6 @@ pixack_frame(struct state *st, char *pix_buf)
       st->diffusion = (R%5) ? ((R%3)?0:1) : 2;
     if (2 == st->reaction && 2 == st->diffusion)
       st->reaction = st->diffusion = 0;
-      
-    if (st->verbose)
-      printf("reaction = %d\ndiffusion = %d\nradius = %d\n",
-	     st->reaction, st->diffusion, st->radius);
   }
   for (i = 0; i <= st->width+1; i++) {
     st->r1[i] = st->r1[i + w2 * st->height];
@@ -311,17 +293,17 @@ pixack_frame(struct state *st, char *pix_buf)
 static const char *rd_defaults [] = {
   ".background:	black",
   ".foreground:	white",
+  "*fpsSolid:	true",
   "*width:	0",                     /* tried to use -1 but it complained */
   "*height:	0",
   "*epoch:	40000",
   "*reaction:	-1",
   "*diffusion:	-1",
-  "*verbose:	off",
   "*radius:	-1",
   "*speed:	0.0",
   "*size:	1.0",
-  "*delay:	20000",
-  "*colors:	-1",
+  "*delay:	30000",
+  "*colors:	255",
 #ifdef HAVE_XSHM_EXTENSION
   "*useSHM:	True",
 #else
@@ -336,7 +318,6 @@ static XrmOptionDescRec rd_options [] = {
   { "-epoch",		".epoch",	XrmoptionSepArg, 0 },
   { "-reaction",	".reaction",	XrmoptionSepArg, 0 },
   { "-diffusion",	".diffusion",	XrmoptionSepArg, 0 },
-  { "-verbose",		".verbose",	XrmoptionNoArg, "True" },
   { "-radius",		".radius",	XrmoptionSepArg, 0 },
   { "-speed",		".speed",	XrmoptionSepArg, 0 },
   { "-size",		".size",	XrmoptionSepArg, 0 },
@@ -427,7 +408,6 @@ rd_init (Display *dpy, Window win)
     if (random() & 1) st->array_dy = -st->array_dy;
 
   }
-  st->verbose = get_boolean_resource (st->dpy, "verbose", "Boolean");
   st->npix = (st->width + 2) * (st->height + 2);
   w2 = st->width + 2;
 /*  gcv.function = GXcopy;*/
@@ -480,7 +460,7 @@ rd_init (Display *dpy, Window win)
   st->cmap = st->xgwa.colormap;
   st->ncolors = get_integer_resource (st->dpy, "colors", "Integer");
 
-  if (st->ncolors <= 0) {
+  if (st->ncolors <= 0 || st->ncolors >= 255) {
     if (vdepth > 8)
       st->ncolors = 2047;
     else