in keeping with my tradition of committing untested code, here is the

pixmap mask rendering code ported from the old otk dirs
This commit is contained in:
Derek Foreman 2003-03-17 01:08:34 +00:00
parent 57314ce522
commit f1db272154
3 changed files with 24 additions and 2 deletions

View file

@ -16,6 +16,22 @@ void pixmap_mask_free(pixmap_mask *m)
g_free(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);
} }

View file

@ -7,6 +7,6 @@
pixmap_mask *pixmap_mask_new(int w, int h, char *data); pixmap_mask *pixmap_mask_new(int w, int h, char *data);
void pixmap_mask_free(pixmap_mask *m); 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 #endif

View file

@ -4,6 +4,7 @@
#include "render.h" #include "render.h"
#include "gradient.h" #include "gradient.h"
#include "font.h" #include "font.h"
#include "mask.h"
#include "../kernel/openbox.h" #include "../kernel/openbox.h"
int render_depth; 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); font_draw(l->xftdraw, &l->texture[i].data.text);
break; 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); XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);