diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
commit | c310212d28947f35595d945936e04148a39246d8 (patch) | |
tree | 93447903c46b28e0bafe6fa234dc245d72bd00a0 /server-client.c | |
parent | 94d99d54629b182a4266d918ccf80e4daee4567b (diff) | |
parent | 9120df33efdbaac82c152ed3d5995e2be7a70411 (diff) | |
download | rtmux-c310212d28947f35595d945936e04148a39246d8.tar.gz rtmux-c310212d28947f35595d945936e04148a39246d8.tar.bz2 rtmux-c310212d28947f35595d945936e04148a39246d8.zip |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'server-client.c')
-rw-r--r-- | server-client.c | 4 |
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 */ |