in keeping with my tradition of committing untested code, here is the pixmap mask rendering code ported from the old otk dirs
Derek Foreman manmower@gmail.com
3 files changed,
24 insertions(+),
2 deletions(-)
M
render/mask.c
→
render/mask.c
@@ -16,6 +16,22 @@ XFreePixmap(ob_display, m->mask);
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); }
M
render/mask.h
→
render/mask.h
@@ -7,6 +7,6 @@ #include "render.h"
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
M
render/render.c
→
render/render.c
@@ -4,6 +4,7 @@ #include <glib.h>
#include "render.h" #include "gradient.h" #include "font.h" +#include "mask.h" #include "../kernel/openbox.h" int render_depth;@@ -106,6 +107,11 @@ l->xftdraw = XftDrawCreate(ob_display, l->pixmap,
render_visual, render_colormap); } 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; } }