commit 5535c1f04c665c05faff2a65d5558246b7748d49
from: Jules Maselbas <jules.maselbas@grenoble-inp.org>
via: Hiltjo Posthuma <hiltjo@codemadness.org>
date: Sun Jul 15 16:16:52 2018 UTC

Fix crash when cursor color is truecolor

Reported-by: Ivan Tham <pickfire@riseup.net>

commit - b51bcd5553af3db394014efbd78acf7828fa48ff
commit + 5535c1f04c665c05faff2a65d5558246b7748d49
blob - b51821dc103fadb47d44901c8a3f821ba50d6615
blob + 4155a703ecdae595ce629281f15e80e7de498ba1
--- x.c
+++ x.c
@@ -1404,6 +1404,7 @@ 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))
@@ -1419,16 +1420,24 @@ 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)) {
-		drawcol = dc.col[g.bg];
+		cc = g.bg;
 	} else {
 		g.mode |= ATTR_REVERSE;
-
 		if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
-			drawcol = dc.col[g.fg + 8];
+			cc = g.fg + 8;
 		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)) {
 		drawcol.color.red = ~drawcol.color.red;
 		drawcol.color.green = ~drawcol.color.green;