-#include <stdlib.h>
-#include <X11/Xft/Xft.h>
#include "../kernel/openbox.h"
#include "font.h"
#include "../src/gettext.h"
#define _(str) gettext(str)
+#include <X11/Xft/Xft.h>
+#include <glib.h>
+
void font_startup(void)
{
#ifdef DEBUG
XftFont *xf;
if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
- out = malloc(sizeof(ObFont));
+ out = g_new(ObFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
g_warning(_("Trying fallback font: %s\n"), "fixed");
if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
- out = malloc(sizeof(ObFont));
+ out = g_new(ObFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
void font_close(ObFont *f)
{
XftFontClose(ob_display, f->xftfont);
+ g_free(f);
}
-int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
{
XGlyphInfo info;
c.color.red = 0;
c.color.green = 0;
c.color.blue = 0;
- c.color.alpha = t->tint | t->tint << 8; // transparent shadow
+ c.color.alpha = t->tint | t->tint << 8; /* transparent shadow */
c.pixel = BlackPixel(ob_display, ob_screen);
XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
c.color.red = t->color->r | t->color->r << 8;
c.color.green = t->color->g | t->color->g << 8;
c.color.blue = t->color->b | t->color->b << 8;
+ c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
c.pixel = t->color->pixel;
- c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
XftDrawStringUtf8(d, &c, t->font->xftfont, x,
t->font->xftfont->ascent + y -