diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-04-25 20:33:42 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-04-25 20:33:42 +0000 |
| commit | 215ee46106bd8d5324cab659d74abeeee1127224 (patch) | |
| tree | a5adf1cb2a31c2438b5a044f7bc0e81c76916fa5 /server-client.c | |
| parent | d5150484d1ff6be13e4c4c5c399d44b0054755fa (diff) | |
| download | rtmux-215ee46106bd8d5324cab659d74abeeee1127224.tar.gz rtmux-215ee46106bd8d5324cab659d74abeeee1127224.tar.bz2 rtmux-215ee46106bd8d5324cab659d74abeeee1127224.zip | |
Sync OpenBSD patchset 896:
When mode-mouse is on (it is off by default), automatically enter copy
mode when the mouse is dragged or the mouse wheel is used. Also exit
copy mode when the mouse wheel is scrolled off the bottom. Discussed
with and written by hsim at gmx dot li.
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/server-client.c b/server-client.c index f29dd314..1e567152 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $Id: server-client.c,v 1.56 2011-04-18 21:07:58 nicm Exp $ */ +/* $Id: server-client.c,v 1.57 2011-04-25 20:33:42 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -313,7 +313,13 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data) if (key == KEYC_MOUSE) { if (c->flags & CLIENT_READONLY) return; - if (options_get_number(oo, "mouse-select-pane")) { + if (options_get_number(oo, "mouse-select-pane") && + ((!(mouse->b & MOUSE_DRAG) && mouse->b != MOUSE_UP) || + wp->mode != &window_copy_mode)) { + /* + * Allow pane switching in copy mode only by mouse down + * (click). + */ window_set_active_at(w, mouse->x, mouse->y); server_redraw_window_borders(w); wp = w->active; @@ -444,6 +450,7 @@ server_client_reset_state(struct client *c) struct window_pane *wp = w->active; struct screen *s = wp->screen; struct options *oo = &c->session->options; + struct options *wo = &w->options; int status, mode; tty_region(&c->tty, 0, c->tty.sy - 1); @@ -459,14 +466,15 @@ server_client_reset_state(struct client *c) * none. */ mode = s->mode; - if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL && - options_get_number(oo, "mouse-select-pane") && - (mode & ALL_MOUSE_MODES) == 0) - mode |= MODE_MOUSE_STANDARD; - - if (options_get_number(oo, "mouse-select-window") && - (mode & ALL_MOUSE_MODES) == 0) - mode |= MODE_MOUSE_STANDARD; + if ((mode & ALL_MOUSE_MODES) == 0) { + if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL && + options_get_number(oo, "mouse-select-pane") == 0) + mode |= MODE_MOUSE_STANDARD; + else if (options_get_number(oo, "mouse-select-window")) + mode |= MODE_MOUSE_STANDARD; + else if (options_get_number(wo, "mode-mouse")) + mode |= MODE_MOUSE_STANDARD; + } /* * Set UTF-8 mouse input if required. If the terminal is UTF-8, the |