From c02bc4dbe9692fb8f698509a35c3abccf895f263 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 8 Sep 2023 07:05:06 +0000
Subject: [PATCH] On second thoughts, do check DA2 for DECFRA and DECSLRM since
 that will catch terminals that say they are VT520 even if we can't use DA1
 (because of VTE).

---
 tty-keys.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tty-keys.c b/tty-keys.c
index 3ad80c3d..ef80abc4 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1399,8 +1399,17 @@ tty_keys_device_attributes2(struct tty *tty, const char *buf, size_t len,
 			break;
 	}
 
-	/* Add terminal features. */
+	/*
+	 * Add terminal features. We add DECSLRM and DECFRA for some
+	 * identification codes here, notably 64 will catch VT520, even though
+	 * we can't use level 5 from DA because of VTE.
+	 */
 	switch (p[0]) {
+	case 41: /* VT420 */
+	case 61: /* VT510 */
+	case 64: /* VT520 */
+		tty_add_features(features, "margins,rectfill", ",");
+		break;
 	case 'M': /* mintty */
 		tty_default_features(features, "mintty", 0);
 		break;
-- 
2.11.4.GIT