X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fmask.c;h=22cb3feeb96c5879b485503fbf07c545e7df80b6;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=868c76125aad1f88c0b871fec9e9280673e16ca4;hpb=f1db2721541af239f6af053526abd4cf80b750e0;p=chaz%2Fopenbox

diff --git a/render/mask.c b/render/mask.c
index 868c7612..22cb3fee 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -6,32 +6,52 @@ 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, int width, int height)
+void mask_draw(Pixmap p, TextureMask *m, Rect *position)
 {
     int x, y;
-    if (m->mask == None) return; // no mask given
+    if (m->mask == None) return; /* no mask given */
+
+    /* set the clip region */
+    x = position->x + (position->width - m->mask->w) / 2;
+    y = position->y + (position->height - m->mask->h) / 2;
+
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
 
-    // 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
+    /* 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
+    /* unset the clip region */
     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;
+}