From ff8882a24f44594c871ad849f885bcd895836e73 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 26 Jun 2023 07:17:40 +0000
Subject: Add "us" to styles for underscore colour, GitHub issue 3589.

---
 tty.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'tty.c')

diff --git a/tty.c b/tty.c
index 225d0058..e34b186a 100644
--- a/tty.c
+++ b/tty.c
@@ -483,6 +483,12 @@ tty_update_features(struct tty *tty)
 	if (tty->term->flags & TERM_VT100LIKE)
 		tty_puts(tty, "\033[?7727h");
 
+	/*
+	 * Features might have changed since the first draw during attach. For
+	 * example, this happens when DA responses are received.
+	 */
+	server_redraw_client(c);
+
 	tty_invalidate(tty);
 }
 
@@ -2808,9 +2814,10 @@ tty_check_us(__unused struct tty *tty, struct colour_palette *palette,
 			gc->us = c;
 	}
 
-	/* Underscore colour is set as RGB so convert a 256 colour to RGB. */
-	if (gc->us & COLOUR_FLAG_256)
-		gc->us = colour_256toRGB (gc->us);
+	/* Underscore colour is set as RGB so convert. */
+	gc->us = colour_force_rgb (gc->us);
+	if (gc->us == -1)
+		gc->us = 8;
 }
 
 static void
-- 
cgit v1.2.3