all repos — openbox @ 57314ce52246ce74ff2c64c7fc2da8794a8aaa4e

openbox fork - make it a bit more like ryudo

move pixmap_mask typedef
add stub for draw_mask
Derek Foreman manmower@gmail.com
commit

57314ce52246ce74ff2c64c7fc2da8794a8aaa4e

parent

b824e6ad8e359bfd2762a5e35d62e1a1f4c9f20c

3 files changed, 10 insertions(+), 8 deletions(-)

jump to
M render/mask.crender/mask.c

@@ -16,5 +16,6 @@ XFreePixmap(ob_display, m->mask);

g_free(m); } - -/* DO YOUR MAGIC MANNY WOOT \m/ */ +void mask_draw(pixmap_mask *p, TextureMask *m) +{ +}
M render/mask.hrender/mask.h

@@ -3,13 +3,10 @@ #define __mask_h

#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
M render/render.hrender/render.h

@@ -6,7 +6,6 @@ #define _XFT_NO_COMPAT_ /* no Xft 1 API */

#include <X11/Xft/Xft.h> #include <glib.h> #include "color.h" -#include "mask.h" #ifdef HAVE_STDINT_H # include <stdint.h>

@@ -110,6 +109,11 @@ unsigned char offset;

color_rgb *color; char *string; } TextureText; + +typedef struct { + Pixmap mask; + guint w, h; +} pixmap_mask; typedef struct TextureMask { color_rgb *color;