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

diff --git a/render/font.c b/render/font.c
index 67e19ec2..d2a4acae 100644
--- a/render/font.c
+++ b/render/font.c
@@ -2,14 +2,11 @@
 #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) \
@@ -149,7 +146,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;