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

diff --git a/render/mask.c b/render/mask.c
index e1a18933..10ce8d0f 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,41 +1,82 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   mask.c for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#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 + 7) / 8 * h);
+    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 mask_draw(Pixmap p, TextureMask *m, Rect *position)
+void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
 {
-    int x, y;
+    gint x, y;
     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;
+    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(ob_display, m->color->gc, m->mask->mask);
-    XSetClipOrigin(ob_display, m->color->gc, x, y);
+    XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), m->mask->mask);
+    XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), x, y);
 
     /* fill in the clipped region */
-    XFillRectangle(ob_display, p, m->color->gc, x, y,
-                   x + m->mask->w, y + m->mask->h);
+    XFillRectangle(RrDisplay(m->mask->inst), p, RrColorGC(m->color), x, y,
+                   x + m->mask->width, y + m->mask->height);
 
     /* unset the clip region */
-    XSetClipMask(ob_display, m->color->gc, None);
-    XSetClipOrigin(ob_display, m->color->gc, 0, 0);
+    XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), None);
+    XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), 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 + 7) / 8 * src->height);
+    m->mask = XCreateBitmapFromData(RrDisplay(m->inst), RrRootWindow(m->inst),
+                                    m->data, m->width, m->height);
+    return m;
 }