 |
Merge branch 'master' of ssh://suckless.org/gitrepos/st - st - simple terminal |
 |
git clone git://git.suckless.org/st |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 71328cbcdc88f4fdfbb62d8c0324938e245c8971 |
|
parent 85f8a414be21ed4d7df153763a1cf679814c72cd |
|
Author: Roberto E. Vargas Caballero <[email protected]> |
|
Date: Mon, 10 Mar 2014 15:16:26 +0100 |
|
|
|
Merge branch 'master' of ssh://suckless.org/gitrepos/st |
|
|
|
Diffstat: |
|
M st.c | 22 ++++++++++++++++------ |
|
|
|
1 file changed, 16 insertions(+), 6 deletions(-) |
|
--- |
|
diff --git a/st.c b/st.c |
|
@@ -2887,7 +2887,8 @@ xhints(void) { |
|
sizeh->min_height = sizeh->max_height = xw.fh; |
|
} |
|
|
|
- XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &cla… |
|
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, |
|
+ &class); |
|
XFree(sizeh); |
|
} |
|
|
|
@@ -3176,6 +3177,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
if(base.fg == defaultfg) |
|
base.fg = defaultunderline; |
|
} |
|
+ |
|
if(IS_TRUECOL(base.fg)) { |
|
colfg.alpha = 0xffff; |
|
colfg.red = TRUERED(base.fg); |
|
@@ -3198,8 +3200,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
bg = &dc.col[base.bg]; |
|
} |
|
|
|
- |
|
- |
|
if(base.mode & ATTR_BOLD) { |
|
if(BETWEEN(base.fg, 0, 7)) { |
|
/* basic system colors */ |
|
@@ -3229,7 +3229,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
colfg.green = ~fg->color.green; |
|
colfg.blue = ~fg->color.blue; |
|
colfg.alpha = fg->color.alpha; |
|
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &r… |
|
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, |
|
+ &revfg); |
|
fg = &revfg; |
|
} |
|
|
|
@@ -3240,7 +3241,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
colbg.green = ~bg->color.green; |
|
colbg.blue = ~bg->color.blue; |
|
colbg.alpha = bg->color.alpha; |
|
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &r… |
|
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, |
|
+ &revbg); |
|
bg = &revbg; |
|
} |
|
} |
|
@@ -3320,7 +3322,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
u8fblen += u8cblen; |
|
} |
|
if(doesexist) { |
|
- if (oneatatime) |
|
+ if(oneatatime) |
|
continue; |
|
break; |
|
} |
|
@@ -3343,6 +3345,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, in… |
|
* 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(); |
|
@@ -3387,6 +3391,12 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, i… |
|
} |
|
|
|
/* |
|
+ * 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); |
|
*/ |
