add strict ansi compliance

[chaz/openbox] / render / mask.c

diff --git a/render/mask.c b/render/mask.c
index 14836be71e54cb5048d792ac89a505fcbb08bedf..5f5aa263057dc30b0c2e6bf4b9b3778b4a1e7bc8 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -16,6 +16,22 @@ void pixmap_mask_free(pixmap_mask *m)
     g_free(m);
 }
 
-void mask_draw(pixmap_mask *p, TextureMask *m)
+void mask_draw(Pixmap p, TextureMask *m, int width, int height)
 {
+    int x, y;
+    if (m->mask == None) return; /* no mask given */
+
+    /* 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 */
+    XFillRectangle(ob_display, p, m->color->gc, x, y,
+                   x + m->mask->w, y + m->mask->h);
+
+    /* unset the clip region */
+    XSetClipMask(ob_display, m->color->gc, None);
+    XSetClipOrigin(ob_display, m->color->gc, 0, 0);
 }