?

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 8f0d4e6ffa176ae1e998b5fa78fd22169a541619..03f960c6907dc58a83c789c567b74603d560d753 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -21,24 +21,21 @@
 #define __font_h
 #include "render.h"
 #include "geom.h"
-#ifdef USE_PANGO
 #include <pango/pango.h>
-#endif /* USE_PANGO */
 
 struct _RrFont {
     const RrInstance *inst;
-#ifdef USE_PANGO
-    PangoFontDescription *pango_font_description;
-    PangoFontMetrics *pango_font_metrics;
-#endif /* USE_PANGO */
-    XftFont *xftfont;
-    gint elipses_length;
-    gint shadow;
-    gchar tint;
-    gint offset;
+    gint ref;
+    PangoFontDescription *font_desc; 
+    PangoLayout *layout; /*!< Used for measuring and rendering strings */
+    gint ascent; /*!< The font's ascent in pango-units */
+    gint descent; /*!< The font's descent in pango-units */
 };
 
-RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring);
-void RrFontClose(RrFont *f);
 void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
+
+/*! Increment the references for this font, RrFontClose will decrement until 0
+  and then really close it */
+void RrFontRef(RrFont *f);
+
 #endif /* __font_h */