in keeping with my tradition of committing untested code, here is the

pixmap mask rendering code ported from the old otk dirs

diff --git a/render/mask.c b/render/mask.c
index 14836be71e54cb5048d792ac89a505fcbb08bedf..868c76125aad1f88c0b871fec9e9280673e16ca4 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -16,6 +16,22 @@ void pixmap_mask_free(pixmap_mask *m)
     g_free(m);
 }
 
-void mask_draw(pixmap_mask *p, TextureMask *m)
+void mask_draw(Pixmap p, TextureMask *m, int width, int height)
 {
+    int x, y;
+    if (m->mask == None) return; // no mask given
+
+    // set the clip region
+    x = (width - m->mask->w) / 2;
+    y = (height - m->mask->h) / 2;
+    XSetClipMask(ob_display, m->color->gc, m->mask->mask);
+    XSetClipOrigin(ob_display, m->color->gc, x, y);
+
+    // fill in the clipped region
+    XFillRectangle(ob_display, p, m->color->gc, x, y,
+                   x + m->mask->w, y + m->mask->h);
+
+    // unset the clip region
+    XSetClipMask(ob_display, m->color->gc, None);
+    XSetClipOrigin(ob_display, m->color->gc, 0, 0);
 }

diff --git a/render/mask.h b/render/mask.h
index 796155f13b879b69e38a8343788453a1ddef5528..43b5dacdbb9e08f9d4b8393d9024b80aab36b7d8 100644 (file)
--- a/render/mask.h
+++ b/render/mask.h
@@ -7,6 +7,6 @@
 
 pixmap_mask *pixmap_mask_new(int w, int h, char *data);
 void pixmap_mask_free(pixmap_mask *m);
-void mask_draw(pixmap_mask *p, TextureMask *m);
+void mask_draw(Pixmap p, TextureMask *m, int width, int height);
 
 #endif

diff --git a/render/render.c b/render/render.c
index 0bc7bc496952752a25ebd84df431c2f2951ae308..31d522c4edab9e81f9e050d6d33d72f906a10d41 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -4,6 +4,7 @@
 #include "render.h"
 #include "gradient.h"
 #include "font.h"
+#include "mask.h"
 #include "../kernel/openbox.h"
 
 int render_depth;
@@ -107,6 +108,11 @@ void x_paint(Window win, Appearance *l, int w, int h)
             }
             font_draw(l->xftdraw, &l->texture[i].data.text);
         break;
+        case Bitmask:
+            if (l->texture[i].data.mask.color->gc == None)
+                color_allocate_gc(l->texture[i].data.mask.color);
+            mask_draw(l->pixmap, &l->texture[i].data.mask, w, h);
+        break;
         }
     }
     XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);