Fix the cursor color when over selection.

[st.git] / st.c

diff --git a/st.c b/st.c
index 457f266..d9f0ba6 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,17 +3851,9 @@ 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);
-
-               g.mode ^= ATTR_REVERSE;
+               drawcol = dc.col[defaultrcs];
+               g.fg = defaultfg;
+               g.bg = defaultrcs;

        } else {
                drawcol = dc.col[defaultcs];
        }
        } else {
                drawcol = dc.col[defaultcs];
        }


@@ -3873,6 +3864,8 @@ xdrawcursor(void)
        /* draw the new one */
        if (xw.state & WIN_FOCUSED) {
                switch (xw.cursor) {
        /* draw the new one */
        if (xw.state & WIN_FOCUSED) {
                switch (xw.cursor) {

+               case 7: /* st extension: snowman */
+                       utf8decode("☃", &g.u, UTF_SIZ);

                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */
                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */


@@ -3889,7 +3882,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 */