move pixmap_mask typedef

add stub for draw_mask

diff --git a/render/mask.c b/render/mask.c
index 37e506f3dfe694f959b525a528f8b403dbb0965c..14836be71e54cb5048d792ac89a505fcbb08bedf 100644 (file)
--- 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 103b33d0d2374052c668e03d680569b73b6561b3..796155f13b879b69e38a8343788453a1ddef5528 100644 (file)
--- a/render/mask.h
+++ b/render/mask.h
@@ -3,13 +3,10 @@
 
 #include <X11/Xlib.h>
 #include <glib.h>
-
-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 2a45451ccf07f8b5698b3ef69c2a4a9db3ad9439..54f4246187eea1a24409b31d43c512031472e141 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -6,7 +6,6 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include "color.h"
-#include "mask.h"
 
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
@@ -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;