===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -c -r1.161 -r1.162
*** src/usr.bin/tmux/tty-keys.c	2022/11/11 08:37:55	1.161
--- src/usr.bin/tmux/tty-keys.c	2022/11/11 08:44:11	1.162
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.161 2022/11/11 08:37:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.162 2022/11/11 08:44:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1256,1261 ****
--- 1256,1262 ----
      size_t *size)
  {
  	struct client	*c = tty->client;
+ 	int		*features = &c->term_features;
  	u_int		 i, n = 0;
  	char		 tmp[128], *endptr, p[32] = { 0 }, *cp, *next;
  
***************
*** 1305,1315 ****
  	case 62: /* VT220 */
  	case 63: /* VT320 */
  	case 64: /* VT420 */
! 	for (i = 1; i < n; i++) {
! 		log_debug("%s: DA feature: %d", c->name, p[i]);
! 		if (p[i] == 4)
! 			tty->term->flags |= TERM_SIXEL;
! 	}
  		break;
  	}
  	log_debug("%s: received primary DA %.*s", c->name, (int)*size, buf);
--- 1306,1316 ----
  	case 62: /* VT220 */
  	case 63: /* VT320 */
  	case 64: /* VT420 */
! 		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;
  	}
  	log_debug("%s: received primary DA %.*s", c->name, (int)*size, buf);
***************
*** 1329,1334 ****
--- 1330,1336 ----
      size_t *size)
  {
  	struct client	*c = tty->client;
+ 	int		*features = &c->term_features;
  	u_int		 i, n = 0;
  	char		 tmp[128], *endptr, p[32] = { 0 }, *cp, *next;
  
***************
*** 1376,1391 ****
  	/* Add terminal features. */
  	switch (p[0]) {
  	case 41: /* VT420 */
! 		tty_add_features(&c->term_features, "margins,rectfill", ",");
  		break;
  	case 'M': /* mintty */
! 		tty_default_features(&c->term_features, "mintty", 0);
  		break;
  	case 'T': /* tmux */
! 		tty_default_features(&c->term_features, "tmux", 0);
  		break;
  	case 'U': /* rxvt-unicode */
! 		tty_default_features(&c->term_features, "rxvt-unicode", 0);
  		break;
  	}
  	log_debug("%s: received secondary DA %.*s", c->name, (int)*size, buf);
--- 1378,1393 ----
  	/* Add terminal features. */
  	switch (p[0]) {
  	case 41: /* VT420 */
! 		tty_add_features(features, "margins,rectfill", ",");
  		break;
  	case 'M': /* mintty */
! 		tty_default_features(features, "mintty", 0);
  		break;
  	case 'T': /* tmux */
! 		tty_default_features(features, "tmux", 0);
  		break;
  	case 'U': /* rxvt-unicode */
! 		tty_default_features(features, "rxvt-unicode", 0);
  		break;
  	}
  	log_debug("%s: received secondary DA %.*s", c->name, (int)*size, buf);
***************
*** 1405,1410 ****
--- 1407,1413 ----
      size_t len, size_t *size)
  {
  	struct client	*c = tty->client;
+ 	int		*features = &c->term_features;
  	u_int		 i;
  	char		 tmp[128];
  
***************
*** 1445,1457 ****
  
  	/* Add terminal features. */
  	if (strncmp(tmp, "iTerm2 ", 7) == 0)
! 		tty_default_features(&c->term_features, "iTerm2", 0);
  	else if (strncmp(tmp, "tmux ", 5) == 0)
! 		tty_default_features(&c->term_features, "tmux", 0);
  	else if (strncmp(tmp, "XTerm(", 6) == 0)
! 		tty_default_features(&c->term_features, "XTerm", 0);
  	else if (strncmp(tmp, "mintty ", 7) == 0)
! 		tty_default_features(&c->term_features, "mintty", 0);
  	log_debug("%s: received extended DA %.*s", c->name, (int)*size, buf);
  
  	free(c->term_type);
--- 1448,1460 ----
  
  	/* Add terminal features. */
  	if (strncmp(tmp, "iTerm2 ", 7) == 0)
! 		tty_default_features(features, "iTerm2", 0);
  	else if (strncmp(tmp, "tmux ", 5) == 0)
! 		tty_default_features(features, "tmux", 0);
  	else if (strncmp(tmp, "XTerm(", 6) == 0)
! 		tty_default_features(features, "XTerm", 0);
  	else if (strncmp(tmp, "mintty ", 7) == 0)
! 		tty_default_features(features, "mintty", 0);
  	log_debug("%s: received extended DA %.*s", c->name, (int)*size, buf);
  
  	free(c->term_type);