===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input-keys.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/usr.bin/tmux/input-keys.c	2014/07/21 20:45:35	1.39
+++ src/usr.bin/tmux/input-keys.c	2014/11/05 23:25:02	1.40
@@ -1,4 +1,4 @@
-/* $OpenBSD: input-keys.c,v 1.39 2014/07/21 20:45:35 nicm Exp $ */
+/* $OpenBSD: input-keys.c,v 1.40 2014/11/05 23:25:02 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -205,6 +205,7 @@
 	char			 buf[40];
 	size_t			 len;
 	struct paste_buffer	*pb;
+	int			 event;
 
 	if (wp->screen->mode & ALL_MOUSE_MODES) {
 		/*
@@ -238,19 +239,16 @@
 		return;
 	}
 
-	if (m->button == 1 && (m->event & MOUSE_EVENT_CLICK) &&
-	    options_get_number(&wp->window->options, "mode-mouse") == 1) {
+	if (options_get_number(&wp->window->options, "mode-mouse") != 1)
+		return;
+	event = m->event & (MOUSE_EVENT_CLICK|MOUSE_EVENT_WHEEL);
+	if (wp->mode == NULL && m->button == 1 && event == MOUSE_EVENT_CLICK) {
 		pb = paste_get_top();
-		if (pb != NULL) {
-			paste_send_pane(pb, wp, "\r",
-			    wp->screen->mode & MODE_BRACKETPASTE);
-		}
-	} else if (m->button != 1 &&
-	    options_get_number(&wp->window->options, "mode-mouse") == 1) {
-		if (window_pane_set_mode(wp, &window_copy_mode) == 0) {
-			window_copy_init_from_pane(wp);
-			if (wp->mode->mouse != NULL)
-				wp->mode->mouse(wp, s, m);
-		}
+		if (pb != NULL)
+			paste_send_pane(pb, wp, "\r", 1);
+	} else if (window_pane_set_mode(wp, &window_copy_mode) == 0) {
+		window_copy_init_from_pane(wp);
+		if (wp->mode->mouse != NULL)
+			wp->mode->mouse(wp, s, m);
 	}
 }