+/* -*- 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) \
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])));
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)
font = XftFontOpenPattern(RrDisplay(inst), match);
if (!font) {
+ FcPatternDestroy(match);
g_free(out);
return NULL;
} else
{
gint x, y;
font_measure_full (f, str, &x, &y);
- return x;
+ return x + 4;
}
int RrFontHeight(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;
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);
XftDrawStringUtf8(d, &c, t->font->xftfont, x,
t->font->xftfont->ascent + y,
(FcChar8*)text->str, l);
+
+ g_string_free(text, TRUE);
return;
}