===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.342
retrieving revision 1.343
diff -c -r1.342 -r1.343
*** src/usr.bin/tmux/tty.c	2020/01/29 15:07:49	1.342
--- src/usr.bin/tmux/tty.c	2020/03/16 09:18:47	1.343
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.342 2020/01/29 15:07:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.343 2020/03/16 09:18:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 330,337 ****
  		log_debug("%s: using UTF-8 for ACS", c->name);
  
  	tty_putcode(tty, TTYC_CNORM);
! 	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_puts(tty, "\033[?1000l\033[?1002l\033[?1006l\033[?1005l");
  
  	if (tty_term_flag(tty->term, TTYC_XT)) {
  		if (options_get_number(global_options, "focus-events")) {
--- 330,339 ----
  		log_debug("%s: using UTF-8 for ACS", c->name);
  
  	tty_putcode(tty, TTYC_CNORM);
! 	if (tty_term_has(tty->term, TTYC_KMOUS)) {
! 		tty_puts(tty, "\033[?1000l\033[?1002l\033[?1003l");
! 		tty_puts(tty, "\033[?1006l\033[?1005l");
! 	}
  
  	if (tty_term_flag(tty->term, TTYC_XT)) {
  		if (options_get_number(global_options, "focus-events")) {
***************
*** 404,411 ****
  		tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
! 	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_raw(tty, "\033[?1000l\033[?1002l\033[?1006l\033[?1005l");
  
  	if (tty_term_flag(tty->term, TTYC_XT)) {
  		if (tty->flags & TTY_FOCUS) {
--- 406,415 ----
  		tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
! 	if (tty_term_has(tty->term, TTYC_KMOUS)) {
! 		tty_raw(tty, "\033[?1000l\033[?1002l\033[?1003l");
! 		tty_raw(tty, "\033[?1006l\033[?1005l");
! 	}
  
  	if (tty_term_flag(tty->term, TTYC_XT)) {
  		if (tty->flags & TTY_FOCUS) {