===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -c -r1.152 -r1.153
*** src/usr.bin/tmux/tty.c	2013/03/22 10:31:22	1.152
--- src/usr.bin/tmux/tty.c	2013/03/22 10:33:50	1.153
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.152 2013/03/22 10:31:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.153 2013/03/22 10:33:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 218,224 ****
  
  	tty_putcode(tty, TTYC_CNORM);
  	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_puts(tty, "\033[?1000l");
  
  	if (tty_term_has(tty->term, TTYC_XT))
  		tty_puts(tty, "\033[c\033[>4;1m");
--- 218,224 ----
  
  	tty_putcode(tty, TTYC_CNORM);
  	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
  
  	if (tty_term_has(tty->term, TTYC_XT))
  		tty_puts(tty, "\033[c\033[>4;1m");
***************
*** 281,287 ****
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
  	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_raw(tty, "\033[?1000l");
  
  	if (tty_term_has(tty->term, TTYC_XT))
  		tty_puts(tty, "\033[>4m");
--- 281,287 ----
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
  	if (tty_term_has(tty->term, TTYC_KMOUS))
! 		tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
  
  	if (tty_term_has(tty->term, TTYC_XT))
  		tty_puts(tty, "\033[>4m");
***************
*** 491,498 ****
--- 491,507 ----
  	}
  	if (changed & ALL_MOUSE_MODES) {
  		if (mode & ALL_MOUSE_MODES) {
+ 			/*
+ 			 * Enable the UTF-8 (1005) extension if configured to.
+ 			 * Enable the SGR (1006) extension unconditionally, as
+ 			 * this is safe from misinterpretation. Do it in this
+ 			 * order, because in some terminals it's the last one
+ 			 * that takes effect and SGR is the preferred one.
+ 			 */
  			if (mode & MODE_MOUSE_UTF8)
  				tty_puts(tty, "\033[?1005h");
+ 			tty_puts(tty, "\033[?1006h");
+ 
  			if (mode & MODE_MOUSE_ANY)
  				tty_puts(tty, "\033[?1003h");
  			else if (mode & MODE_MOUSE_BUTTON)
***************
*** 506,511 ****
--- 515,522 ----
  				tty_puts(tty, "\033[?1002l");
  			else if (tty->mode & MODE_MOUSE_STANDARD)
  				tty_puts(tty, "\033[?1000l");
+ 
+ 			tty_puts(tty, "\033[?1006l");
  			if (tty->mode & MODE_MOUSE_UTF8)
  				tty_puts(tty, "\033[?1005l");
  		}