nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add pixmap_mask_copy, and add the data to the mask struct, since it is needed for allowing copies

Browse source
This commit is contained in:
Dana Jansens 2003-03-29 21:12:47 +00:00
parent 2b4ab6753c
commit 4d5885d271
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
render/mask.c
View file

@ -6,6 +6,8 @@ pixmap_mask *pixmap_mask_new(int w, int h, char *data)
pixmap_mask *m = g_new(pixmap_mask, 1); pixmap_mask *m = g_new(pixmap_mask, 1);
m->w = w; m->w = w;
m->h = h; 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); m->mask = XCreateBitmapFromData(ob_display, ob_root, data, w, h);
return m; return m;
} }
@ -13,6 +15,7 @@ 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)
{ {
XFreePixmap(ob_display, m->mask); XFreePixmap(ob_display, m->mask);
g_free(m->data);
g_free(m); g_free(m);
} }
@ -39,3 +42,14 @@ void mask_draw(Pixmap p, TextureMask *m, Rect *position)
XSetClipMask(ob_display, m->color->gc, None); XSetClipMask(ob_display, m->color->gc, None);
XSetClipOrigin(ob_display, m->color->gc, 0, 0); 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;
}

1
render/mask.h
View file

@ -5,6 +5,7 @@
#include "../kernel/geom.h" #include "../kernel/geom.h"
pixmap_mask *pixmap_mask_new(int w, int h, char *data); 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 pixmap_mask_free(pixmap_mask *m);
void mask_draw(Pixmap p, TextureMask *m, Rect *position); void mask_draw(Pixmap p, TextureMask *m, Rect *position);

1
render/render.h
View file

@ -100,6 +100,7 @@ typedef struct TextureText {
typedef struct { typedef struct {
Pixmap mask; Pixmap mask;
guint w, h; guint w, h;
char *data;
} pixmap_mask; } pixmap_mask;
typedef struct TextureMask { typedef struct TextureMask {