add pixmap_mask_copy, and add the data to the mask struct, since it is needed for...

diff --git a/render/mask.c b/render/mask.c
index e1a18933143993a33a10676a93597830e58755f2..26059ca6e581bb1c6696a9be976b546d5850eaa9 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -6,6 +6,8 @@ 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;
 }
@@ -13,6 +15,7 @@ pixmap_mask *pixmap_mask_new(int w, int h, char *data)
 void pixmap_mask_free(pixmap_mask *m)
 {
     XFreePixmap(ob_display, m->mask);
+    g_free(m->data);
     g_free(m);
 }
 
@@ -39,3 +42,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;
+}

diff --git a/render/mask.h b/render/mask.h
index 323e82e32a7779fd9c2067d21a7db6370a20f34e..89716f852f205ff6d03e847ef471053a8b6488e1 100644 (file)
--- a/render/mask.h
+++ b/render/mask.h
@@ -5,6 +5,7 @@
 #include "../kernel/geom.h"
 
 pixmap_mask *pixmap_mask_new(int w, int h, char *data);
+pixmap_mask *pixmap_mask_copy(pixmap_mask *src);
 void pixmap_mask_free(pixmap_mask *m);
 void mask_draw(Pixmap p, TextureMask *m, Rect *position);
 

diff --git a/render/render.h b/render/render.h
index d5f5f8bc37a7f38c4f323484df1b47e5854372b7..35522110f29bad46548365368e84b0a5e032296c 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -100,6 +100,7 @@ typedef struct TextureText {
 typedef struct {
     Pixmap mask;
     guint w, h;
+    char *data;
 } pixmap_mask;
 
 typedef struct TextureMask {