commit 732be223ee7ba5486713c63f944699fd6285af96 from: Hiltjo Posthuma date: Tue Jul 17 18:01:54 2018 UTC Revert "Fix crash when cursor color is truecolor" This reverts commit 5535c1f04c665c05faff2a65d5558246b7748d49. commit - 5535c1f04c665c05faff2a65d5558246b7748d49 commit + 732be223ee7ba5486713c63f944699fd6285af96 blob - 4155a703ecdae595ce629281f15e80e7de498ba1 blob + b51821dc103fadb47d44901c8a3f821ba50d6615 --- x.c +++ x.c @@ -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)) @@ -1420,24 +1419,16 @@ 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; + drawcol = dc.col[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)) { drawcol.color.red = ~drawcol.color.red; drawcol.color.green = ~drawcol.color.green;