summaryrefslogtreecommitdiff
path: root/render/font.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-10-15 03:59:35 +0000
committerDana Jansens <danakj@orodu.net>2003-10-15 03:59:35 +0000
commit740c5b2a20d5110435d0874f8cc6a4c9dfd14777 (patch)
tree41dd6d301a1da504b6bc9ec7b4cccea2efd16423 /render/font.c
parent8085f3490fb5790d15fcb47988bbc24e17467725 (diff)
consistant glib type usage
Diffstat (limited to 'render/font.c')
-rw-r--r--render/font.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/render/font.c b/render/font.c
index 155b373f..ce74cad1 100644
--- a/render/font.c
+++ b/render/font.c
@@ -63,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;
@@ -108,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;
@@ -149,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;
}