===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/mode-tree.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/mode-tree.c	2017/11/02 22:00:42	1.17
--- src/usr.bin/tmux/mode-tree.c	2017/11/03 14:23:44	1.18
***************
*** 1,4 ****
! /* $OpenBSD: mode-tree.c,v 1.17 2017/11/02 22:00:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: mode-tree.c,v 1.18 2017/11/03 14:23:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 726,732 ****
  	int			 choice;
  	key_code		 tmp;
  
! 	if (*key == KEYC_MOUSEDOWN1_PANE) {
  		if (cmd_mouse_at(mtd->wp, m, &x, &y, 0) != 0) {
  			*key = KEYC_NONE;
  			return (0);
--- 726,732 ----
  	int			 choice;
  	key_code		 tmp;
  
! 	if (KEYC_IS_MOUSE(*key)) {
  		if (cmd_mouse_at(mtd->wp, m, &x, &y, 0) != 0) {
  			*key = KEYC_NONE;
  			return (0);
***************
*** 736,743 ****
  			return (0);
  		}
  		if (mtd->offset + y < mtd->line_size) {
! 			mtd->current = mtd->offset + y;
! 			*key = '\r';
  			return (0);
  		}
  	}
--- 736,746 ----
  			return (0);
  		}
  		if (mtd->offset + y < mtd->line_size) {
! 			if (*key == KEYC_MOUSEDOWN1_PANE ||
! 			    *key == KEYC_DOUBLECLICK1_PANE)
! 				mtd->current = mtd->offset + y;
! 			if (*key == KEYC_DOUBLECLICK1_PANE)
! 				*key = '\r';
  			return (0);
  		}
  	}