-
- y = position->y;
- w = position->width;
- h = position->height;
-
- /* 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;
-
- text = g_strdup(t->string);
- l = strlen(text);
- m = font_measure_string(t->font, text, t->shadow, t->offset);
- while (l && m > position->width) {
- text[--l] = '\0';
- m = font_measure_string(t->font, text, t->shadow, t->offset);
+ gboolean shortened = FALSE;
+
+ /* center vertically */
+ y = area->y +
+ (area->height - RrFontHeight(t->font)) / 2;
+ /* the +2 and -4 leave a small blank edge on the sides */
+ x = area->x + 2;
+ w = area->width - 4;
+ h = area->height;
+
+ text = g_string_new(t->string);
+ l = g_utf8_strlen(text->str, -1);
+ font_measure_full(t->font, text->str, &mw, &mh);
+ while (l && mw > area->width) {
+ shortened = TRUE;
+ /* remove a character from the middle */
+ text = g_string_erase(text, l-- / 2, 1);
+ /* if the elipses are too large, don't show them at all */
+ if (ELIPSES_LENGTH(t->font) > area->width)
+ shortened = FALSE;
+ font_measure_full(t->font, text->str, &mw, &mh);
+ mw += ELIPSES_LENGTH(t->font);
+ }
+ if (shortened) {
+ text = g_string_insert(text, (l + 1) / 2, ELIPSES);
+ l += 3;