the xinerama patch from john russell, modified a bit and merged the move_onmonitor...

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 8b100c7ae4916e2d3e88908bec8bae02ed55f27c..1ddeb0475c8e7c584a75969415e7a2bbffda624b 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -1,10 +1,35 @@
+/* -*- 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 "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;
+#endif /* USE_PANGO */
     XftFont *xftfont;
     gint elipses_length;
     gint shadow;
@@ -12,7 +37,7 @@ struct _RrFont {
     gint offset;
 };
 
-RrFont *RrFontOpen(const RrInstance *inst, char *fontstring);
+RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring);
 void RrFontClose(RrFont *f);
 void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */