 |
tRevert "Fix crash when cursor color is truecolor" - st - [fork] customized bui… |
 |
git clone git://src.adamsgaard.dk/st |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 732be223ee7ba5486713c63f944699fd6285af96 |
|
parent 5535c1f04c665c05faff2a65d5558246b7748d49 |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Tue, 17 Jul 2018 20:01:54 +0200 |
|
|
|
Revert "Fix crash when cursor color is truecolor" |
|
|
|
This reverts commit 5535c1f04c665c05faff2a65d5558246b7748d49. |
|
|
|
Diffstat: |
|
M x.c | 17 ++++------------- |
|
|
|
1 file changed, 4 insertions(+), 13 deletions(-) |
|
--- |
|
diff --git a/x.c b/x.c |
|
t@@ -1404,7 +1404,6 @@ void |
|
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) |
|
{ |
|
Color drawcol; |
|
- uint32_t cc; |
|
|
|
/* remove the old cursor */ |
|
if (selected(ox, oy)) |
|
t@@ -1420,22 +1419,14 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, G… |
|
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; |
|
|
|
if (selected(cx, cy)) { |
|
- cc = g.bg; |
|
+ drawcol = dc.col[g.bg]; |
|
} else { |
|
g.mode |= ATTR_REVERSE; |
|
+ |
|
if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7)) |
|
- cc = g.fg + 8; |
|
+ drawcol = dc.col[g.fg + 8]; |
|
else |
|
- cc = g.fg; |
|
- } |
|
- |
|
- if (IS_TRUECOL(cc)) { |
|
- drawcol.color.alpha = 0xffff; |
|
- drawcol.color.red = TRUERED(cc); |
|
- drawcol.color.green = TRUEGREEN(cc); |
|
- drawcol.color.blue = TRUEBLUE(cc); |
|
- } else { |
|
- drawcol = dc.col[cc]; |
|
+ drawcol = dc.col[g.fg]; |
|
} |
|
|
|
if (IS_SET(MODE_REVERSE)) { |
