===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-features.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/tty-features.c	2020/05/16 14:16:25	1.6
--- src/usr.bin/tmux/tty-features.c	2020/05/16 14:22:51	1.7
***************
*** 1,4 ****
! /* $OpenBSD: tty-features.c,v 1.6 2020/05/16 14:16:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-features.c,v 1.7 2020/05/16 14:22:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 34,40 ****
   *
   * Also:
   * - XT is used to decide whether to send DA and XDA;
!  * - DECSLRM and DECFRA use a flag instead of capabilities;
   * - UTF-8 is a separate flag on the client; needed for unattached clients.
   */
  
--- 34,40 ----
   *
   * Also:
   * - XT is used to decide whether to send DA and XDA;
!  * - DECFRA uses a flag instead of capabilities;
   * - UTF-8 is a separate flag on the client; needed for unattached clients.
   */
  
***************
*** 84,90 ****
  static struct tty_feature tty_feature_rgb = {
  	"RGB",
  	tty_feature_rgb_capabilities,
! 	(TERM_256COLOURS|TERM_RGBCOLOURS)
  };
  
  /* Terminal supports 256 colours. */
--- 84,90 ----
  static struct tty_feature tty_feature_rgb = {
  	"RGB",
  	tty_feature_rgb_capabilities,
! 	TERM_256COLOURS|TERM_RGBCOLOURS
  };
  
  /* Terminal supports 256 colours. */
***************
*** 159,167 ****
  };
  
  /* Terminal supports DECSLRM margins. */
  static struct tty_feature tty_feature_margins = {
  	"margins",
! 	NULL,
  	TERM_DECSLRM
  };
  
--- 159,174 ----
  };
  
  /* Terminal supports DECSLRM margins. */
+ static const char *tty_feature_margins_capabilities[] = {
+ 	"Enmg=\\E[?69h",
+ 	"Dsmg=\\E[?69l",
+ 	"Clmg=\\E[s",
+ 	"Cmg=\\E[%i%p1%d;%p2%ds",
+ 	NULL
+ };
  static struct tty_feature tty_feature_margins = {
  	"margins",
! 	tty_feature_margins_capabilities,
  	TERM_DECSLRM
  };
  
***************
*** 193,198 ****
--- 200,207 ----
  	const struct tty_feature	 *tf;
  	char				 *next, *loop, *copy;
  	u_int				  i;
+ 
+ 	log_debug("%s: %s", __func__, s);
  
  	loop = copy = xstrdup(s);
  	while ((next = strsep(&loop, separators)) != NULL) {