===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -c -r1.245 -r1.246
*** src/usr.bin/tmux/format.c	2020/04/18 14:21:39	1.245
--- src/usr.bin/tmux/format.c	2020/04/20 13:25:36	1.246
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.245 2020/04/18 14:21:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.246 2020/04/20 13:25:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 2553,2560 ****
  	format_add(ft, "client_control_mode", "%d",
  		!!(c->flags & CLIENT_CONTROL));
  
! 	if (tty->term_name != NULL)
! 		format_add(ft, "client_termname", "%s", tty->term_name);
  
  	format_add_tv(ft, "client_created", &c->creation_time);
  	format_add_tv(ft, "client_activity", &c->activity_time);
--- 2553,2561 ----
  	format_add(ft, "client_control_mode", "%d",
  		!!(c->flags & CLIENT_CONTROL));
  
! 	format_add(ft, "client_termname", "%s", c->term_name);
! 	format_add(ft, "client_termfeatures", "%s",
! 	    tty_get_features(c->term_features));
  
  	format_add_tv(ft, "client_created", &c->creation_time);
  	format_add_tv(ft, "client_activity", &c->activity_time);
***************
*** 2569,2575 ****
  		format_add(ft, "client_prefix", "%d", 1);
  	format_add(ft, "client_key_table", "%s", c->keytable->name);
  
! 	if (tty_get_flags(tty) & TERM_UTF8)
  		format_add(ft, "client_utf8", "%d", 1);
  	else
  		format_add(ft, "client_utf8", "%d", 0);
--- 2570,2576 ----
  		format_add(ft, "client_prefix", "%d", 1);
  	format_add(ft, "client_key_table", "%s", c->keytable->name);
  
! 	if (c->flags & CLIENT_UTF8)
  		format_add(ft, "client_utf8", "%d", 1);
  	else
  		format_add(ft, "client_utf8", "%d", 0);