X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Ffont.c;h=ce74cad1569af1a2679595bf377b592cb49e12ae;hb=ed4c6995ca199e5d015f1ca90654b4030c7ea760;hp=066f4771e4dbedba32fcf0577e7cfc8494f5c39a;hpb=1bb7a5f8838bff12d846718330bb72a38f5f34df;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 066f4771..ce74cad1 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,14 +1,32 @@
+/* -*- 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"
 #include "theme.h"
-#include "kernel/geom.h"
-#include "kernel/gettext.h"
-#define _(str) gettext(str)
+#include "gettext.h"
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #define ELIPSES "..."
 #define ELIPSES_LENGTH(font) \
@@ -29,7 +47,7 @@ static gboolean started = FALSE;
 static void font_startup(void)
 {
     if (!XftInit(0)) {
-        g_warning(_("Couldn't initialize Xft.\n"));
+        g_warning(_("Couldn't initialize Xft."));
         exit(EXIT_FAILURE);
     }
     FcNameRegisterObjectTypes(objs, (sizeof(objs) / sizeof(objs[0])));
@@ -45,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;
@@ -57,6 +75,7 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
         return NULL;
 
     match = XftFontMatch(RrDisplay(inst), RrScreen(inst), pat, &res);
+    FcPatternDestroy(pat);
     if (!match)
         return NULL;
 
@@ -65,7 +84,6 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
 
     if (FcPatternGetBool(match, OB_SHADOW, 0, &out->shadow) != FcResultMatch)
         out->shadow = FALSE;
-    g_message("shadow %d", out->shadow);
 
     if (FcPatternGetInteger(match, OB_SHADOW_OFFSET, 0, &out->offset) !=
         FcResultMatch)
@@ -79,6 +97,7 @@ static RrFont *openfont(const RrInstance *inst, char *fontstring)
 
     font = XftFontOpenPattern(RrDisplay(inst), match);
     if (!font) {
+        FcPatternDestroy(match);
         g_free(out);
         return NULL;
     } else
@@ -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,30 +149,30 @@ 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;
+    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;
 }
 
-void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
 {
     gint x,y,w,h;
     XftColor c;
     GString *text;
-    gint mw, em, mh;
+    gint mw, mh;
     size_t l;
     gboolean shortened = FALSE;
 
@@ -172,12 +191,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
         shortened = TRUE;
         /* remove a character from the middle */
         text = g_string_erase(text, l-- / 2, 1);
-        em = ELIPSES_LENGTH(t->font);
         /* if the elipses are too large, don't show them at all */
-        if (em > area->width)
+        if (ELIPSES_LENGTH(t->font) > area->width)
             shortened = FALSE;
         font_measure_full(t->font, text->str, &mw, &mh);
-        mw += em;
+        mw += ELIPSES_LENGTH(t->font);
     }
     if (shortened) {
         text = g_string_insert(text, (l + 1) / 2, ELIPSES);
@@ -227,5 +245,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
                       (FcChar8*)text->str, l);
+
+    g_string_free(text, TRUE);
     return;
 }