X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.h;h=f299763946fa89ab7ff6cbc2d2666d1f03188b82;hb=a5100fe6770d5b223cf444eda5629c2b2208cb29;hp=28a5c5ede3a43dba0ced8a91b12511bf167c3d86;hpb=ea8d450ed30c96c1a5dd627740ec4533eeae2a09;p=chaz%2Fopenbox

diff --git a/render/font.h b/render/font.h
index 28a5c5ed..f2997639 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,13 +1,45 @@
+/* -*- 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 "geom.h"
+#ifdef USE_PANGO
+#include <pango/pango.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 */
+};
 
-void font_startup(void);
-ObFont *font_open(char *fontstring);
-void font_close(ObFont *f);
-int font_measure_string(ObFont *f, const 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);
+RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */