X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=ce74cad1569af1a2679595bf377b592cb49e12ae;hb=ed4c6995ca199e5d015f1ca90654b4030c7ea760;hp=00f456fc71a5b9ec4a53422c6729ce64ffa1088a;hpb=54d04314e76ccf9598ffcc1a48cc10dbb424e142;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 00f456fc..ce74cad1 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   font.c 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.
+*/
+
 #include "font.h"
 #include "color.h"
 #include "mask.h"
@@ -44,7 +63,7 @@ static void measure_font(RrFont *f)
     f->elipses_length = (signed) info.xOff;
 }
 
-static RrFont *openfont(const RrInstance *inst, char *fontstring)
+static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
 {
     RrFont *out;
     FcPattern *pat, *match;
@@ -89,7 +108,7 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
     return out;
 }
 
-RrFont *RrFontOpen(const RrInstance *inst, char *fontstring)
+RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring)
 {
     RrFont *out;
 
@@ -130,20 +149,20 @@ static void font_measure_full(const RrFont *f, const gchar *str,
     *y = info.height + (f->shadow ? ABS(f->offset) : 0);
 }
 
-int RrFontMeasureString(const RrFont *f, const gchar *str)
+gint RrFontMeasureString(const RrFont *f, const gchar *str)
 {
     gint x, y;
     font_measure_full (f, str, &x, &y);
     return x + 4;
 }
 
-int RrFontHeight(const RrFont *f)
+gint RrFontHeight(const RrFont *f)
 {
     return f->xftfont->ascent + f->xftfont->descent +
         (f->shadow ? f->offset : 0);
 }
 
-int RrFontMaxCharWidth(const RrFont *f)
+gint RrFontMaxCharWidth(const RrFont *f)
 {
     return (signed) f->xftfont->max_advance_width;
 }