diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands.cc | 21 | ||||
| -rw-r--r-- | src/input_handler.cc | 5 | ||||
| -rw-r--r-- | src/keymap_manager.cc | 4 | ||||
| -rw-r--r-- | src/keymap_manager.hh | 4 | ||||
| -rw-r--r-- | src/normal.cc | 1 |
5 files changed, 25 insertions, 10 deletions
diff --git a/src/commands.cc b/src/commands.cc index 4d659acd..84fe8361 100644 --- a/src/commands.cc +++ b/src/commands.cc @@ -1933,10 +1933,15 @@ const CommandDesc unmap_key_cmd = { if (key.size() != 1) throw runtime_error("only a single key can be unmapped"); - if (keymaps.is_mapped(key[0], keymap_mode) and - (parser.positional_count() < 4 or - (keymaps.get_mapping(key[0], keymap_mode).keys == - parse_keys(parser[3])))) + if (not keymaps.is_mapped(key[0], keymap_mode)) + return; + auto& mapping = keymaps.get_mapping(key[0], keymap_mode); + + if (mapping.is_executing) + throw runtime_error("cannot unmap key that is currently executing"); + + if (parser.positional_count() < 4 or + (mapping.keys == parse_keys(parser[3]))) keymaps.unmap_key(key[0], keymap_mode); } }; @@ -2653,8 +2658,12 @@ void enter_user_mode(Context& context, String mode_name, KeymapMode mode, bool l InputHandler::ScopedForceNormal force_normal{context.input_handler(), {}}; ScopedEdition edition(context); - for (auto& key : mapping.keys) - context.input_handler().handle_key(key); + + { + ScopedSetBool executing_mapping{mapping.is_executing}; + for (auto& key : mapping.keys) + context.input_handler().handle_key(key); + } if (lock) enter_user_mode(context, std::move(mode_name), mode, true); diff --git a/src/input_handler.cc b/src/input_handler.cc index 129a7e03..fb1d9ff6 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -1773,7 +1773,10 @@ void InputHandler::handle_key(Key key) if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled()) { ScopedSetBool disable_history{context().history_disabled()}; - for (auto& k : keymaps.get_mapping(key, keymap_mode).keys) + + auto& mapping = keymaps.get_mapping(key, keymap_mode); + ScopedSetBool executing_mapping{mapping.is_executing}; + for (auto& k : mapping.keys) process_key(k); } else diff --git a/src/keymap_manager.cc b/src/keymap_manager.cc index 582a271d..baec1373 100644 --- a/src/keymap_manager.cc +++ b/src/keymap_manager.cc @@ -40,8 +40,8 @@ bool KeymapManager::is_mapped(Key key, KeymapMode mode) const (m_parent and m_parent->is_mapped(key, mode)); } -const KeymapManager::KeymapInfo& -KeymapManager::get_mapping(Key key, KeymapMode mode) const +KeymapManager::KeymapInfo& +KeymapManager::get_mapping(Key key, KeymapMode mode) { auto it = m_mapping.find(KeyAndMode{key, mode}); if (it != m_mapping.end()) diff --git a/src/keymap_manager.hh b/src/keymap_manager.hh index 7474ed95..ddb374e4 100644 --- a/src/keymap_manager.hh +++ b/src/keymap_manager.hh @@ -6,6 +6,7 @@ #include "hash.hh" #include "string.hh" #include "hash_map.hh" +#include "utils.hh" #include "vector.hh" namespace Kakoune @@ -42,8 +43,9 @@ public: { KeyList keys; String docstring; + NestedBool is_executing{}; }; - const KeymapInfo& get_mapping(Key key, KeymapMode mode) const; + KeymapInfo& get_mapping(Key key, KeymapMode mode); using UserModeList = Vector<String>; UserModeList& user_modes() { diff --git a/src/normal.cc b/src/normal.cc index f1123ca7..87bf272a 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -2033,6 +2033,7 @@ void exec_user_mappings(Context& context, NormalParams params) ScopedEdition edition(context); ScopedSelectionEdition selection_edition{context}; + ScopedSetBool executing_mapping{mapping.is_executing}; for (auto& key : mapping.keys) context.input_handler().handle_key(key); }, "user mapping", |