patch 8.2.4777: screendump tests fail because of a redraw
Problem: Screendump tests fail because of a redraw.
Solution: Do not output t_8u before receiving termresponse. Redraw only
when t_8u is not reset and termresponse is received.
diff --git a/src/term.c b/src/term.c
index 0aafebb..abc8a38 100644
--- a/src/term.c
+++ b/src/term.c
@@ -165,6 +165,14 @@
&winpos_status,
NULL
};
+
+// The t_8u code may default to a value but get reset when the term response is
+// received. To avoid redrawing too often, only redraw when t_8u is not reset
+// and it was supposed to be written.
+// FALSE -> don't output t_8u yet
+// MAYBE -> tried outputing t_8u while FALSE
+// OK -> can write t_8u
+int write_t_8u_state = FALSE;
# endif
/*
@@ -2104,6 +2112,7 @@
#ifdef FEAT_TERMRESPONSE
LOG_TR(("setting crv_status to STATUS_GET"));
crv_status.tr_progress = STATUS_GET; // Get terminal version later
+ write_t_8u_state = FALSE;
#endif
/*
@@ -3049,6 +3058,8 @@
#define MAX_COLOR_STR_LEN 100
char buf[MAX_COLOR_STR_LEN];
+ if (*s == NUL)
+ return;
vim_snprintf(buf, MAX_COLOR_STR_LEN,
(char *)s, RED(rgb), GREEN(rgb), BLUE(rgb));
#ifdef FEAT_VTP
@@ -3078,7 +3089,12 @@
void
term_ul_rgb_color(guicolor_T rgb)
{
- term_rgb_color(T_8U, rgb);
+# ifdef FEAT_TERMRESPONSE
+ if (write_t_8u_state != OK)
+ write_t_8u_state = MAYBE;
+ else
+# endif
+ term_rgb_color(T_8U, rgb);
}
#endif
@@ -4814,8 +4830,11 @@
{
set_string_option_direct((char_u *)"t_8u", -1, (char_u *)"",
OPT_FREE, 0);
- redraw_later(CLEAR);
}
+ if (*T_8U != NUL && write_t_8u_state == MAYBE)
+ // Did skip writing t_8u, a complete redraw is needed.
+ redraw_later_clear();
+ write_t_8u_state = OK; // can otuput t_8u now
// Only set 'ttymouse' automatically if it was not set
// by the user already.