diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-01-21 23:56:53 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-01-21 23:56:53 +0000 |
| commit | 1930181b185134c192d8939a72f86980dca2cb2d (patch) | |
| tree | 7ea0753ef9917061edc7fc5dc722bfc2b829d380 | |
| parent | 332bfbf27330a87c1a7f2bc974032cf18a058328 (diff) | |
| download | rtmux-1930181b185134c192d8939a72f86980dca2cb2d.tar.gz rtmux-1930181b185134c192d8939a72f86980dca2cb2d.tar.bz2 rtmux-1930181b185134c192d8939a72f86980dca2cb2d.zip | |
Sync OpenBSD patchset 846:
Only set a mouse mode for mouse-select-pane if none already set by the
mode (any will do).
| -rw-r--r-- | server-client.c | 9 | ||||
| -rw-r--r-- | tty.c | 18 |
2 files changed, 16 insertions, 11 deletions
diff --git a/server-client.c b/server-client.c index a69d3b23..93ba0fe9 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $Id: server-client.c,v 1.52 2011-01-21 23:44:13 tcunha Exp $ */ +/* $Id: server-client.c,v 1.53 2011-01-21 23:56:53 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -448,9 +448,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; /* @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.201 2011-01-21 23:56:11 tcunha Exp $ */ +/* $Id: tty.c,v 1.202 2011-01-21 23:56:53 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -401,19 +401,19 @@ tty_update_mode(struct tty *tty, int mode) if (mode & ALL_MOUSE_MODES) { if (mode & MODE_MOUSE_UTF8) tty_puts(tty, "\033[?1005h"); - if (mode & MODE_MOUSE_STANDARD) - tty_puts(tty, "\033[?1000h"); + if (mode & MODE_MOUSE_ANY) + tty_puts(tty, "\033[?1003h"); else if (mode & MODE_MOUSE_BUTTON) tty_puts(tty, "\033[?1002h"); - else if (mode & MODE_MOUSE_ANY) - tty_puts(tty, "\033[?1003h"); + else if (mode & MODE_MOUSE_STANDARD) + tty_puts(tty, "\033[?1000h"); } else { - if (tty->mode & MODE_MOUSE_STANDARD) - tty_puts(tty, "\033[?1000l"); + if (tty->mode & MODE_MOUSE_ANY) + tty_puts(tty, "\033[?1003l"); else if (tty->mode & MODE_MOUSE_BUTTON) tty_puts(tty, "\033[?1002l"); - else if (tty->mode & MODE_MOUSE_ANY) - tty_puts(tty, "\033[?1003l"); + else if (tty->mode & MODE_MOUSE_STANDARD) + tty_puts(tty, "\033[?1000l"); if (tty->mode & MODE_MOUSE_UTF8) tty_puts(tty, "\033[?1005l"); } |