hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-04 17:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix width calculation of a Xft glyph

Browse source 
XftTextExtentsUtf8 computes the pixel extents and stores them in a
XGlyphInfo data type. The true "width" of a Xft glyph is found in the
xOff member of the latter structure.

This fixes the (dis)appearing space when switching workspace (#264).
This commit is contained in:
Björn Ketelaars 2020-02-02 06:29:24 +01:00 • committed by LordReg
parent d12e52f950
commit 2657c691df
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
spectrwm.c
View file

@ -2063,7 +2063,7 @@ debug_refresh(struct ws_win *win)
} else { } else {
XftTextExtentsUtf8(display, bar_xftfonts[0], XftTextExtentsUtf8(display, bar_xftfonts[0],
(FcChar8 *)s, len, &info); (FcChar8 *)s, len, &info);
width = info.width + 4; width = info.xOff + 4;
height = bar_xftfonts[0]->height + 4; height = bar_xftfonts[0]->height + 4;
} }
@ -2406,10 +2406,10 @@ bar_print(struct swm_region *r, const char *s)
x = SWM_BAR_OFFSET; x = SWM_BAR_OFFSET;
break; break;
case SWM_BAR_JUSTIFY_CENTER: case SWM_BAR_JUSTIFY_CENTER:
x = (WIDTH(r) - info.width) / 2; x = (WIDTH(r) - info.xOff) / 2;
break; break;
case SWM_BAR_JUSTIFY_RIGHT: case SWM_BAR_JUSTIFY_RIGHT:
x = WIDTH(r) - info.width - SWM_BAR_OFFSET; x = WIDTH(r) - info.xOff - SWM_BAR_OFFSET;
break; break;
} }
@ -3274,7 +3274,7 @@ bar_parse_markup(struct bar_section *sect)
(FcChar8 *)frag[i].text, len, &info); (FcChar8 *)frag[i].text, len, &info);
frag[i].length = len; frag[i].length = len;
frag[i].width = info.width; frag[i].width = info.xOff;
sect->text_width += frag[i].width; sect->text_width += frag[i].width;
i++; i++;
if (i == SWM_TEXTFRAGS_MAX) if (i == SWM_TEXTFRAGS_MAX)
@ -3293,7 +3293,7 @@ bar_parse_markup(struct bar_section *sect)
XftTextExtentsUtf8(display, bar_xftfonts[frag[i].font], XftTextExtentsUtf8(display, bar_xftfonts[frag[i].font],
(FcChar8 *)frag[i].text, frag[i].length, &info); (FcChar8 *)frag[i].text, frag[i].length, &info);
frag[i].width = info.width; frag[i].width = info.xOff;
sect->text_width += frag[i].width; sect->text_width += frag[i].width;
fmt += frag[i].length; fmt += frag[i].length;
@ -3321,7 +3321,7 @@ bar_parse_markup(struct bar_section *sect)
bar_xftfonts[frag[i].font], bar_xftfonts[frag[i].font],
(FcChar8 *)frag[i].text, len, (FcChar8 *)frag[i].text, len,
&info); &info);
frag[i].width = info.width; frag[i].width = info.xOff;
} }
frag[i].length = len; frag[i].length = len;
sect->text_width += frag[i].width; sect->text_width += frag[i].width;
@ -3363,7 +3363,7 @@ bar_parse_markup(struct bar_section *sect)
bar_xftfonts[frag[i].font], bar_xftfonts[frag[i].font],
(FcChar8 *)frag[i].text, len, (FcChar8 *)frag[i].text, len,
&info); &info);
frag[i].width = info.width; frag[i].width = info.xOff;
} }
frag[i].length = len; frag[i].length = len;
sect->text_width += frag[i].width; sect->text_width += frag[i].width;
@ -3389,7 +3389,7 @@ bar_parse_markup(struct bar_section *sect)
} else { } else {
XftTextExtentsUtf8(display, bar_xftfonts[frag[i].font], XftTextExtentsUtf8(display, bar_xftfonts[frag[i].font],
(FcChar8 *)frag[i].text, len, &info); (FcChar8 *)frag[i].text, len, &info);
frag[i].width = info.width; frag[i].width = info.xOff;
} }
sect->text_width += frag[i].width; sect->text_width += frag[i].width;
frag[i].length = len; frag[i].length = len;
@ -6890,7 +6890,7 @@ search_win(struct binding *bp, struct swm_region *r, union arg *args)
} else { } else {
XftTextExtentsUtf8(display, bar_xftfonts[0], XftTextExtentsUtf8(display, bar_xftfonts[0],
(FcChar8 *)s, len, &info); (FcChar8 *)s, len, &info);
width = info.width + 4; width = info.xOff + 4;
height = bar_xftfonts[0]->height + 4; height = bar_xftfonts[0]->height + 4;
} }