===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input-keys.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** src/usr.bin/tmux/input-keys.c	2015/11/23 20:53:09	1.50
--- src/usr.bin/tmux/input-keys.c	2015/11/23 23:47:57	1.51
***************
*** 1,4 ****
! /* $OpenBSD: input-keys.c,v 1.50 2015/11/23 20:53:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input-keys.c,v 1.51 2015/11/23 23:47:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 243,253 ****
--- 243,259 ----
  	 * is because an old style mouse release event cannot be converted into
  	 * the new SGR format, since the released button is unknown). Otherwise
  	 * pretend that tmux doesn't speak this extension, and fall back to the
+ 	 * UTF-8 (1005) extension if the application requested, or to the
  	 * legacy format.
  	 */
  	if (m->sgr_type != ' ' && (wp->screen->mode & MODE_MOUSE_SGR)) {
  		len = xsnprintf(buf, sizeof buf, "\033[<%u;%u;%u%c",
  		    m->sgr_b, x + 1, y + 1, m->sgr_type);
+ 	} else if (wp->screen->mode & MODE_MOUSE_UTF8) {
+ 		len = xsnprintf(buf, sizeof buf, "\033[M");
+ 		len += utf8_split2(m->b + 32, &buf[len]);
+ 		len += utf8_split2(x + 33, &buf[len]);
+ 		len += utf8_split2(y + 33, &buf[len]);
  	} else {
  		if (m->b > 223)
  			return;