From c2fd2754ebea6f802e4c71219af269c58b78262e Mon Sep 17 00:00:00 2001 From: Silvan Jegen Date: Fri, 6 Jun 2014 22:09:22 +0200 Subject: Refactor the innermost loop of the xdraws function Signed-off-by: Silvan Jegen Signed-off-by: Christoph Lohmann <20h@r-36.net> --- st.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'st.c') diff --git a/st.c b/st.c index 3681776..2cf9a26 100644 --- a/st.c +++ b/st.c @@ -3245,28 +3245,22 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { bytelen -= u8cblen; doesexist = XftCharExists(xw.dpy, font->match, unicodep); - if(oneatatime || !doesexist || bytelen <= 0) { - if(oneatatime || bytelen <= 0) { - if(doesexist) { - u8fl++; - u8fblen += u8cblen; - } - } - - if(u8fl > 0) { - XftDrawStringUtf8(xw.draw, fg, - font->match, xp, - winy + font->ascent, - (FcChar8 *)u8fs, - u8fblen); - xp += xw.cw * u8fl; - - } - break; + if(doesexist) { + u8fl++; + u8fblen += u8cblen; + if(!oneatatime && bytelen > 0) + continue; } - u8fl++; - u8fblen += u8cblen; + if(u8fl > 0) { + XftDrawStringUtf8(xw.draw, fg, + font->match, xp, + winy + font->ascent, + (FcChar8 *)u8fs, + u8fblen); + xp += xw.cw * u8fl; + } + break; } if(doesexist) { if(oneatatime) -- cgit v1.2.3-13-gbd6f