Merge branch 'master' of ssh://suckless.org/gitrepos/st
Roberto E. Vargas Caballero k0ga@shike2.com
1 files changed,
16 insertions(+),
6 deletions(-)
jump to
M
st.c
→
st.c
@@ -2887,7 +2887,8 @@ sizeh->min_width = sizeh->max_width = xw.fw;
sizeh->min_height = sizeh->max_height = xw.fh; } - XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class); + XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, + &class); XFree(sizeh); }@@ -3176,6 +3177,7 @@ } else if(base.mode & ATTR_UNDERLINE) {
if(base.fg == defaultfg) base.fg = defaultunderline; } + if(IS_TRUECOL(base.fg)) { colfg.alpha = 0xffff; colfg.red = TRUERED(base.fg);@@ -3197,8 +3199,6 @@ bg = &truebg;
} else { bg = &dc.col[base.bg]; } - - if(base.mode & ATTR_BOLD) { if(BETWEEN(base.fg, 0, 7)) {@@ -3229,7 +3229,8 @@ colfg.red = ~fg->color.red;
colfg.green = ~fg->color.green; colfg.blue = ~fg->color.blue; colfg.alpha = fg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, + &revfg); fg = &revfg; }@@ -3240,7 +3241,8 @@ colbg.red = ~bg->color.red;
colbg.green = ~bg->color.green; colbg.blue = ~bg->color.blue; colbg.alpha = bg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, + &revbg); bg = &revbg; } }@@ -3320,7 +3322,7 @@ u8fl++;
u8fblen += u8cblen; } if(doesexist) { - if (oneatatime) + if(oneatatime) continue; break; }@@ -3343,6 +3345,8 @@ /*
* Nothing was found in the cache. Now use * some dozen of Fontconfig calls to get the * font for one single character. + * + * Xft and fontconfig are design failures. */ fcpattern = FcPatternDuplicate(font->pattern); fccharset = FcCharSetCreate();@@ -3386,6 +3390,12 @@
xp += xw.cw * wcwidth(u8char); } + /* + * This is how the loop above actually should be. Why does the + * application have to care about font details? + * + * I have to repeat: Xft and Fontconfig are design failures. + */ /* XftDrawStringUtf8(xw.draw, fg, font->set, winx, winy + font->ascent, (FcChar8 *)s, bytelen);