subvert blinking code to blink cursor

[st.git] / st.c

diff --git a/st.c b/st.c
index 6f38311..80910f3 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3504,16 +3504,18 @@ xdrawcursor(void) {
 
        /* draw the new one */
        if(xw.state & WIN_FOCUSED) {
-               if(IS_SET(MODE_REVERSE)) {
-                       g.mode |= ATTR_REVERSE;
-               }
-               g.fg = term.line[term.c.y][curx].bg;
-               g.bg = term.line[term.c.y][curx].fg;
+               if(term.mode & MODE_BLINK) {
+                       if(IS_SET(MODE_REVERSE)) {
+                               g.mode |= ATTR_REVERSE;
+                       }
+                       g.fg = term.line[term.c.y][curx].bg;
+                       g.bg = term.line[term.c.y][curx].fg;
 
-               sl = utf8len(g.c);
-               width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
-                       ? 2 : 1;
-               xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+                       sl = utf8len(g.c);
+                       width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+                               ? 2 : 1;
+                       xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+               }
        } else {
                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                borderpx + curx * xw.cw,
@@ -3866,15 +3868,16 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                       if(blinktimeout) {
-                               blinkset = tattrset(ATTR_BLINK);
-                               if(!blinkset)
-                                       MODBIT(term.mode, 0, MODE_BLINK);
-                       }
                }
 
-               if(FD_ISSET(xfd, &rfd))
+               if(FD_ISSET(xfd, &rfd)) {
                        xev = actionfps;
+                       if(blinktimeout) {
+                               lastblink = now;
+                               MODBIT(term.mode, 1, MODE_BLINK);
+                               blinkset = 1;
+                       }
+               }
 
                clock_gettime(CLOCK_MONOTONIC, &now);
                drawtimeout.tv_sec = 0;