From 484e32bc8e44e32e7b4b24db1f415cda28bc768b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 7 May 2017 21:26:00 +0000 Subject: Up to now, tmux sees \033\033[OA as M-Up and since we turned on xterm-keys by default, generates \033[1;3A instead of \033\033[OA. Unfortunately this confuses vi, which doesn't understand xterm keys and now sees Escape+Up pressed within escape-time as Escape followed by A. The issue doesn't happen in xterm itself because it gets the keys from X and can distinguish between a genuine M-Up and Escape+Up. Because xterm can, tmux can too: xterm will give us \033[1;3A (that is, kUP3) for a real M-Up and \033\033OA for Escape+Up - in fact, we can be sure any \033 preceding an xterm key is a real Escape key press because Meta would be part of the xterm key instead of a separate \033. So change tmux to recognise both sequences as M-Up for its own purposes, but generate the xterm version of M-Up only if it originally received the xterm version from the terminal. This means we will return to sending \033\033OA instead of the xterm key for terminals that do not support xterm keys themselves, but there is no practical way around this because they do not allow us to distinguish between Escape+Up and M-Up. xterm style escape sequences are now the de facto standard for these keys in any case. Problem reported by jsing@ and subsequently by Cecile Tonglet in GitHub issue 907. --- usr.bin/tmux/input-keys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr.bin/tmux/input-keys.c') diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c index 91a2af9efe8..284fddbeb25 100644 --- a/usr.bin/tmux/input-keys.c +++ b/usr.bin/tmux/input-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input-keys.c,v 1.59 2017/02/01 09:55:07 nicm Exp $ */ +/* $OpenBSD: input-keys.c,v 1.60 2017/05/07 21:25:59 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -201,6 +201,7 @@ input_key(struct window_pane *wp, key_code key, struct mouse_event *m) return; } } + key &= ~KEYC_XTERM; /* Otherwise look the key up in the table. */ for (i = 0; i < nitems(input_keys); i++) { -- cgit v1.2.3