X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.h;h=e3081dc28e1cc0e68b076140ee8db8b82947ab2e;hb=df07fdc90a31cebccb0ee6406d42a2584dd01528;hp=eaa89d56e04bf155203c161c788e7d7509e4cad0;hpb=2880e674eaa66b2d5639157e4506b404e2b183ad;p=chaz%2Fopenbox

diff --git a/render/font.h b/render/font.h
index eaa89d56..e3081dc2 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,14 +1,42 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   font.h for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __font_h
 #define __font_h
-#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);
+#include "geom.h"
+#include <pango/pango.h>
+
+struct _RrFont {
+    const RrInstance *inst;
+    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 */
+};
+
+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 */