From 111732005a58d991df3555ad3b349952bf6f24f7 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Fri, 13 Nov 2015 13:52:54 +0000 Subject: [PATCH] Support to insert raw value in insert/prompt mode --- src/input_handler.cc | 49 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/src/input_handler.cc b/src/input_handler.cc index b7b21845..80178984 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -412,11 +412,14 @@ public: else if (key == ctrlalt('e')) to_next_word_end(m_cursor_pos, m_line); else if (auto cp = key.codepoint()) - { - m_line = m_line.substr(0, m_cursor_pos) + codepoint_to_str(*cp) - + m_line.substr(m_cursor_pos); - ++m_cursor_pos; - } + insert(*cp); + } + + void insert(Codepoint cp) + { + m_line = m_line.substr(0, m_cursor_pos) + codepoint_to_str(cp) + + m_line.substr(m_cursor_pos); + ++m_cursor_pos; } void insert(StringView str) @@ -626,6 +629,17 @@ String common_prefix(ConstArrayView strings) return res; } +static Optional get_raw_codepoint(Key key) +{ + if (auto cp = key.codepoint()) + return cp; + else if (key.modifiers == Key::Modifiers::Control and + ((key.key >= '@' and key.key <= '_') or + (key.key >= 'a' and key.key <= 'z'))) + return {(Codepoint)(to_upper((char)key.key) - '@')}; + return {}; +} + class Prompt : public InputMode { public: @@ -688,6 +702,18 @@ public: }, "Enter register name", register_doc); return; } + else if (key == ctrl('v')) + { + on_next_key_with_autoinfo(context(), KeymapMode::None, + [this](Key key, Context&) { + if (auto cp = get_raw_codepoint(key)) + { + m_line_editor.insert(*cp); + display(); + m_callback(m_line_editor.line(), PromptEvent::Change, context()); + } + }, "raw insert", "enter key to insert"); + } else if (key == Key::Up or key == ctrl('p')) { if (m_history_it != history.begin()) @@ -1100,6 +1126,19 @@ public: } else if (key == ctrl('u')) context().buffer().commit_undo_group(); + else if (key == ctrl('v')) + { + on_next_key_with_autoinfo(context(), KeymapMode::None, + [this](Key key, Context&) { + if (auto cp = get_raw_codepoint(key)) + { + insert(*cp); + context().hooks().run_hook("InsertKey", key_to_str(key), context()); + m_idle_timer.set_next_date(Clock::now() + idle_timeout); + } + }, "raw insert", "enter key to insert"); + update_completions = false; + } else if (key == alt(';')) { push_mode(new Normal(context().input_handler(), true));