aboutsummaryrefslogtreecommitdiff
path: root/tty.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-01-21 23:56:53 +0000
committerTiago Cunha <tcunha@gmx.com>2011-01-21 23:56:53 +0000
commit1930181b185134c192d8939a72f86980dca2cb2d (patch)
tree7ea0753ef9917061edc7fc5dc722bfc2b829d380 /tty.c
parent332bfbf27330a87c1a7f2bc974032cf18a058328 (diff)
downloadrtmux-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).
Diffstat (limited to 'tty.c')
-rw-r--r--tty.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tty.c b/tty.c
index c93e0f7d..a4ca686f 100644
--- a/tty.c
+++ b/tty.c
@@ -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");
}