-#include "../kernel/openbox.h"
#include "font.h"
-
-#include "../kernel/gettext.h"
+#include "theme.h"
+#include "kernel/openbox.h"
+#include "kernel/geom.h"
+#include "kernel/gettext.h"
#define _(str) gettext(str)
#include <X11/Xft/Xft.h>
#include <glib.h>
+#include <string.h>
+
+#define ELIPSES "..."
+#define ELIPSES_LENGTH(font, shadow, offset) \
+ (font->elipses_length + (shadow ? offset : 0))
void font_startup(void)
{
#endif
}
-static void measure_height(ObFont *f)
+static void measure_height(RrFont *f)
{
XGlyphInfo info;
- char *str;
-
- /* XXX add some extended UTF8 characters in here? */
- str = "12345678900-qwertyuiopasdfghjklzxcvbnm"
- "!@#$%^&*()_+QWERTYUIOPASDFGHJKLZXCVBNM"
- "`~[]\\;',./{}|:\"<>?";
+ /* measure an elipses */
XftTextExtentsUtf8(ob_display, f->xftfont,
- (FcChar8*)str, strlen(str), &info);
- f->height = (signed) info.height;
+ (FcChar8*)ELIPSES, strlen(ELIPSES), &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(_("Unable to load font: %s\n"), fontstring);
- g_warning(_("Trying fallback font: %s\n"), "fixed");
+ g_warning(_("Trying fallback font: %s\n"), "sans");
- if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
- out = g_new(ObFont, 1);
+ if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
+ out = g_new(RrFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
}
- g_warning(_("Unable to load font: %s\n"), "fixed");
+ g_warning(_("Unable to load font: %s\n"), "sans");
g_warning(_("Aborting!.\n"));
exit(3); /* can't continue without a font */
}
-void font_close(ObFont *f)
+void font_close(RrFont *f)
{
- XftFontClose(ob_display, f->xftfont);
- g_free(f);
+ if (f) {
+ XftFontClose(ob_display, f->xftfont);
+ g_free(f);
+ }
}
-int font_measure_string(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;
XftTextExtentsUtf8(ob_display, f->xftfont,
(FcChar8*)str, strlen(str), &info);
- return (signed) info.xOff + (shadow ? offset : 0);
+ *x = (signed) info.xOff + (shadow ? ABS(offset) : 0);
+ *y = info.height + (shadow ? ABS(offset) : 0);
+}
+
+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->height + (shadow ? offset : 0);
+ 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, int x, int y, int w, int h)
+void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
{
+ int x,y,w,h;
XftColor c;
+ GString *text;
+ int mw, em, mh;
+ size_t l;
+ gboolean shortened = FALSE;
+
+ /* 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 > 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 > area->width)
+ shortened = FALSE;
+ font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
+ mw += em;
+ }
+ if (shortened) {
+ text = g_string_insert(text, (l + 1) / 2, ELIPSES);
+ l += 3;
+ }
+ if (!l) return;
+
+ switch (t->justify) {
+ case RR_JUSTIFY_LEFT:
+ x = area->x + theme_bevel;
+ break;
+ case RR_JUSTIFY_RIGHT:
+ x = area->x + (w - mw) - theme_bevel;
+ break;
+ case RR_JUSTIFY_CENTER:
+ x = area->x + (w - mw) / 2;
+ break;
+ }
- /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
- y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
- (t->font->height + h) - 1) / 2;
-
- x += 3; /* XXX figure out X with justification */
+ l = strlen(text->str); /* number of bytes */
if (t->shadow) {
- c.color.red = 0;
- c.color.green = 0;
- c.color.blue = 0;
- c.color.alpha = t->tint | t->tint << 8; /* transparent shadow */
- c.pixel = BlackPixel(ob_display, ob_screen);
-
+ if (t->tint >= 0) {
+ c.color.red = 0;
+ c.color.green = 0;
+ c.color.blue = 0;
+ c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
+ c.pixel = BlackPixel(ob_display, ob_screen);
+ } else {
+ c.color.red = 0xffff * -t->tint / 100;
+ c.color.green = 0xffff * -t->tint / 100;
+ c.color.blue = 0xffff * -t->tint / 100;
+ c.color.alpha = 0xffff * -t->tint / 100; /* transparent shadow */
+ c.pixel = WhitePixel(ob_display, ob_screen);
+ }
XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
t->font->xftfont->ascent + y + t->offset,
- (FcChar8*)t->string, strlen(t->string));
+ (FcChar8*)text->str, l);
}
c.color.red = t->color->r | t->color->r << 8;
c.color.green = t->color->g | t->color->g << 8;
XftDrawStringUtf8(d, &c, t->font->xftfont, x,
t->font->xftfont->ascent + y,
- (FcChar8*)t->string, strlen(t->string));
+ (FcChar8*)text->str, l);
return;
}
projects / chaz / openbox / blobdiff