The definition of the reverse cursor is now up to the user.

diff --git a/config.def.h b/config.def.h
index b6adc5e..85921dc 100644 (file)
--- 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",
 
        /* more colors can be added after 255 to use with DefaultXX */
        "#cccccc",

+       "#555555",

 };
 
 
 /*
  * Default colors (colorname index)
 };
 
 
 /*
  * 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 defaultfg = 7;
 static 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/st.c b/st.c
index 457f266..782d18e 100644 (file)
--- 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;
        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);
 
        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)) {
 
        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];
                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,
                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 */
                                        xw.cw, cursorthickness);
                        break;
                case 5: /* Blinking bar */