===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -c -r1.172 -r1.173
*** src/usr.bin/tmux/tty-keys.c	2023/09/08 07:05:06	1.172
--- src/usr.bin/tmux/tty-keys.c	2024/03/21 11:47:55	1.173
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.172 2023/09/08 07:05:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.173 2024/03/21 11:47:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1314,1339 ****
  			break;
  	}
  
! 	/*
! 	 * Add terminal features. Hardware level 5 does not offer SIXEL but
! 	 * some terminal emulators report it anyway and it does not harm
! 	 * to check it here.
! 	 *
! 	 * DECSLRM and DECFRA should be supported by level 5 as well as level
! 	 * 4, but VTE has rather ruined it by advertising level 5 despite not
! 	 * supporting them.
! 	 */
  	switch (p[0]) {
! 	case 64: /* level 4 */
! 		tty_add_features(features, "margins,rectfill", ",");
! 		/* FALLTHROUGH */
  	case 62: /* level 2 */
  	case 63: /* level 3 */
  	case 65: /* level 5 */
  		for (i = 1; i < n; i++) {
  			log_debug("%s: DA feature: %d", c->name, p[i]);
  			if (p[i] == 4)
  				tty_add_features(features, "sixel", ",");
  		}
  		break;
  	}
--- 1314,1334 ----
  			break;
  	}
  
! 	/* Add terminal features. */
  	switch (p[0]) {
! 	case 61: /* level 1 */
  	case 62: /* level 2 */
  	case 63: /* level 3 */
+ 	case 64: /* level 4 */
  	case 65: /* level 5 */
  		for (i = 1; i < n; i++) {
  			log_debug("%s: DA feature: %d", c->name, p[i]);
  			if (p[i] == 4)
  				tty_add_features(features, "sixel", ",");
+ 			if (p[i] == 21)
+ 				tty_add_features(features, "margins", ",");
+ 			if (p[i] == 28)
+ 				tty_add_features(features, "rectfill", ",");
  		}
  		break;
  	}
***************
*** 1405,1415 ****
  	 * 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;
--- 1400,1405 ----