1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
Source: https://lists.suckless.org/hackers/1801/15783.html
diff --git a/config.def.h b/config.def.h
index 82b1b09..e3e1f97 100644
--- a/config.def.h
+++ b/config.def.h
@@ -123,7 +123,9 @@ static unsigned int defaultrcs = 257;
/*
* Default shape of cursor
+ * 1: Blinking Block ("█")
* 2: Block ("█")
+ * 3: Blinking Underline ("_")
* 4: Underline ("_")
* 6: Bar ("|")
* 7: Snowman ("☃")
diff --git a/x.c b/x.c
index c0bd890..27b87cc 100644
--- a/x.c
+++ b/x.c
@@ -1441,11 +1441,17 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
case 7: /* st extension: snowman (U+2603) */
g.u = 0x2603;
case 0: /* Blinking Block */
+ if (IS_SET(MODE_BLINK))
+ break;
case 1: /* Blinking Block (Default) */
+ if (IS_SET(MODE_BLINK))
+ break;
case 2: /* Steady Block */
xdrawglyph(g, cx, cy);
break;
case 3: /* Blinking Underline */
+ if (IS_SET(MODE_BLINK))
+ break;
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
@@ -1454,6 +1460,8 @@ 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;
case 6: /* Steady bar */
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
@@ -1802,11 +1810,9 @@ run(void)
}
if (FD_ISSET(ttyfd, &rfd)) {
ttyread();
- if (blinktimeout) {
- blinkset = tattrset(ATTR_BLINK);
- if (!blinkset)
- MODBIT(win.mode, 0, MODE_BLINK);
- }
+ blinkset = blinktimeout || tattrset(ATTR_BLINK);
+ if (!blinkset)
+ MODBIT(win.mode, 0, MODE_BLINK);
}
if (FD_ISSET(xfd, &rfd))
@@ -1835,8 +1841,11 @@ run(void)
XNextEvent(xw.dpy, &ev);
if (XFilterEvent(&ev, None))
continue;
- if (handler[ev.type])
- (handler[ev.type])(&ev);
+ if (handler[ev.type]) {
+ (handler[ev.type])(&ev);
+ lastblink = now;
+ if (IS_SET(MODE_BLINK)) MODBIT(win.mode, 0, MODE_BLINK);
+ }
}
draw();
|