X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fmask.c;h=10ce8d0f0e14ebcbb01db942773952c5c6a64cb6;hb=2543dbbff86b76dd64e0f0e2765fad12de93fa08;hp=60e89d489bf8f4718ad18bb1373110525cc1c3f7;hpb=58be655de321369ceec5819a3516003a05ead575;p=chaz%2Fopenbox

diff --git a/render/mask.c b/render/mask.c
index 60e89d48..10ce8d0f 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,3 +1,22 @@
+/* -*- 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"
@@ -10,7 +29,7 @@ RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst,
     m->width = w;
     m->height = h;
     /* round up to nearest byte */
-    m->data = g_memdup(data, (w * h + 7) / 8);
+    m->data = g_memdup(data, (w + 7) / 8 * h);
     m->mask = XCreateBitmapFromData(RrDisplay(inst), RrRootWindow(inst),
                                     data, w, h);
     return m;
@@ -27,7 +46,7 @@ void RrPixmapMaskFree(RrPixmapMask *m)
 
 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 */
@@ -37,16 +56,16 @@ void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
     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);
+    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(RrDisplay(m->mask->inst), p, m->color->gc, x, y,
+    XFillRectangle(RrDisplay(m->mask->inst), p, RrColorGC(m->color), x, y,
                    x + m->mask->width, y + m->mask->height);
 
     /* unset the clip region */
-    XSetClipMask(RrDisplay(m->mask->inst), m->color->gc, None);
-    XSetClipOrigin(RrDisplay(m->mask->inst), 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)
@@ -56,7 +75,7 @@ RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src)
     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->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;