From 7a25599d8452c29bf32a5cd7de5968acb15732cd Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 15 Jul 2021 20:02:55 +0100 Subject: [PATCH] Fix terminal redraw slowdown in presence of true colour. When do_paint breaks up a line of terminal text into contiguous runs of characters to treat the same, one of the criteria it uses is, 'Does this character even need redrawing? (or is it already displayed correctly from the previous redraw?)' When we encounter a character that matches its previous value, we end the previous run of characters, so that we can skip the one we've just encountered. That check was not taking account of the 'truecolour' field of the termchar it was checking. So it would sometimes falsely believe the character to be equivalent to its previously drawn value, even when in fact it was not, and hence insert a run break, anticipating that the previous character needed drawing and the current one did not. This didn't cause a _wrong_ redraw, because there's a separate loop further on which re-checks whether to actually draw things, which didn't make the same error. So the character that loop #1 thought didn't need a redraw, loop #2 knew _did_ need a redraw, and hence, everything did get redrawn. But by the time loop #2 is running, it's too late to change the run boundaries. So everything does get redrawn, but in much smaller chunks than it could have been. The net effect was that if the screen was filled with text displayed in true colour, and you changed it to the _same_ text in a different colour, then the whole terminal would be redrawn in one-character increments instead of the usual behaviour of folding together runs that can be drawn in one go. Thanks to Bradley Smith for debugging this very confusing issue! --- terminal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/terminal.c b/terminal.c index 1a038cf7..663e0f02 100644 --- a/terminal.c +++ b/terminal.c @@ -6043,7 +6043,9 @@ static void do_paint(Terminal *term) if (!term->ucsdata->dbcs_screenfont && !dirty_line) { if (term->disptext[i]->chars[j].chr == tchar && - (term->disptext[i]->chars[j].attr &~ DATTR_MASK) == tattr) + (term->disptext[i]->chars[j].attr &~ DATTR_MASK)==tattr && + truecolour_equal( + term->disptext[i]->chars[j].truecolour, tc)) break_run = true; else if (!dirty_run && ccount == 1) break_run = true;