add a Rect to the textures for positioning them

[chaz/openbox] / render / mask.c

diff --git a/render/mask.c b/render/mask.c
index 5f5aa263057dc30b0c2e6bf4b9b3778b4a1e7bc8..e1a18933143993a33a10676a93597830e58755f2 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -16,14 +16,18 @@ void pixmap_mask_free(pixmap_mask *m)
     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 */
 
     /* set the clip region */
-    x = (width - m->mask->w) / 2;
-    y = (height - m->mask->h) / 2;
+    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;
+
     XSetClipMask(ob_display, m->color->gc, m->mask->mask);
     XSetClipOrigin(ob_display, m->color->gc, x, y);