Allow blinking cursor
This commit is contained in:
parent
c79471a826
commit
3efab6534a
19
config.def.h
19
config.def.h
|
@ -141,13 +141,20 @@ unsigned int defaultitalic = 7;
|
||||||
unsigned int defaultunderline = 7;
|
unsigned int defaultunderline = 7;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default shape of cursor
|
* 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
|
||||||
* 2: Block ("█")
|
* Default style of cursor
|
||||||
* 4: Underline ("_")
|
* 0: Blinking block
|
||||||
* 6: Bar ("|")
|
* 1: Blinking block (default)
|
||||||
* 7: Snowman ("☃")
|
* 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 = 6;
|
static unsigned int cursorstyle = 5;
|
||||||
|
static Rune stcursor = 0x2603; /* snowman (U+2603) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default columns and rows numbers
|
* Default columns and rows numbers
|
||||||
|
|
43
x.c
43
x.c
|
@ -259,6 +259,7 @@ static char *opt_name = NULL;
|
||||||
static char *opt_title = NULL;
|
static char *opt_title = NULL;
|
||||||
|
|
||||||
static int oldbutton = 3; /* button event on startup: 3 = release */
|
static int oldbutton = 3; /* button event on startup: 3 = release */
|
||||||
|
static int cursorblinks = 0;
|
||||||
|
|
||||||
void
|
void
|
||||||
clipcopy(const Arg *dummy)
|
clipcopy(const Arg *dummy)
|
||||||
|
@ -1547,16 +1548,19 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||||
/* draw the new one */
|
/* draw the new one */
|
||||||
if (IS_SET(MODE_FOCUSED)) {
|
if (IS_SET(MODE_FOCUSED)) {
|
||||||
switch (win.cursor) {
|
switch (win.cursor) {
|
||||||
case 7: /* st extension */
|
case 0: /* Blinking block */
|
||||||
g.u = 0x2603; /* snowman (U+2603) */
|
case 1: /* Blinking block (default) */
|
||||||
|
if (IS_SET(MODE_BLINK))
|
||||||
|
break;
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
case 0: /* Blinking Block */
|
case 2: /* Steady block */
|
||||||
case 1: /* Blinking Block (Default) */
|
|
||||||
case 2: /* Steady Block */
|
|
||||||
xdrawglyph(g, cx, cy);
|
xdrawglyph(g, cx, cy);
|
||||||
break;
|
break;
|
||||||
case 3: /* Blinking Underline */
|
case 3: /* Blinking underline */
|
||||||
case 4: /* Steady Underline */
|
if (IS_SET(MODE_BLINK))
|
||||||
|
break;
|
||||||
|
/* FALLTHROUGH */
|
||||||
|
case 4: /* Steady underline */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
win.vborderpx + (cy + 1) * win.ch - \
|
win.vborderpx + (cy + 1) * win.ch - \
|
||||||
|
@ -1564,11 +1568,23 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||||
win.cw, cursorthickness);
|
win.cw, cursorthickness);
|
||||||
break;
|
break;
|
||||||
case 5: /* Blinking bar */
|
case 5: /* Blinking bar */
|
||||||
|
if (IS_SET(MODE_BLINK))
|
||||||
|
break;
|
||||||
|
/* FALLTHROUGH */
|
||||||
case 6: /* Steady bar */
|
case 6: /* Steady bar */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
win.vborderpx + cy * win.ch,
|
win.vborderpx + cy * win.ch,
|
||||||
cursorthickness, 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 {
|
} else {
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
|
@ -1712,9 +1728,12 @@ xsetmode(int set, unsigned int flags)
|
||||||
int
|
int
|
||||||
xsetcursor(int cursor)
|
xsetcursor(int cursor)
|
||||||
{
|
{
|
||||||
if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
|
if (!BETWEEN(cursor, 0, 8)) /* 7-8: st extensions */
|
||||||
return 1;
|
return 1;
|
||||||
win.cursor = cursor;
|
win.cursor = cursor;
|
||||||
|
cursorblinks = win.cursor == 0 || win.cursor == 1 ||
|
||||||
|
win.cursor == 3 || win.cursor == 5 ||
|
||||||
|
win.cursor == 7;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1964,6 +1983,10 @@ run(void)
|
||||||
if (FD_ISSET(ttyfd, &rfd) || xev) {
|
if (FD_ISSET(ttyfd, &rfd) || xev) {
|
||||||
if (!drawing) {
|
if (!drawing) {
|
||||||
trigger = now;
|
trigger = now;
|
||||||
|
if (IS_SET(MODE_BLINK)) {
|
||||||
|
win.mode ^= MODE_BLINK;
|
||||||
|
}
|
||||||
|
lastblink = now;
|
||||||
drawing = 1;
|
drawing = 1;
|
||||||
}
|
}
|
||||||
timeout = (maxlatency - TIMEDIFF(now, trigger)) \
|
timeout = (maxlatency - TIMEDIFF(now, trigger)) \
|
||||||
|
@ -1974,7 +1997,7 @@ run(void)
|
||||||
|
|
||||||
/* idle detected or maxlatency exhausted -> draw */
|
/* idle detected or maxlatency exhausted -> draw */
|
||||||
timeout = -1;
|
timeout = -1;
|
||||||
if (blinktimeout && tattrset(ATTR_BLINK)) {
|
if (blinktimeout && (cursorblinks || tattrset(ATTR_BLINK))) {
|
||||||
timeout = blinktimeout - TIMEDIFF(now, lastblink);
|
timeout = blinktimeout - TIMEDIFF(now, lastblink);
|
||||||
if (timeout <= 0) {
|
if (timeout <= 0) {
|
||||||
if (-timeout > blinktimeout) /* start visible */
|
if (-timeout > blinktimeout) /* start visible */
|
||||||
|
@ -2010,7 +2033,7 @@ main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
xw.l = xw.t = 0;
|
xw.l = xw.t = 0;
|
||||||
xw.isfixed = False;
|
xw.isfixed = False;
|
||||||
xsetcursor(cursorshape);
|
xsetcursor(cursorstyle);
|
||||||
|
|
||||||
ARGBEGIN {
|
ARGBEGIN {
|
||||||
case 'a':
|
case 'a':
|
||||||
|
|
Loading…
Reference in New Issue