From f7b80caebe2b96ef65e301634d8dc4e02325e357 Mon Sep 17 00:00:00 2001 From: Christoph Lohmann <20h@r-36.net> Date: Mon, 5 Oct 2015 22:38:19 +0200 Subject: [PATCH] The definition of the reverse cursor is now up to the user. --- config.def.h | 4 +++- st.c | 15 +++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/config.def.h b/config.def.h index b6adc5e..85921dc 100644 --- a/config.def.h +++ b/config.def.h @@ -94,16 +94,18 @@ static const char *colorname[] = { /* more colors can be added after 255 to use with DefaultXX */ "#cccccc", + "#555555", }; /* * Default colors (colorname index) - * foreground, background, cursor + * foreground, background, cursor, reverse cursor */ static unsigned int defaultfg = 7; static unsigned int defaultbg = 0; static unsigned int defaultcs = 256; +static unsigned int defaultrcs = 257; /* * Default shape of cursor diff --git a/st.c b/st.c index 457f266..782d18e 100644 --- a/st.c +++ b/st.c @@ -3831,7 +3831,6 @@ xdrawcursor(void) Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og; int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); Color drawcol; - XRenderColor dccol; LIMIT(oldx, 0, term.col-1); LIMIT(oldy, 0, term.row-1); @@ -3852,16 +3851,7 @@ xdrawcursor(void) g.u = term.line[term.c.y][term.c.x].u; if (ena_sel && selected(term.c.x, term.c.y)) { - /* - * Allocate the drawing color which is the reverse of - * defaultcs, if we are selected. - */ - dccol.red = ~dc.col[defaultcs].color.red; - dccol.green = ~dc.col[defaultcs].color.green; - dccol.blue = ~dc.col[defaultcs].color.blue; - dccol.alpha = ~dc.col[defaultcs].color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &dccol, &drawcol); - + drawcol = dc.col[defaultrcs]; g.mode ^= ATTR_REVERSE; } else { drawcol = dc.col[defaultcs]; @@ -3889,7 +3879,8 @@ xdrawcursor(void) case 4: /* Steady Underline */ XftDrawRect(xw.draw, &drawcol, borderpx + curx * xw.cw, - borderpx + (term.c.y + 1) * xw.ch - cursorthickness, + borderpx + (term.c.y + 1) * xw.ch - \ + cursorthickness, xw.cw, cursorthickness); break; case 5: /* Blinking bar */