===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.364
retrieving revision 1.365
diff -c -r1.364 -r1.365
*** src/usr.bin/tmux/tty.c	2020/05/16 14:16:25	1.364
--- src/usr.bin/tmux/tty.c	2020/05/16 14:22:51	1.365
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.364 2020/05/16 14:16:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.365 2020/05/16 14:22:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 426,432 ****
  	}
  
  	if (tty_use_margin(tty))
! 		tty_raw(tty, "\033[?69l"); /* DECLRMM */
  	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
  
  	setblocking(tty->fd, 1);
--- 426,432 ----
  	}
  
  	if (tty_use_margin(tty))
! 		tty_raw(tty, tty_term_string(tty->term, TTYC_DSMG));
  	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
  
  	setblocking(tty->fd, 1);
***************
*** 473,479 ****
  		tty_term_apply_overrides(tty->term);
  
  	if (tty_use_margin(tty))
! 		tty_puts(tty, "\033[?69h"); /* DECLRMM */
  }
  
  void
--- 473,479 ----
  		tty_term_apply_overrides(tty->term);
  
  	if (tty_use_margin(tty))
! 		tty_putcode(tty, TTYC_ENMG);
  }
  
  void
***************
*** 2028,2034 ****
  
  	if (tty->flags & TTY_STARTED) {
  		if (tty_use_margin(tty))
! 			tty_puts(tty, "\033[?69h"); /* DECLRMM */
  		tty_putcode(tty, TTYC_SGR0);
  
  		tty->mode = ALL_MODES;
--- 2028,2034 ----
  
  	if (tty->flags & TTY_STARTED) {
  		if (tty_use_margin(tty))
! 			tty_putcode(tty, TTYC_ENMG);
  		tty_putcode(tty, TTYC_SGR0);
  
  		tty->mode = ALL_MODES;
***************
*** 2105,2112 ****
  static void
  tty_margin(struct tty *tty, u_int rleft, u_int rright)
  {
- 	char s[64];
- 
  	if (!tty_use_margin(tty))
  		return;
  	if (tty->rleft == rleft && tty->rright == rright)
--- 2105,2110 ----
***************
*** 2118,2127 ****
  	tty->rright = rright;
  
  	if (rleft == 0 && rright == tty->sx - 1)
! 		snprintf(s, sizeof s, "\033[s");
  	else
! 		snprintf(s, sizeof s, "\033[%u;%us", rleft + 1, rright + 1);
! 	tty_puts(tty, s);
  	tty->cx = tty->cy = UINT_MAX;
  }
  
--- 2116,2124 ----
  	tty->rright = rright;
  
  	if (rleft == 0 && rright == tty->sx - 1)
! 		tty_putcode(tty, TTYC_CLMG);
  	else
! 		tty_putcode2(tty, TTYC_CMG, rleft, rright);
  	tty->cx = tty->cy = UINT_MAX;
  }