X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fmask.c;h=22cb3feeb96c5879b485503fbf07c545e7df80b6;hb=00042637e8b8bef92456d96547230ec710cf6a7b;hp=e1a18933143993a33a10676a93597830e58755f2;hpb=2880e674eaa66b2d5639157e4506b404e2b183ad;p=chaz%2Fopenbox

diff --git a/render/mask.c b/render/mask.c
index e1a18933..22cb3fee 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -6,14 +6,19 @@ pixmap_mask *pixmap_mask_new(int w, int h, char *data)
     pixmap_mask *m = g_new(pixmap_mask, 1);
     m->w = w;
     m->h = h;
+    /* round up to nearest byte */
+    m->data = g_memdup(data, (w * h + 7) / 8);
     m->mask = XCreateBitmapFromData(ob_display, ob_root, data, w, h);
     return m;
 }
 
 void pixmap_mask_free(pixmap_mask *m)
 {
-    XFreePixmap(ob_display, m->mask);
-    g_free(m);
+    if (m) {
+        XFreePixmap(ob_display, m->mask);
+        g_free(m->data);
+        g_free(m);
+    }
 }
 
 void mask_draw(Pixmap p, TextureMask *m, Rect *position)
@@ -39,3 +44,14 @@ void mask_draw(Pixmap p, TextureMask *m, Rect *position)
     XSetClipMask(ob_display, m->color->gc, None);
     XSetClipOrigin(ob_display, m->color->gc, 0, 0);
 }
+
+pixmap_mask *pixmap_mask_copy(pixmap_mask *src)
+{
+    pixmap_mask *m = g_new(pixmap_mask, 1);
+    m->w = src->w;
+    m->h = src->h;
+    /* round up to nearest byte */
+    m->data = g_memdup(src->data, (src->w * src->h + 7) / 8);
+    m->mask = XCreateBitmapFromData(ob_display, ob_root, m->data, m->w, m->h);
+    return m;
+}