From f1db2721541af239f6af053526abd4cf80b750e0 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 17 Mar 2003 01:08:34 +0000 Subject: [PATCH] in keeping with my tradition of committing untested code, here is the pixmap mask rendering code ported from the old otk dirs --- render/mask.c | 18 +++++++++++++++++- render/mask.h | 2 +- render/render.c | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/render/mask.c b/render/mask.c index 14836be7..868c7612 100644 --- 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); } diff --git a/render/mask.h b/render/mask.h index 796155f1..43b5dacd 100644 --- a/render/mask.h +++ b/render/mask.h @@ -7,6 +7,6 @@ pixmap_mask *pixmap_mask_new(int w, int h, char *data); void pixmap_mask_free(pixmap_mask *m); -void mask_draw(pixmap_mask *p, TextureMask *m); +void mask_draw(Pixmap p, TextureMask *m, int width, int height); #endif diff --git a/render/render.c b/render/render.c index 0bc7bc49..31d522c4 100644 --- a/render/render.c +++ b/render/render.c @@ -4,6 +4,7 @@ #include "render.h" #include "gradient.h" #include "font.h" +#include "mask.h" #include "../kernel/openbox.h" int render_depth; @@ -107,6 +108,11 @@ void x_paint(Window win, Appearance *l, int w, int h) } font_draw(l->xftdraw, &l->texture[i].data.text); break; + case Bitmask: + if (l->texture[i].data.mask.color->gc == None) + color_allocate_gc(l->texture[i].data.mask.color); + mask_draw(l->pixmap, &l->texture[i].data.mask, w, h); + break; } } XSetWindowBackgroundPixmap(ob_display, win, l->pixmap); -- 2.45.2