X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fmask.c;h=60e89d489bf8f4718ad18bb1373110525cc1c3f7;hb=a09984bbc076bc37b11058237f51fa15114129e2;hp=37e506f3dfe694f959b525a528f8b403dbb0965c;hpb=b824e6ad8e359bfd2762a5e35d62e1a1f4c9f20c;p=chaz%2Fopenbox

diff --git a/render/mask.c b/render/mask.c
index 37e506f3..60e89d48 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,20 +1,63 @@
+#include "render.h"
+#include "color.h"
 #include "mask.h"
-#include "../kernel/openbox.h"
 
-pixmap_mask *pixmap_mask_new(int w, int h, char *data)
+RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst,
+                              gint w, gint h, const gchar *data)
 {
-    pixmap_mask *m = g_new(pixmap_mask, 1);
-    m->w = w;
-    m->h = h;
-    m->mask = XCreateBitmapFromData(ob_display, ob_root, data, w, h);
+    RrPixmapMask *m = g_new(RrPixmapMask, 1);
+    m->inst = inst;
+    m->width = w;
+    m->height = h;
+    /* round up to nearest byte */
+    m->data = g_memdup(data, (w * h + 7) / 8);
+    m->mask = XCreateBitmapFromData(RrDisplay(inst), RrRootWindow(inst),
+                                    data, w, h);
     return m;
 }
 
-void pixmap_mask_free(pixmap_mask *m)
+void RrPixmapMaskFree(RrPixmapMask *m)
 {
-    XFreePixmap(ob_display, m->mask);
-    g_free(m);
+    if (m) {
+        XFreePixmap(RrDisplay(m->inst), m->mask);
+        g_free(m->data);
+        g_free(m);
+    }
 }
 
+void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
+{
+    int x, y;
+    if (m->mask == None) return; /* no mask given */
+
+    /* set the clip region */
+    x = area->x + (area->width - m->mask->width) / 2;
+    y = area->y + (area->height - m->mask->height) / 2;
+
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
+
+    XSetClipMask(RrDisplay(m->mask->inst), m->color->gc, m->mask->mask);
+    XSetClipOrigin(RrDisplay(m->mask->inst), m->color->gc, x, y);
+
+    /* fill in the clipped region */
+    XFillRectangle(RrDisplay(m->mask->inst), p, m->color->gc, x, y,
+                   x + m->mask->width, y + m->mask->height);
 
-/* DO YOUR MAGIC MANNY WOOT \m/ */
+    /* unset the clip region */
+    XSetClipMask(RrDisplay(m->mask->inst), m->color->gc, None);
+    XSetClipOrigin(RrDisplay(m->mask->inst), m->color->gc, 0, 0);
+}
+
+RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src)
+{
+    RrPixmapMask *m = g_new(RrPixmapMask, 1);
+    m->inst = src->inst;
+    m->width = src->width;
+    m->height = src->height;
+    /* round up to nearest byte */
+    m->data = g_memdup(src->data, (src->width * src->height + 7) / 8);
+    m->mask = XCreateBitmapFromData(RrDisplay(m->inst), RrRootWindow(m->inst),
+                                    m->data, m->width, m->height);
+    return m;
+}