[hackers] [PATCH] Restore cursor color customization and defaults

From: Jules Maselbas <jules.maselbas_AT_grenoble-inp.org>
Date: Tue, 17 Jul 2018 22:58:40 +0200

defaultcs define the (main) cursor color. defaultcfg define the secondary
cursor color, this is the color taken by the text color when using the
cursor with a block or snowman shape.

defaultcs and defaultcfg have a variant for reversed cursor (when selected)
respectively defaultrcs and defaultrcfg.

In the default configuration, the cursor color is black (defaultbg) text
over a white (color index 256) block. Once selected the cursor color
will be white (defaultfg) on a grey (color index 257) block cursor.

The cursor can be configured to follow the underlining text color:
Setting defaultcs to g.fg will make the cursor color follow the text fg.
Setting defaultcfg to g.bg will make the cursor fg color follow the text bg.
This can be independently done for selected cursor by setting defaulrcs to
g.bg and defaultrfg to g.fg.

--- 8< ---

This patch has been made over '5535c1f Fix crash when cursor color is truecolor'
and cannot be applied after the revert.

Any feedback will be appreciated.
Thanks

---
 config.def.h |  5 +++++
 x.c          | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/config.def.h b/config.def.h
index ca6b0db..9f47bca 100644
--- a/config.def.h
+++ b/config.def.h
_AT_@ -118,6 +118,11 @@ static const char *colorname[] = {
  */
 unsigned int defaultfg = 7;
 unsigned int defaultbg = 0;
+#define defaultcs   256        /* index or 'g.fg' */
+#define defaultrcs  257        /* index or 'g.bg' */
+/* Foreground color of cursor's Rune (when shape is Block or Snowman) */
+#define defaultcfg  defaultbg  /* index or 'g.bg' */
+#define defaultrcfg defaultfg  /* index or 'g.fg' */
 
 /*
  * Default shape of cursor
diff --git a/x.c b/x.c
index 4155a70..109ff67 100644
--- a/x.c
+++ b/x.c
_AT_@ -1420,13 +1420,16 @@ 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;
 
 	if (selected(cx, cy)) {
-		cc = g.bg;
+		cc = g.bg = defaultrcs;
+		g.fg = defaultrcfg;
 	} else {
 		g.mode |= ATTR_REVERSE;
-		if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
-			cc = g.fg + 8;
-		else
-			cc = g.fg;
+		if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7)) {
+			g.mode |= ATTR_FAINT;
+			g.fg += 8;
+		}
+		cc = g.fg = defaultcs;
+		g.bg = defaultcfg;
 	}
 
 	if (IS_TRUECOL(cc)) {
-- 
2.18.0

Received on Tue Jul 17 2018 - 22:58:40 CEST