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

diff --git a/render/font.c b/render/font.c
index d2a4acae..00f456fc 100644
--- a/render/font.c
+++ b/render/font.c
@@ -7,6 +7,7 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #define ELIPSES "..."
 #define ELIPSES_LENGTH(font) \
@@ -27,7 +28,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])));
@@ -55,6 +56,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;
 
@@ -132,7 +134,7 @@ int 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)
@@ -151,7 +153,7 @@ 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;
 
@@ -170,12 +172,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *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);
@@ -225,5 +226,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
                       (FcChar8*)text->str, l);
+
+    g_string_free(text, TRUE);
     return;
 }