add pixmap_mask_copy, and add the data to the mask struct, since it is needed for allowing copies
Dana Jansens danakj@orodu.net
3 files changed,
16 insertions(+),
0 deletions(-)
M
render/mask.c
→
render/mask.c
@@ -6,6 +6,8 @@ {
pixmap_mask *m = g_new(pixmap_mask, 1); m->w = w; m->h = h; + /* round up to nearest byte */ + m->data = g_memdup(data, (w * h + 7) / 8); m->mask = XCreateBitmapFromData(ob_display, ob_root, data, w, h); return m; }@@ -13,6 +15,7 @@
void pixmap_mask_free(pixmap_mask *m) { XFreePixmap(ob_display, m->mask); + g_free(m->data); g_free(m); }@@ -39,3 +42,14 @@ /* unset the clip region */
XSetClipMask(ob_display, m->color->gc, None); XSetClipOrigin(ob_display, m->color->gc, 0, 0); } + +pixmap_mask *pixmap_mask_copy(pixmap_mask *src) +{ + pixmap_mask *m = g_new(pixmap_mask, 1); + m->w = src->w; + m->h = src->h; + /* round up to nearest byte */ + m->data = g_memdup(src->data, (src->w * src->h + 7) / 8); + m->mask = XCreateBitmapFromData(ob_display, ob_root, m->data, m->w, m->h); + return m; +}
M
render/mask.h
→
render/mask.h
@@ -5,6 +5,7 @@ #include "render.h"
#include "../kernel/geom.h" pixmap_mask *pixmap_mask_new(int w, int h, char *data); +pixmap_mask *pixmap_mask_copy(pixmap_mask *src); void pixmap_mask_free(pixmap_mask *m); void mask_draw(Pixmap p, TextureMask *m, Rect *position);
M
render/render.h
→
render/render.h
@@ -100,6 +100,7 @@
typedef struct { Pixmap mask; guint w, h; + char *data; } pixmap_mask; typedef struct TextureMask {