dont clean up nulls

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index 01795e7e4121c4899d8217ef486ffd12f67d10b3..dfbf4f12c44ec008c6e627cef02f96361e5fbead 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -99,19 +99,33 @@ typedef struct Surface {
 
 typedef struct {
     XftFont *xftfont;
+    int height;
 } ObFont;
 
+typedef enum {
+    Justify_Center,
+    Justify_Left,
+    Justify_Right
+} Justify;
+
 typedef struct TextureText {
     ObFont *font;
-    int shadow;  
+    Justify justify;
+    int shadow;
     unsigned char tint;
     unsigned char offset;
     color_rgb *color;
     char *string;
 } TextureText;   
 
+typedef struct {
+    Pixmap mask;
+    guint w, h;
+} pixmap_mask;
+
 typedef struct TextureMask {
     color_rgb *color;
+    pixmap_mask *mask;
 } TextureMask;
 
 typedef struct TextureRGBA {
@@ -141,11 +155,11 @@ extern Visual *render_visual;
 extern int render_depth;
 extern Colormap render_colormap;
 
-void (*paint)(Window win, Appearance *l, int w, int h);
+void (*paint)(Window win, Appearance *l, int x, int y, int w, int h);
 
 void render_startup(void);
 void init_appearance(Appearance *l);
-void x_paint(Window win, Appearance *l, int w, int h);
+void x_paint(Window win, Appearance *l, int x, int y, int w, int h);
 void render_shutdown(void);
 Appearance *appearance_new(SurfaceType type, int numtex);
 Appearance *appearance_copy(Appearance *a);