aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
committerThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
commitca1d78f5230e0c3ab4c3b15fff2597fbdb037b48 (patch)
treea9e33fd328e948a4ef9a57d6cc2fe3d82cbf128c /server-client.c
parentb3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (diff)
parent6daf06b1ad61f67e9f7780d787451b9b5f82dd43 (diff)
downloadrtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.gz
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.bz2
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c
index 3630a672..07ef5697 100644
--- a/server-client.c
+++ b/server-client.c
@@ -323,9 +323,9 @@ server_client_check_mouse(struct client *c, struct window_pane *wp)
else if (statusat > 0 && m->y >= (u_int)statusat)
m->y = statusat - 1;
- /* Is this a pane selection? Allow down only in copy mode. */
+ /* Is this a pane selection? */
if (options_get_number(oo, "mouse-select-pane") &&
- (m->event == MOUSE_EVENT_DOWN || wp->mode != &window_copy_mode)) {
+ (m->event == MOUSE_EVENT_DOWN || m->event == MOUSE_EVENT_WHEEL)) {
window_set_active_at(wp->window, m->x, m->y);
server_redraw_window_borders(wp->window);
wp = wp->window->active; /* may have changed */