make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 393ac88ee996ece0a784b5075785619c67263a9c..8b100c7ae4916e2d3e88908bec8bae02ed55f27c 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -1,20 +1,18 @@
 #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"
+#include "geom.h"
 
 struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
     gint elipses_length;
+    gint shadow;
+    gchar tint;
+    gint offset;
 };
 
-void font_startup(void);
-RrFont *font_open(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);
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */