more namespacing with Rr*

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 393ac88ee996ece0a784b5075785619c67263a9c..22aeaec0820ebb486bc2100f0939be7ab3e45bd7 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -6,15 +6,12 @@
 #include "kernel/geom.h"
 
 struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
     gint elipses_length;
 };
 
-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, Rect *position);
 #endif /* __font_h */