#include "font.h"
+#include "theme.h"
#include "kernel/openbox.h"
#include "kernel/geom.h"
#include "kernel/gettext.h"
#endif
}
-static void measure_height(ObFont *f)
+static void measure_height(RrFont *f)
{
XGlyphInfo info;
f->elipses_length = (signed) info.xOff;
}
-ObFont *font_open(char *fontstring)
+RrFont *font_open(char *fontstring)
{
- ObFont *out;
+ RrFont *out;
XftFont *xf;
if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
- out = g_new(ObFont, 1);
+ out = g_new(RrFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
g_warning(_("Trying fallback font: %s\n"), "sans");
if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
- out = g_new(ObFont, 1);
+ out = g_new(RrFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
exit(3); /* can't continue without a font */
}
-void font_close(ObFont *f)
+void font_close(RrFont *f)
{
if (f) {
XftFontClose(ob_display, f->xftfont);
}
}
-void font_measure_full(ObFont *f, char *str, int shadow, int offset,
+void font_measure_full(RrFont *f, char *str, int shadow, int offset,
int *x, int *y)
{
XGlyphInfo info;
*y = info.height + (shadow ? ABS(offset) : 0);
}
-int font_measure_string(ObFont *f, char *str, int shadow, int offset)
+int font_measure_string(RrFont *f, char *str, int shadow, int offset)
{
int x, y;
font_measure_full (f, str, shadow, offset, &x, &y);
return x;
}
-int font_height(ObFont *f, int shadow, int offset)
+int font_height(RrFont *f, int shadow, int offset)
{
return f->xftfont->ascent + f->xftfont->descent + (shadow ? offset : 0);
}
-int font_max_char_width(ObFont *f)
+int font_max_char_width(RrFont *f)
{
return (signed) f->xftfont->max_advance_width;
}
-void font_draw(XftDraw *d, TextureText *t, Rect *position)
+void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
{
int x,y,w,h;
XftColor c;
size_t l;
gboolean shortened = FALSE;
- y = position->y;
- w = position->width;
- h = position->height;
+ /* center vertically */
+ y = area->y +
+ (area->height - font_height(t->font, t->shadow, t->offset)) / 2;
+ w = area->width - theme_bevel * 2;
+ h = area->height;
text = g_string_new(t->string);
l = g_utf8_strlen(text->str, -1);
font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
- while (l && mw > position->width) {
+ while (l && mw > area->width) {
shortened = TRUE;
/* remove a character from the middle */
text = g_string_erase(text, l-- / 2, 1);
em = ELIPSES_LENGTH(t->font, t->shadow, t->offset);
/* if the elipses are too large, don't show them at all */
- if (em > position->width)
+ if (em > area->width)
shortened = FALSE;
font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
mw += em;
}
if (!l) return;
- /* center vertically */
- y -= ((t->font->xftfont->ascent + t->font->xftfont->descent) - mh) / 2;
-
switch (t->justify) {
- case Justify_Left:
- x = position->x;
+ case RR_JUSTIFY_LEFT:
+ x = area->x + theme_bevel;
break;
- case Justify_Right:
- x = position->x + (w - mw);
+ case RR_JUSTIFY_RIGHT:
+ x = area->x + (w - mw) - theme_bevel;
break;
- case Justify_Center:
- x = position->x + (w - mw) / 2;
+ case RR_JUSTIFY_CENTER:
+ x = area->x + (w - mw) / 2;
break;
}