# else
# define LOG_TR(msg)
# endif
+
+# define STATUS_GET 1 /* send request when switching to RAW mode */
+# define STATUS_SENT 2 /* did send request, waiting for response */
+# define STATUS_GOT 3 /* received response */
+
/* Request Terminal Version status: */
-# define CRV_GET 1 /* send T_CRV when switched to RAW mode */
-# define CRV_SENT 2 /* did send T_CRV, waiting for answer */
-# define CRV_GOT 3 /* received T_CRV response */
-static int crv_status = CRV_GET;
+static int crv_status = STATUS_GET;
+
/* Request Cursor position report: */
-# define U7_GET 1 /* send T_U7 when switched to RAW mode */
-# define U7_SENT 2 /* did send T_U7, waiting for answer */
-# define U7_GOT 3 /* received T_U7 response */
-static int u7_status = U7_GET;
+static int u7_status = STATUS_GET;
+
/* Request background color report: */
-# define RBG_GET 1 /* send T_RBG when switched to RAW mode */
-# define RBG_SENT 2 /* did send T_RBG, waiting for answer */
-# define RBG_GOT 3 /* received T_RBG response */
-static int rbg_status = RBG_GET;
+static int rbg_status = STATUS_GET;
+
+/* Request cursor mode report: */
+static int rcm_status = STATUS_GET;
# endif
/*
static int detected_8bit = FALSE; /* detected 8-bit terminal */
+/* When the cursor shape was detected these values are used:
+ * 1: block, 2: underline, 3: vertical bar
+ * initial_cursor_blink is only valid when initial_cursor_shape is not zero. */
+static int initial_cursor_shape = 0;
+static int initial_cursor_blink = FALSE;
+
static struct builtin_term builtin_termcaps[] =
{
{(int)KS_VI, IF_EB("\033[?25l", ESC_STR "[?25l")},
{(int)KS_VE, IF_EB("\033[?25h", ESC_STR "[?25h")},
{(int)KS_VS, IF_EB("\033[?12h", ESC_STR "[?12h")},
+#if 0
+ /* This is currently disabled, because we cannot reliably restore the
+ * cursor because of what appears to be an xterm bug. */
# ifdef TERMINFO
{(int)KS_CSH, IF_EB("\033[%p1%d q", ESC_STR "[%p1%d q")},
# else
{(int)KS_CSH, IF_EB("\033[%d q", ESC_STR "[%d q")},
# endif
+#endif
+ {(int)KS_CRS, IF_EB("\033P$q q\033\\", ESC_STR "P$q q" ESC_STR "\\")},
# ifdef TERMINFO
{(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH",
ESC_STR "[%i%p1%d;%p2%dH")},
* is being used.
* Don't do this when the GUI is active, it uses "t_kb" and "t_kD" directly.
*/
-#ifdef FEAT_GUI
+# ifdef FEAT_GUI
if (!gui.in_use)
-#endif
+# endif
get_stty();
#endif
full_screen = TRUE; /* we can use termcap codes from now on */
set_term_defaults(); /* use current values as defaults */
#ifdef FEAT_TERMRESPONSE
- LOG_TR("setting crv_status to CRV_GET");
- crv_status = CRV_GET; /* Get terminal version later */
+ LOG_TR("setting crv_status to STATUS_GET");
+ crv_status = STATUS_GET; /* Get terminal version later */
#endif
/*
/* May need to check for T_CRV response and termcodes, it
* doesn't work in Cooked mode, an external program may get
* them. */
- if (tmode != TMODE_RAW && (crv_status == CRV_SENT
- || u7_status == U7_SENT
- || rbg_status == RBG_SENT))
+ if (tmode != TMODE_RAW && (crv_status == STATUS_SENT
+ || u7_status == STATUS_SENT
+ || rbg_status == STATUS_SENT
+ || rcm_status == STATUS_SENT))
(void)vpeekc_nomap();
check_for_codes_from_term();
}
may_req_termresponse();
/* Immediately check for a response. If t_Co changes, we don't
* want to redraw with wrong colors first. */
- if (crv_status == CRV_SENT)
+ if (crv_status == STATUS_SENT)
check_for_codes_from_term();
}
#endif
# endif
{
/* May need to discard T_CRV, T_U7 or T_RBG response. */
- if (crv_status == CRV_SENT || u7_status == U7_SENT
- || rbg_status == RBG_SENT)
+ if (crv_status == STATUS_SENT
+ || u7_status == STATUS_SENT
+ || rbg_status == STATUS_SENT
+ || rcm_status == STATUS_SENT)
{
# ifdef UNIX
/* Give the terminal a chance to respond. */
void
may_req_termresponse(void)
{
- if (crv_status == CRV_GET
+ if (crv_status == STATUS_GET
&& can_get_termresponse()
&& starting == 0
&& *T_CRV != NUL)
{
- LOG_TR("Sending CRV");
+ LOG_TR("Sending CRV request");
out_str(T_CRV);
- crv_status = CRV_SENT;
+ crv_status = STATUS_SENT;
/* check for the characters now, otherwise they might be eaten by
* get_keystroke() */
out_flush();
void
may_req_ambiguous_char_width(void)
{
- if (u7_status == U7_GET
+ if (u7_status == STATUS_GET
&& can_get_termresponse()
&& starting == 0
&& *T_U7 != NUL
buf[mb_char2bytes(0x25bd, buf)] = 0;
out_str(buf);
out_str(T_U7);
- u7_status = U7_SENT;
+ u7_status = STATUS_SENT;
out_flush();
/* This overwrites a few characters on the screen, a redraw is needed
/*
* Similar to requesting the version string: Request the terminal background
* color when it is the right moment.
+ * Also request the cursor shape, if possible.
*/
void
may_req_bg_color(void)
{
- if (rbg_status == RBG_GET
- && can_get_termresponse()
- && starting == 0
- && *T_RBG != NUL
- && !option_was_set((char_u *)"bg"))
+ int done = FALSE;
+
+ if (can_get_termresponse() && starting == 0)
+ {
+ /* Only request background if t_RB is set and 'background' wasn't
+ * changed. */
+ if (rbg_status == STATUS_GET
+ && *T_RBG != NUL
+ && !option_was_set((char_u *)"bg"))
+ {
+ LOG_TR("Sending BG request");
+ out_str(T_RBG);
+ rbg_status = STATUS_SENT;
+ done = TRUE;
+ }
+
+ /* Only request the cursor shape if t_SH and t_RS are set. */
+ if (rcm_status == STATUS_GET
+ && *T_CSH != NUL
+ && *T_CRS != NUL)
+ {
+ LOG_TR("Sending cursor shape request");
+ out_str(T_CRS);
+ rcm_status = STATUS_SENT;
+ done = TRUE;
+ }
+ }
+ if (done)
{
- LOG_TR("Sending BG request");
- out_str(T_RBG);
- rbg_status = RBG_SENT;
/* check for the characters now, otherwise they might be eaten by
* get_keystroke() */
out_flush();
/* Only do something when redrawing the screen and we can restore the
* mode. */
if (!full_screen || *T_CEI == NUL)
+ {
+ if (forced && initial_cursor_shape > 0)
+ /* Restore to initial values. */
+ term_cursor_shape(initial_cursor_shape, initial_cursor_blink);
return;
+ }
if ((State & REPLACE) == REPLACE)
{
{
/* Skip over the digits, the final char must
* follow. */
- for (j = slen - 2; j < len && (isdigit(tp[j]) || tp[j] == ';'); ++j)
+ for (j = slen - 2; j < len && (isdigit(tp[j])
+ || tp[j] == ';'); ++j)
;
++j;
if (len < j) /* got a partial sequence */
char *aw = NULL;
LOG_TR("Received U7 status");
- u7_status = U7_GOT;
+ u7_status = STATUS_GOT;
# ifdef FEAT_AUTOCMD
did_cursorhold = TRUE;
# endif
/* eat it when at least one digit and ending in 'c' */
if (*T_CRV != NUL && i > 2 + (tp[0] != CSI) && tp[i] == 'c')
{
- LOG_TR("Received CRV");
- crv_status = CRV_GOT;
+ LOG_TR("Received CRV response");
+ crv_status = STATUS_GOT;
# ifdef FEAT_AUTOCMD
did_cursorhold = TRUE;
# endif
char *newval = (3 * '6' < tp[j+7] + tp[j+12]
+ tp[j+17]) ? "light" : "dark";
- LOG_TR("Received RBG");
- rbg_status = RBG_GOT;
+ LOG_TR("Received RBG response");
+ rbg_status = STATUS_GOT;
if (STRCMP(p_bg, newval) != 0)
{
/* value differs, apply it */
}
/* Check for key code response from xterm:
- *
* {lead}{flag}+r<hex bytes><{tail}
*
* {lead} can be <Esc>P or DCS
* {flag} can be '0' or '1'
* {tail} can be Esc>\ or STERM
*
- * Consume any code that starts with "{lead}.+r".
+ * Check for cursor shape response from xterm:
+ * {lead}1$r<number> q{tail}
+ *
+ * {lead} can be <Esc>P or DCS
+ * {tail} can be Esc>\ or STERM
+ *
+ * Consume any code that starts with "{lead}.+r" or "{lead}.$r".
*/
- else if (check_for_codes
+ else if ((check_for_codes || rcm_status == STATUS_SENT)
&& ((tp[0] == ESC && len >= 2 && tp[1] == 'P')
|| tp[0] == DCS))
{
j = 1 + (tp[0] == ESC);
- if (len >= j + 3 && (argp[1] != '+' || argp[2] != 'r'))
+ if (len < j + 3)
+ i = len; /* need more chars */
+ else if ((argp[1] != '+' && argp[1] != '$') || argp[2] != 'r')
i = 0; /* no match */
- else
+ else if (argp[1] == '+')
+ /* key code response */
for (i = j; i < len; ++i)
+ {
if ((tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')
|| tp[i] == STERM)
{
slen = i + 1 + (tp[i] == ESC);
break;
}
+ }
+ else if ((len >= j + 6 && isdigit(argp[3]))
+ && argp[4] == ' '
+ && argp[5] == 'q')
+ {
+ /* cursor shape response */
+ i = j + 6;
+ if ((tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')
+ || tp[i] == STERM)
+ {
+ int number = argp[3] - '0';
+
+ /* 0, 1 = block blink, 2 = block
+ * 3 = underline blink, 4 = underline
+ * 5 = vertical bar blink, 6 = vertical bar */
+ number = number == 0 ? 1 : number;
+ initial_cursor_shape = (number + 1) / 2;
+ initial_cursor_blink = (number & 1) ? TRUE : FALSE;
+ rcm_status = STATUS_GOT;
+ LOG_TR("Received cursor shape response");
+
+ key_name[0] = (int)KS_EXTRA;
+ key_name[1] = (int)KE_IGNORE;
+ slen = i + 1 + (tp[i] == ESC);
+ }
+ }
if (i == len)
{
termleader[len++] = CSI; /* the GUI codes are not in termcodes[] */
#endif
#ifdef FEAT_TERMRESPONSE
- if (check_for_codes)
+ if (check_for_codes || *T_CRS != NUL)
termleader[len++] = DCS; /* the termcode response starts with DCS
in 8-bit mode */
#endif
projects / vim / commitdiff