put the render theme into a struct

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 28a5c5ede3a43dba0ced8a91b12511bf167c3d86..7b483d8931c295c87871d6ba2075b91ca5d3e7df 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -1,13 +1,21 @@
 #ifndef __font_h
 #define __font_h
+#define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xft/Xft.h>
 #include "render.h"
+#include "kernel/geom.h"
+
+struct _RrFont {
+    const RrInstance *inst;
+    XftFont *xftfont;
+    gint elipses_length;
+};
 
 void font_startup(void);
-ObFont *font_open(char *fontstring);
-void font_close(ObFont *f);
-int font_measure_string(ObFont *f, const char *str, int shadow, int offset);
-int font_height(ObFont *f, int shadow, int offset);
-int font_max_char_width(ObFont *f);
-void font_draw(XftDraw *d, TextureText *t);
+RrFont *font_open(const RrInstance *inst, char *fontstring);
+void font_close(RrFont *f);
+int font_measure_string(RrFont *f, char *str, int shadow, int offset);
+int font_height(RrFont *f, int shadow, int offset);
+int font_max_char_width(RrFont *f);
+void font_draw(XftDraw *d, RrTextureText *t, Rect *position);
 #endif /* __font_h */