diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2011-01-15 00:46:19 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2011-01-15 00:46:19 +0000 |
| commit | 3de1700f616a60a7c7d15a66b0637012b5cdb00a (patch) | |
| tree | 1a0c618a9431854cd625d17bd3676bb1c57da57f /server-client.c | |
| parent | 8f8e81c0c9a39b2977e3b2737d4825ab00bef52a (diff) | |
Only set a mouse mode for mouse-select-pane if none already set by the
mode (any will do).
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 055f192c..9b83fe13 100644 --- a/server-client.c +++ b/server-client.c @@ -449,9 +449,14 @@ server_client_reset_state(struct client *c) else tty_cursor(&c->tty, wp->xoff + s->cx, wp->yoff + s->cy); + /* + * Any mode will do for mouse-select-pane, but set standard mode if + * none. + */ mode = s->mode; if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL && - options_get_number(oo, "mouse-select-pane")) + options_get_number(oo, "mouse-select-pane") && + (mode & ALL_MOUSE_MODES) == 0) mode |= MODE_MOUSE_STANDARD; /* |