X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=dfbf4f12c44ec008c6e627cef02f96361e5fbead;hb=b8de0b48fd32efed1fe242eaee9352cc16b2ee50;hp=8b4ccdc299dc5539c5b3c2cf0364da832bdd7956;hpb=6682d070c391f8c09d561dde67e49733a2377681;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 8b4ccdc2..dfbf4f12 100644
--- a/render/render.h
+++ b/render/render.h
@@ -6,7 +6,6 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include "color.h"
-#include "font.h"
 
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
@@ -98,16 +97,35 @@ typedef struct Surface {
     SurfaceData data;
 } Surface;
 
+typedef struct {
+    XftFont *xftfont;
+    int height;
+} ObFont;
+
+typedef enum {
+    Justify_Center,
+    Justify_Left,
+    Justify_Right
+} Justify;
+
 typedef struct TextureText {
     ObFont *font;
+    Justify justify;
     int shadow;
-    int offset;
+    unsigned char tint;
+    unsigned char offset;
     color_rgb *color;
     char *string;
-} TextureText;
+} TextureText;   
+
+typedef struct {
+    Pixmap mask;
+    guint w, h;
+} pixmap_mask;
 
 typedef struct TextureMask {
     color_rgb *color;
+    pixmap_mask *mask;
 } TextureMask;
 
 typedef struct TextureRGBA {
@@ -137,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);