===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.385
retrieving revision 1.386
diff -c -r1.385 -r1.386
*** src/usr.bin/tmux/tty.c	2020/10/05 09:53:01	1.385
--- src/usr.bin/tmux/tty.c	2020/11/09 10:54:28	1.386
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.385 2020/10/05 09:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.386 2020/11/09 10:54:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 694,721 ****
  	}
  	if ((changed & ALL_MOUSE_MODES) &&
  	    tty_term_has(tty->term, TTYC_KMOUS)) {
! 		if ((mode & ALL_MOUSE_MODES) == 0)
  			tty_puts(tty, "\033[?1006l");
! 		if ((changed & MODE_MOUSE_STANDARD) &&
! 		    (~mode & MODE_MOUSE_STANDARD))
  			tty_puts(tty, "\033[?1000l");
! 		if ((changed & MODE_MOUSE_BUTTON) &&
! 		    (~mode & MODE_MOUSE_BUTTON))
  			tty_puts(tty, "\033[?1002l");
! 		if ((changed & MODE_MOUSE_ALL) &&
! 		    (~mode & MODE_MOUSE_ALL))
  			tty_puts(tty, "\033[?1003l");
- 
  		if (mode & ALL_MOUSE_MODES)
  			tty_puts(tty, "\033[?1006h");
! 		if ((changed & MODE_MOUSE_STANDARD) &&
! 		    (mode & MODE_MOUSE_STANDARD))
  			tty_puts(tty, "\033[?1000h");
! 		if ((changed & MODE_MOUSE_BUTTON) &&
! 		    (mode & MODE_MOUSE_BUTTON))
  			tty_puts(tty, "\033[?1002h");
! 		if ((changed & MODE_MOUSE_ALL) &&
! 		    (mode & MODE_MOUSE_ALL))
  			tty_puts(tty, "\033[?1003h");
  	}
  	if (changed & MODE_BRACKETPASTE) {
--- 694,719 ----
  	}
  	if ((changed & ALL_MOUSE_MODES) &&
  	    tty_term_has(tty->term, TTYC_KMOUS)) {
! 		/*
! 		 * If the mouse modes have changed, clear any that are set and
! 		 * apply again. There are differences in how terminals track
! 		 * the various bits.
! 		 */
! 		if (tty->mode & MODE_MOUSE_SGR)
  			tty_puts(tty, "\033[?1006l");
! 		if (tty->mode & MODE_MOUSE_STANDARD)
  			tty_puts(tty, "\033[?1000l");
! 		if (tty->mode & MODE_MOUSE_BUTTON)
  			tty_puts(tty, "\033[?1002l");
! 		if (tty->mode & MODE_MOUSE_ALL)
  			tty_puts(tty, "\033[?1003l");
  		if (mode & ALL_MOUSE_MODES)
  			tty_puts(tty, "\033[?1006h");
! 		if (mode & MODE_MOUSE_STANDARD)
  			tty_puts(tty, "\033[?1000h");
! 		if (mode & MODE_MOUSE_BUTTON)
  			tty_puts(tty, "\033[?1002h");
! 		if (mode & MODE_MOUSE_ALL)
  			tty_puts(tty, "\033[?1003h");
  	}
  	if (changed & MODE_BRACKETPASTE) {