From 751ac55f649c35134d1cd4e12f48cb19fa808bae Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 22 Jul 2019 20:23:29 +0200 Subject: csi: *sigh* looks like e.g. neovim doesn't respect Se I.e. it issues a \E[2 q regardless of what we've configured the terminfo Se entry to. So, make \E[2 q mean "the user configured cursor style" (which defaults to 'block'). --- csi.c | 13 +++++-------- foot.info | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/csi.c b/csi.c index 9487d8b3..19c0e8b3 100644 --- a/csi.c +++ b/csi.c @@ -929,14 +929,12 @@ csi_dispatch(struct terminal *term, uint8_t final) case 'q': { int param = vt_param_get(term, 0, 0); switch (param) { - case 0: - term->cursor_style = term->default_cursor_style; - term->cursor_blinking = false; /* TODO: configurable */ + case 0: case 1: /* blinking block */ + term->cursor_style = CURSOR_BLOCK; break; - case 1: /* blinking block */ - case 2: /* steady block */ - term->cursor_style = CURSOR_BLOCK; + case 2: /* steady block - but can be overriden in footrc */ + term->cursor_style = term->default_cursor_style; break; case 3: /* blinking underline */ @@ -950,8 +948,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } - if (param != 0) - term->cursor_blinking = param & 1; + term->cursor_blinking = param == 0 || param & 1; if (term->cursor_blinking) LOG_WARN("unimplemented: blinking cursor"); break; diff --git a/foot.info b/foot.info index 241238dc..4388df77 100644 --- a/foot.info +++ b/foot.info @@ -237,7 +237,7 @@ foot+base|foot base fragment, vpa=\E[%i%p1%dd, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007, - Se=\E[0 q, + Se=\E[2 q, Ss=\E[%p1%d q, # XM tells ncurses how to initialize the mouse. The xterm terminfo -- cgit v1.3