#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) \
return NULL;
match = XftFontMatch(RrDisplay(inst), RrScreen(inst), pat, &res);
- FcPatternDestroy(pat);
if (!match)
return NULL;
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)
out->tint = tint;
font = XftFontOpenPattern(RrDisplay(inst), match);
- FcPatternDestroy(match);
if (!font) {
+ FcPatternDestroy(match);
g_free(out);
return NULL;
} else
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;