X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.h;h=e3081dc28e1cc0e68b076140ee8db8b82947ab2e;hb=7c1a00802326a608bc1baeb67731a9ab3eda8ba6;hp=8f0d4e6ffa176ae1e998b5fa78fd22169a541619;hpb=8f9aae0cc29d91dd9b4e3d3639ed3d58a7aa923b;p=chaz%2Fopenbox

diff --git a/render/font.h b/render/font.h
index 8f0d4e6f..e3081dc2 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    font.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
    Copyright (c) 2003        Derek Foreman
 
    This program is free software; you can redistribute it and/or modify
@@ -21,24 +21,22 @@
 #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 */
+    PangoAttribute *shortcut_underline; /*< For underlining the shortcut key */
+    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 */