focus a window on desktop switch

[chaz/openbox] / render / mask.c

diff --git a/render/mask.c b/render/mask.c
index 868c76125aad1f88c0b871fec9e9280673e16ca4..e1a18933143993a33a10676a93597830e58755f2 100644 (file)
--- a/render/mask.c
+++ b/render/mask.c
@@ -16,22 +16,26 @@ 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
+    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;
+
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
 
-    // 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
+    /* 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
+    /* unset the clip region */
     XSetClipMask(ob_display, m->color->gc, None);
     XSetClipOrigin(ob_display, m->color->gc, 0, 0);
 }