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

[xscreensaver] / utils / colorbars.c

diff --git a/utils/colorbars.c b/utils/colorbars.c
index fc2952678d53d5a06c3f1e001895bb8aca667031..3e2bc871a9984e7c249f64ae73d732799de58039 100644 (file)
--- a/utils/colorbars.c
+++ b/utils/colorbars.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-2018 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
@@ -16,6 +16,7 @@
 #include "utils.h"
 #include "resources.h"
 #include "colorbars.h"
+#include "../hacks/ximage-loader.h"
 
 static const char * const colors[7][18] = {
   { "#CCCCCC", "#FFFF00", "#00FFFF", "#00FF00",                /* tall bars */
@@ -53,18 +54,28 @@ static const int heights[7] = { 63, 10, 1, 5, 5, 1, 15 };   /* percentages */
 
 
 void
-draw_colorbars (Display *dpy, Window window,
-                int x, int y, int width, int height)
+draw_colorbars (Screen *screen, Visual *visual,
+                Drawable drawable, Colormap cmap,
+                int x, int y, int width, int height,
+                Pixmap logo, Pixmap logo_mask)
 {
-  int oy = y;
+  Display *dpy = DisplayOfScreen (screen);
   int ypct = 0;
   int j;
   XGCValues gcv;
-  GC gc = XCreateGC (dpy, window, 0, &gcv);
-  Colormap cmap;
-  XWindowAttributes xgwa;
-  XGetWindowAttributes (dpy, window, &xgwa);
-  cmap = xgwa.colormap;
+  GC gc = XCreateGC (dpy, drawable, 0, &gcv);
+
+  if (width <= 0 || height <= 0)
+    {
+      Window root;
+      int xx, yy;
+      unsigned int bw, d;
+      XGetGeometry (dpy, drawable,
+                    &root, &xx, &yy,
+                    (unsigned int *) &width,
+                    (unsigned int *) &height,
+                    &bw, &d);
+    }
 
   for (j = 0; j < sizeof(colors) / sizeof(*colors); j++)
     {
@@ -88,46 +99,32 @@ draw_colorbars (Display *dpy, Window window,
           if (!XAllocColor (dpy, cmap, &xcolor))
             continue;
           XSetForeground (dpy, gc, xcolor.pixel);
-          XFillRectangle (dpy, window, gc, x1, y, w, h);
+          XFillRectangle (dpy, drawable, gc, x1, y, w, h);
           x1 = x2;
        }
       y = y2;
     }
 
-  y = oy;
-
   /* Add in the xscreensaver logo */
-  {
-    unsigned long *pixels; /* ignored - unfreed */
-    int npixels;
-    unsigned long bg = ~0;
-    Pixmap logo_mask = 0;
-    Pixmap logo_map = xscreensaver_logo (dpy, window, cmap, bg,
-                                         &pixels, &npixels, &logo_mask,
-                                         True);
-    if (logo_map)
-      {
-        Window root;
-        int logo_width, logo_height;
-        int w = width;
-        int h = height * heights[0] / 100;
-        int x1, y1, bw, d;
-        XGetGeometry (dpy, logo_map, &root, &x1, &y1,
-                      &logo_width, &logo_height, &bw, &d);
-        x1 = x + (w - logo_width) / 2;
-        y1 = y + (h - logo_height) / 2;
-        if (logo_mask)
-          {
-            XSetClipMask (dpy, gc, logo_mask);
-            XSetClipOrigin (dpy, gc, x1, y1);
-          }
-        XCopyArea (dpy, logo_map, window, gc,
-                   0, 0, logo_width, logo_height, x1, y1);
-        XFreePixmap (dpy, logo_map);
-        if (logo_mask)
-          XFreePixmap (dpy, logo_mask);
-      }
-  }
+  if (logo)
+    {
+      Window r;
+      int x, y;
+      unsigned int logo_width, logo_height, bw, d;
+      int x1, y1, w, h;
+      XGetGeometry (dpy, logo, &r, &x, &y, &logo_width, &logo_height, &bw, &d);
+      w = width;
+      h = height * heights[0] / 100;
+      x1 = x + (w - (int) logo_width) / 2;
+      y1 = y + (h - (int) logo_height) / 2;
+      if (logo_mask)
+        {
+          XSetClipMask (dpy, gc, logo_mask);
+          XSetClipOrigin (dpy, gc, x1, y1);
+        }
+      XCopyArea (dpy, logo, drawable, gc, 0, 0,
+                 logo_width, logo_height, x1, y1);
+    }
 
   XFreeGC(dpy, gc);
 }