Faris
/
st
mirror of git://git.suckless.org/st
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when cursor color is truecolor 

Reported-by: Ivan Tham <pickfire@riseup.net>
This commit is contained in:
Jules Maselbas 2018-07-15 13:53:37 +02:00 committed by Hiltjo Posthuma
parent b51bcd5553
commit 5535c1f04c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x.c
View File

@ -1404,6 +1404,7 @@ void
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
{ {
Color drawcol; Color drawcol;
uint32_t cc;
/* remove the old cursor */ /* remove the old cursor */
if (selected(ox, oy)) if (selected(ox, oy))
@ -1419,14 +1420,22 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
if (selected(cx, cy)) { if (selected(cx, cy)) {
drawcol = dc.col[g.bg]; cc = g.bg;
} else { } else {
g.mode |= ATTR_REVERSE; g.mode |= ATTR_REVERSE;
if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7)) if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
drawcol = dc.col[g.fg + 8]; cc = g.fg + 8;
else else
drawcol = dc.col[g.fg]; 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];
} }
if (IS_SET(MODE_REVERSE)) { if (IS_SET(MODE_REVERSE)) {