X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Frd-bomb.c;h=e380c2711ff35fb3ad3afef57221e707019b006c;hb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;hp=b420036c92058df73f7bef0b06eca9762cfe336a;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/hacks/rd-bomb.c b/hacks/rd-bomb.c
index b420036c..e380c271 100644
--- a/hacks/rd-bomb.c
+++ b/hacks/rd-bomb.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1995, 1997, 1998
+/* xscreensaver, Copyright (c) 1992, 1995, 1997, 1998, 1999
  *  Jamie Zawinski <jwz@jwz.org>
  *
  *  reaction/diffusion textures
@@ -305,7 +305,7 @@ char *defaults [] = {
   "*verbose:	off",
   "*radius:	-1",
   "*speed:	0.0",
-  "*size:	0.66",
+  "*size:	1.0",
   "*delay:	1",
   "*colors:	-1",
 #ifdef HAVE_XSHM_EXTENSION
@@ -436,6 +436,40 @@ screenhack (Display *dpy, Window win)
 	    vdepth <= 16 ? 16 :
 	    32);
 
+  /* Ok, this like, sucks and stuff.  There are some XFree86 systems
+     that have depth-24 visuals, that do not accept depth-32 XImages!
+     Which if you ask me is just absurd, since all it would take is
+     for the server to truncate the bits in that case.  So, this crap
+     here detects the specific case of: we have chosen depth 32;
+     and the server does not support depth 32.  In that case, we
+     try and use depth 16 instead.
+
+     The real fix would be to rewrite this program to deal with
+     depth 24 directly (or even better, arbitrary depths, but that
+     would mean going through the XImage routines instead of messing
+     with the XImage->data directly.)
+
+     jwz, 18-Mar-99: well, the X servers I have access to these days do
+     support 32-deep images on deep visuals, so I no longer have the
+     ability to test this code -- but it was causing problems on the
+     visuals that I do have, and I think that's because I mistakenly
+     wrote `pfv[i].depth' when I meant to write `pfv[i].bits_per_pixel'.
+     The symptom I was seeing was that the grid was 64x64, but the
+     images were being drawn 32x32 -- so there was a black stripe on
+     every other row.  Wow, this code sucks so much.
+   */
+  if (pdepth == 32)
+    {
+      int i, pfvc = 0;
+      Bool ok = False;
+      XPixmapFormatValues *pfv = XListPixmapFormats (dpy, &pfvc);
+      for (i = 0; i < pfvc; i++)
+        if (pfv[i].bits_per_pixel == pdepth)
+          ok = True;
+      if (!ok)
+        pdepth = 16;
+    }
+
   cmap = xgwa.colormap;
   ncolors = get_integer_resource ("colors", "Integer");
 
@@ -541,6 +575,7 @@ screenhack (Display *dpy, Window win)
     frame++;
 
     XSync(dpy, False);
+    screenhack_handle_events (dpy);
     if (delay > 0)
       usleep(1000 * delay);
   }