applied blinking cursor
authorDaniel Liu <mr.picklepinosaur@gmail.com>
Thu, 13 Aug 2020 23:47:19 +0000 (19:47 -0400)
committerDaniel Liu <mr.picklepinosaur@gmail.com>
Thu, 13 Aug 2020 23:47:19 +0000 (19:47 -0400)
config.def.h
x.c

index a345aad..361e138 100644 (file)
@@ -133,13 +133,20 @@ static unsigned int defaultcs = 256;
 static unsigned int defaultrcs = 257;
 
 /*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
+ * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81
+ * Default style of cursor
+ * 0: Blinking block
+ * 1: Blinking block (default)
+ * 2: Steady block ("█")
+ * 3: Blinking underline
+ * 4: Steady underline ("_")
+ * 5: Blinking bar
+ * 6: Steady bar ("|")
+ * 7: Blinking st cursor
+ * 8: Steady st cursor
  */
-static unsigned int cursorshape = 2;
+static unsigned int cursorstyle = 1;
+static Rune stcursor = 0x2603; /* snowman (U+2603) */
 
 /*
  * Default columns and rows numbers
diff --git a/x.c b/x.c
index 76f167f..a358386 100644 (file)
--- a/x.c
+++ b/x.c
@@ -267,6 +267,7 @@ static char *opt_name  = NULL;
 static char *opt_title = NULL;
 
 static int oldbutton = 3; /* button event on startup: 3 = release */
+static int cursorblinks = 0;
 
 void
 clipcopy(const Arg *dummy)
@@ -1538,16 +1539,19 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
        /* draw the new one */
        if (IS_SET(MODE_FOCUSED)) {
                switch (win.cursor) {
-               case 7: /* st extension */
-                       g.u = 0x2603; /* snowman (U+2603) */
+               case 0: /* Blinking block */
+               case 1: /* Blinking block (default) */
+                       if (IS_SET(MODE_BLINK))
+                               break;
                        /* FALLTHROUGH */
-               case 0: /* Blinking Block */
-               case 1: /* Blinking Block (Default) */
-               case 2: /* Steady Block */
+               case 2: /* Steady block */
                        xdrawglyph(g, cx, cy);
                        break;
-               case 3: /* Blinking Underline */
-               case 4: /* Steady Underline */
+               case 3: /* Blinking underline */
+                       if (IS_SET(MODE_BLINK))
+                               break;
+                       /* FALLTHROUGH */
+               case 4: /* Steady underline */
                        XftDrawRect(xw.draw, &drawcol,
                                        borderpx + cx * win.cw,
                                        borderpx + (cy + 1) * win.ch - \
@@ -1555,12 +1559,23 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
                                        win.cw, cursorthickness);
                        break;
                case 5: /* Blinking bar */
+                       if (IS_SET(MODE_BLINK))
+                               break;
+                       /* FALLTHROUGH */
                case 6: /* Steady bar */
                        XftDrawRect(xw.draw, &drawcol,
                                        borderpx + cx * win.cw,
                                        borderpx + cy * win.ch,
                                        cursorthickness, win.ch);
                        break;
+               case 7: /* Blinking st cursor */
+                       if (IS_SET(MODE_BLINK))
+                               break;
+                       /* FALLTHROUGH */
+               case 8: /* Steady st cursor */
+                       g.u = stcursor;
+                       xdrawglyph(g, cx, cy);
+                       break;
                }
        } else {
                XftDrawRect(xw.draw, &drawcol,
@@ -1702,9 +1717,12 @@ xsetmode(int set, unsigned int flags)
 int
 xsetcursor(int cursor)
 {
-       if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
+       if (!BETWEEN(cursor, 0, 8)) /* 7-8: st extensions */
                return 1;
        win.cursor = cursor;
+       cursorblinks = win.cursor == 0 || win.cursor == 1 ||
+                      win.cursor == 3 || win.cursor == 5 ||
+                      win.cursor == 7;
        return 0;
 }
 
@@ -1948,6 +1966,10 @@ run(void)
                if (FD_ISSET(ttyfd, &rfd) || xev) {
                        if (!drawing) {
                                trigger = now;
+                               if (IS_SET(MODE_BLINK)) {
+                                       win.mode ^= MODE_BLINK;
+                               }
+                               lastblink = now;
                                drawing = 1;
                        }
                        timeout = (maxlatency - TIMEDIFF(now, trigger)) \
@@ -1958,7 +1980,7 @@ run(void)
 
                /* idle detected or maxlatency exhausted -> draw */
                timeout = -1;
-               if (blinktimeout && tattrset(ATTR_BLINK)) {
+               if (blinktimeout && (cursorblinks || tattrset(ATTR_BLINK))) {
                        timeout = blinktimeout - TIMEDIFF(now, lastblink);
                        if (timeout <= 0) {
                                if (-timeout > blinktimeout) /* start visible */
@@ -2047,7 +2069,7 @@ main(int argc, char *argv[])
 {
        xw.l = xw.t = 0;
        xw.isfixed = False;
-       xsetcursor(cursorshape);
+       xsetcursor(cursorstyle);
 
        ARGBEGIN {
        case 'a':