===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-features.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/tmux/tty-features.c	2020/10/05 09:53:01	1.18
+++ src/usr.bin/tmux/tty-features.c	2021/06/10 07:28:45	1.19
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-features.c,v 1.18 2020/10/05 09:53:01 nicm Exp $ */
+/* $OpenBSD: tty-features.c,v 1.19 2021/06/10 07:28:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -218,9 +218,13 @@
 };
 
 /* Terminal supports DECFRA rectangle fill. */
+static const char *tty_feature_rectfill_capabilities[] = {
+	"Rect",
+	NULL
+};
 static const struct tty_feature tty_feature_rectfill = {
 	"rectfill",
-	NULL,
+	tty_feature_rectfill_capabilities,
 	TERM_DECFRA
 };
 
@@ -351,8 +355,13 @@
 			      ",cstyle,extkeys,margins,sync"
 		},
 		{ .name = "XTerm",
+		  /*
+		   * xterm also supports DECSLRM and DECFRA, but they can be
+		   * disabled so not set it here - they will be added if
+		   * secondary DA shows VT420.
+		   */
 		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-			      ",ccolour,cstyle,extkeys,focus,margins,rectfill"
+			      ",ccolour,cstyle,extkeys,focus"
 		}
 	};
 	u_int	i;