Tidy up mode-mouse check.

noahccoker · Nov 5, 2014 · 79f5282 · 79f5282
1 parent d24c9d7
commit 79f5282
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
@@ -49,7 +49,6 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct session		*s;
 	struct paste_buffer	*pb;
 	const char		*sepstr, *bufname;
-	int			 pflag;
 
 	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
 		return (CMD_RETURN_ERROR);
@@ -76,8 +75,7 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			else
 				sepstr = "\r";
 		}
-		pflag = (wp->screen->mode & MODE_BRACKETPASTE);
-		paste_send_pane(pb, wp, sepstr, args_has(args, 'p') && pflag);
+		paste_send_pane(pb, wp, sepstr, args_has(args, 'p'));
 	}
 
 	/* Delete the buffer if -d. */

diff --git a/input-keys.c b/input-keys.c
@@ -205,6 +205,7 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m)
 	char			 buf[40];
 	size_t			 len;
 	struct paste_buffer	*pb;
+	int			 event;
 
 	if (wp->screen->mode & ALL_MOUSE_MODES) {
 		/*
@@ -238,19 +239,16 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m)
 		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);
 	}
 }
diff --git a/paste.c b/paste.c
@@ -301,7 +301,7 @@ paste_send_pane(struct paste_buffer *pb, struct window_pane *wp,
 	if (wp->flags & PANE_INPUTOFF)
 		return;
 
-	if (bracket)
+	if (bracket && (wp->screen->mode & MODE_BRACKETPASTE))
 		bufferevent_write(wp->event, "\033[200~", 6);
 
 	seplen = strlen(sep);
@@ -315,6 +315,6 @@ paste_send_pane(struct paste_buffer *pb, struct window_pane *wp,
 	if (end != data)
 		bufferevent_write(wp->event, data, end - data);
 
-	if (bracket)
+	if (bracket && (wp->screen->mode & MODE_BRACKETPASTE))
 		bufferevent_write(wp->event, "\033[201~", 6);
 }