X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ffont.h;h=6a6f19092c4cf21f95bb0ad4e10a50f1971a4b9f;hb=c8fa3a6028a4187675d4ffeee07485ed3caae38b;hp=4abd80ba8b8bebaf43dc993d8963bcda4fb1f0db;hpb=aa68e45b1902a9ff741aa8dade90860388d4b6e7;p=chaz%2Fopenbox

diff --git a/render/font.h b/render/font.h
index 4abd80ba..6a6f1909 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,15 +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"
 
-typedef struct {
+struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
-} ObFont;
+    gint elipses_length;
+    gint shadow;
+    gchar tint;
+    gint offset;
+};
 
-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);
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */