From 72acb0177dfa97de749b148597b31c9044b5bbda Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 27 May 2017 06:18:39 +0100 Subject: [PATCH] Parse meta as 8 bit in Normal mode to fix the terminals using that The solution is a bit hackish, as we only consider the 8th bit to mean alt in normal mode, because its unlikely accentuated characters are going to be mapped there. It fixes using Alt on xterm, and probably on iterm2 as well (not requiring the meta-sends-esc config change anymore) --- src/input_handler.cc | 9 +++++++++ src/ncurses_ui.cc | 1 + 2 files changed, 10 insertions(+) diff --git a/src/input_handler.cc b/src/input_handler.cc index 51c88b57..8c0a7618 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -202,6 +202,15 @@ public: { ScopedSetBool set_in_on_key{m_in_on_key}; + // Hack to parse keys sent by terminals using the 8th bit to mark the + // meta key. In normal mode, give priority to a potential alt-key than + // the accentuated character. + if (key.key >= 127 and key.key < 256) + { + key.modifiers |= Key::Modifiers::Alt; + key.key &= 0x7f; + } + bool do_restore_hooks = false; auto restore_hooks = on_scope_end([&, this]{ if (m_hooks_disabled and enabled() and do_restore_hooks) diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc index 974a2b68..d06258bf 100644 --- a/src/ncurses_ui.cc +++ b/src/ncurses_ui.cc @@ -485,6 +485,7 @@ void NCursesUI::check_resize(bool force) m_window = (NCursesWin*)newpad(ws.ws_row, ws.ws_col); intrflush(m_window, false); keypad(m_window, true); + meta(m_window, true); m_dimensions = DisplayCoord{ws.ws_row-1, ws.ws_col};