Xinqi Bao's Git

projects / st.git / diff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: 1911c92)
Make cursor follow text color
authorJules Maselbas <[email protected]>
Sat, 14 Jul 2018 09:16:37 +0000 (11:16 +0200)
committerHiltjo Posthuma <[email protected]>
Sat, 14 Jul 2018 10:49:37 +0000 (12:49 +0200)
config.def.h diff | blob | history
x.c diff | blob | history

diff --git a/config.def.h b/config.def.h
index 82b1b09..ca6b0db 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -118,8 +118,6 @@ static const char *colorname[] = {
  */
 unsigned int defaultfg = 7;
 unsigned int defaultbg = 0;
  */
 unsigned int defaultfg = 7;
 unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
 
 /*
  * Default shape of cursor
diff --git a/x.c b/x.c
index ffd005f..b51821d 100644 (file)
--- a/x.c
+++ b/x.c
@@ -1419,13 +1419,15 @@ 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)) {
        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 {
        } 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;
 
        if (IS_SET(MODE_REVERSE)) {
                drawcol.color.red = ~drawcol.color.red;