commit b51bcd5553af3db394014efbd78acf7828fa48ff
from: Jules Maselbas <jules.maselbas@grenoble-inp.org>
via: Hiltjo Posthuma <hiltjo@codemadness.org>
date: Sat Jul 14 10:49:37 2018 UTC

Make cursor follow text color

commit - 1911c9274d9b03f3d7999c6ce26e2d5169642d26
commit + b51bcd5553af3db394014efbd78acf7828fa48ff
blob - 82b1b095ce7003897c9dc5c065d92abd0835884b
blob + ca6b0db54d263d69847984c94c3a9ed66ca0392c
--- config.def.h
+++ config.def.h
@@ -118,8 +118,6 @@ static const char *colorname[] = {
  */
 unsigned int defaultfg = 7;
 unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
blob - ffd005fae1523bca102905cc13d86cf8f380dd92
blob + b51821dc103fadb47d44901c8a3f821ba50d6615
--- x.c
+++ x.c
@@ -1419,13 +1419,15 @@ 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)) {
-		g.bg = defaultrcs;
-		g.fg = defaultfg;
+		drawcol = dc.col[g.bg];
 	} else {
-		g.bg = defaultcs;
-		g.fg = defaultbg;
+		g.mode |= ATTR_REVERSE;
+
+		if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
+			drawcol = dc.col[g.fg + 8];
+		else
+			drawcol = dc.col[g.fg];
 	}
-	drawcol = dc.col[g.bg];
 
 	if (IS_SET(MODE_REVERSE)) {
 		drawcol.color.red = ~drawcol.color.red;