From: Derek Foreman Date: Mon, 17 Mar 2003 00:53:28 +0000 (+0000) Subject: move pixmap_mask typedef X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=57314ce52246ce74ff2c64c7fc2da8794a8aaa4e;p=chaz%2Fopenbox move pixmap_mask typedef add stub for draw_mask --- diff --git a/render/mask.c b/render/mask.c index 37e506f3..14836be7 100644 --- a/render/mask.c +++ b/render/mask.c @@ -16,5 +16,6 @@ void pixmap_mask_free(pixmap_mask *m) g_free(m); } - -/* DO YOUR MAGIC MANNY WOOT \m/ */ +void mask_draw(pixmap_mask *p, TextureMask *m) +{ +} diff --git a/render/mask.h b/render/mask.h index 103b33d0..796155f1 100644 --- a/render/mask.h +++ b/render/mask.h @@ -3,13 +3,10 @@ #include #include - -typedef struct { - Pixmap mask; - guint w, h; -} pixmap_mask; +#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); #endif diff --git a/render/render.h b/render/render.h index 2a45451c..54f42461 100644 --- a/render/render.h +++ b/render/render.h @@ -6,7 +6,6 @@ #include #include #include "color.h" -#include "mask.h" #ifdef HAVE_STDINT_H # include @@ -111,6 +110,11 @@ typedef struct TextureText { char *string; } TextureText; +typedef struct { + Pixmap mask; + guint w, h; +} pixmap_mask; + typedef struct TextureMask { color_rgb *color; pixmap_mask *mask;