consistant glib type usage

[chaz/openbox] / render / font.h

diff --git a/render/font.h b/render/font.h
index 4abd80ba8b8bebaf43dc993d8963bcda4fb1f0db..6f8d511ce2340eb4ae9165e87de3f901b6a88632 100644 (file)
--- a/render/font.h
+++ b/render/font.h
@@ -1,15 +1,37 @@
+/* -*- 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"
 
-typedef struct {
+struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
-} ObFont;
-
-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);
+    gint elipses_length;
+    gint shadow;
+    gchar tint;
+    gint offset;
+};
+
+RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring);
+void RrFontClose(RrFont *f);
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position);
 #endif /* __font_h */