X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.h;h=22aeaec0820ebb486bc2100f0939be7ab3e45bd7;hb=069e9607fa433190307bb8242294a109e88165de;hp=6a5d4c65a621617d6886562ebcfea4b0e9107817;hpb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;p=chaz%2Fopenbox

diff --git a/render/font.h b/render/font.h
index 6a5d4c65..22aeaec0 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,14 +1,17 @@
 #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"
 
-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, Rect *position);
+struct _RrFont {
+    const RrInstance *inst;
+    XftFont *xftfont;
+    gint elipses_length;
+};
+
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *position);
 #endif /* __font_h */