X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fdeluxe.c;h=75b9832900956d7d6369d2fbbe3bb87e997e3840;hp=739536e7f741683d0cb2892827d96150936ea5e5;hb=96a411663168b0ba5432b407a83be55f3df0c802;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7

diff --git a/hacks/deluxe.c b/hacks/deluxe.c
index 739536e7..75b98329 100644
--- a/hacks/deluxe.c
+++ b/hacks/deluxe.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1999 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1999, 2001, 2002 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
@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include "screenhack.h"
+#include "alpha.h"
 
 #ifdef HAVE_DOUBLE_BUFFER_EXTENSION
 # include "xdbe.h"
@@ -19,6 +20,10 @@
 #define countof(x) (sizeof(x)/sizeof(*(x)))
 #define ABS(x) ((x)<0?-(x):(x))
 
+static Bool transparent_p;
+static int nplanes;
+static unsigned long base_pixel, *plane_masks;
+
 struct throbber {
   int x, y;
   int size;
@@ -120,6 +125,7 @@ static struct throbber *
 make_throbber (Display *dpy, Drawable d, int w, int h, unsigned long pixel)
 {
   XGCValues gcv;
+  unsigned long flags;
   struct throbber *t = (struct throbber *) malloc (sizeof (*t));
   t->x = w / 2;
   t->y = h / 2;
@@ -137,15 +143,25 @@ make_throbber (Display *dpy, Drawable d, int w, int h, unsigned long pixel)
   else
     t->size = t->thickness, t->speed = -t->speed;
 
-  gcv.foreground = pixel;
+  flags = GCForeground;
+  if (transparent_p)
+    {
+      gcv.foreground = ~0L;
+      gcv.plane_mask = base_pixel | plane_masks[random() % nplanes];
+      flags |= GCPlaneMask;
+    }
+  else
+    {
+      gcv.foreground = pixel;
+    }
+
   gcv.line_width = t->thickness;
   gcv.line_style = LineSolid;
   gcv.cap_style = CapProjecting;
   gcv.join_style = JoinMiter;
-  t->gc = XCreateGC (dpy, d,
-                     (GCForeground|GCLineWidth|GCLineStyle|
-                      GCCapStyle|GCJoinStyle),
-                     &gcv);
+
+  flags |= (GCLineWidth | GCLineStyle | GCCapStyle | GCJoinStyle);
+  t->gc = XCreateGC (dpy, d, flags, &gcv);
 
   switch (random() % 11) {
   case 0: case 1: case 2: case 3: t->draw = draw_star; break;
@@ -201,9 +217,12 @@ char *defaults [] = {
   "*thickness:		50",
   "*speed:		15",
   "*ncolors:		20",
+  "*nlayers:		0",
+  "*transparent:	False",
   "*doubleBuffer:	True",
 #ifdef HAVE_DOUBLE_BUFFER_EXTENSION
   "*useDBE:		True",
+  "*useDBEClear:	True",
 #endif /* HAVE_DOUBLE_BUFFER_EXTENSION */
   0
 };
@@ -214,6 +233,8 @@ XrmOptionDescRec options [] = {
   { "-count",		".count",	XrmoptionSepArg, 0 },
   { "-ncolors",		".ncolors",	XrmoptionSepArg, 0 },
   { "-speed",		".speed",	XrmoptionSepArg, 0 },
+  { "-transparent",	".transparent",	 XrmoptionNoArg,  "True" },
+  { "-opaque",		".transparent",	 XrmoptionNoArg,  "False" },
   { "-db",		".doubleBuffer", XrmoptionNoArg,  "True" },
   { "-no-db",		".doubleBuffer", XrmoptionNoArg,  "False" },
   { 0, 0, 0, 0 }
@@ -226,7 +247,8 @@ screenhack (Display *dpy, Window window)
   int delay = get_integer_resource ("delay", "Integer");
   int ncolors = get_integer_resource ("ncolors", "Integer");
   Bool dbuf = get_boolean_resource ("doubleBuffer", "Boolean");
-  XColor colors[255];
+  Bool dbeclear_p = get_boolean_resource ("useDBEClear", "Boolean");
+  XColor *colors = 0;
   XGCValues gcv;
   GC erase_gc = 0;
   int i;
@@ -239,6 +261,10 @@ screenhack (Display *dpy, Window window)
 
   XGetWindowAttributes (dpy, window, &xgwa);
 
+  transparent_p = get_boolean_resource("transparent", "Transparent");
+
+  colors = (XColor *) calloc (sizeof(*colors), ncolors);
+
   if (get_boolean_resource("mono", "Boolean"))
     {
     MONO:
@@ -246,8 +272,27 @@ screenhack (Display *dpy, Window window)
       colors[0].pixel = get_pixel_resource("foreground", "Foreground",
                                            dpy, xgwa.colormap);
     }
+  else if (transparent_p)
+    {
+      nplanes = get_integer_resource ("planes", "Planes");
+      if (nplanes <= 0)
+        nplanes = (random() % (xgwa.depth-2)) + 2;
+
+      allocate_alpha_colors (xgwa.screen, xgwa.visual, xgwa.colormap,
+                             &nplanes, True, &plane_masks,
+			     &base_pixel);
+      if (nplanes <= 1)
+	{
+	  fprintf (stderr,
+         "%s: couldn't allocate any color planes; turning transparency off.\n",
+		   progname);
+          transparent_p = False;
+	  goto COLOR;
+	}
+    }
   else
     {
+    COLOR:
       make_random_colormap (dpy, xgwa.visual, xgwa.colormap,
                             colors, &ncolors, True, True, 0, True);
       if (ncolors < 2)
@@ -257,7 +302,11 @@ screenhack (Display *dpy, Window window)
   if (dbuf)
     {
 #ifdef HAVE_DOUBLE_BUFFER_EXTENSION
-      b = backb = xdbe_get_backbuffer (dpy, window, XdbeUndefined);
+      if (dbeclear_p)
+        b = xdbe_get_backbuffer (dpy, window, XdbeBackground);
+      else
+        b = xdbe_get_backbuffer (dpy, window, XdbeUndefined);
+      backb = b;
 #endif /* HAVE_DOUBLE_BUFFER_EXTENSION */
 
       if (!b)
@@ -286,7 +335,12 @@ screenhack (Display *dpy, Window window)
 
   while (1)
     {
-      XFillRectangle (dpy, b, erase_gc, 0, 0, xgwa.width, xgwa.height);
+      if (!dbeclear_p
+#ifdef HAVE_DOUBLE_BUFFER_EXTENSION
+          || !backb
+#endif /* HAVE_DOUBLE_BUFFER_EXTENSION */
+          )
+        XFillRectangle (dpy, b, erase_gc, 0, 0, xgwa.width, xgwa.height);
 
       for (i = 0; i < count; i++)
         if (throb (dpy, b, throbbers[i]) < 0)
@@ -298,7 +352,7 @@ screenhack (Display *dpy, Window window)
         {
           XdbeSwapInfo info[1];
           info[0].swap_window = window;
-          info[0].swap_action = XdbeUndefined;
+          info[0].swap_action = (dbeclear_p ? XdbeBackground : XdbeUndefined);
           XdbeSwapBuffers (dpy, info, 1);
         }
       else