X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=94d9fa2db47e48f2805cf29c41d021b247f782f3;hb=7a48ef1f5453d8fa2e56a0d76fc86d559d586c40;hp=67e19ec240831874c73eb4fc629e6d6d4f81cbf5;hpb=7f44ed53628bd27421fbe73c72cc3398d6e287aa;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 67e19ec2..94d9fa2d 100644
--- a/render/font.c
+++ b/render/font.c
@@ -2,9 +2,7 @@
 #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>
@@ -135,7 +133,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)
@@ -149,7 +147,7 @@ int 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;