remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index b5806a4ab559fa5c45594f076866370782c274bf..6a6f19092c4cf21f95bb0ad4e10a50f1971a4b9f 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -1,13 +1,20 @@
 #ifndef __font_h
 #define __font_h
+#define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xft/Xft.h>
 #include "render.h"
+#include "geom.h"
 
-void font_startup(void);
-ObFont *font_open(char *fontstring);
-void font_close(ObFont *f);
-int font_measure_string(ObFont *f, 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, int x, int y, int w, int h);
+struct _RrFont {
+    const RrInstance *inst;
+    XftFont *xftfont;
+    gint elipses_length;
+    gint shadow;
+    gchar tint;
+    gint offset;
+};
+
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */