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

diff --git a/render/font.h b/render/font.h
index 6a5d4c65..19417db2 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,14 +1,46 @@
+/* -*- 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        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"
+#ifdef USE_PANGO
+#include <pango/pango.h>
+#include <pango/pangoxft.h>
+#endif /* USE_PANGO */
+
+struct _RrFont {
+    const RrInstance *inst;
+    XftFont *xftfont;
+    gint elipses_length;
+    gint shadow;
+    gchar tint;
+    gint offset;
+#ifdef USE_PANGO
+    PangoFontDescription *pango_font_description;
+    gint pango_ascent;
+    gint pango_descent;
+#endif /* USE_PANGO */
+};
+
+RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */