xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slight code refactor in InputHandler::handle_key

Browse Source
This commit is contained in:
Maxime Coste 2018-01-15 10:25:58 +11:00
parent e74b581b0a
commit b4f8497f8d
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/input_handler.cc
View File

@ -1543,41 +1543,40 @@ static bool is_valid(Key key)
void InputHandler::handle_key(Key key) void InputHandler::handle_key(Key key)
{ {
if (is_valid(key)) if (not is_valid(key))
return;
const bool was_recording = is_recording();
++m_handle_key_level;
auto dec = on_scope_end([this]{ --m_handle_key_level; });
auto process_key = [&](Key key) {
if (m_last_insert.recording)
m_last_insert.keys.push_back(key);
current_mode().handle_key(key);
};
const auto keymap_mode = current_mode().keymap_mode();
KeymapManager& keymaps = m_context.keymaps();
if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled())
{ {
const bool was_recording = is_recording(); ScopedSetBool disable_history{context().history_disabled()};
++m_handle_key_level; for (auto& k : keymaps.get_mapping(key, keymap_mode).keys)
auto dec = on_scope_end([this]{ --m_handle_key_level; }); process_key(k);
}
else
process_key(key);
auto process_key = [&](Key key) { // do not record the key that made us enter or leave recording mode,
if (m_last_insert.recording) // and the ones that are triggered recursively by previous keys.
m_last_insert.keys.push_back(key); if (was_recording and is_recording() and m_handle_key_level == m_recording_level)
current_mode().handle_key(key); m_recorded_keys += key_to_str(key);
};
auto keymap_mode = current_mode().keymap_mode(); if (m_handle_key_level < m_recording_level)
KeymapManager& keymaps = m_context.keymaps(); {
if (keymaps.is_mapped(key, keymap_mode) and write_to_debug_buffer("Macro recording started but not finished");
not m_context.keymaps_disabled()) m_recording_reg = 0;
{ m_recording_level = -1;
ScopedSetBool disable_history{context().history_disabled()};
for (auto& k : keymaps.get_mapping(key, keymap_mode).keys)
process_key(k);
}
else
process_key(key);
// do not record the key that made us enter or leave recording mode,
// and the ones that are triggered recursively by previous keys.
if (was_recording and is_recording() and m_handle_key_level == m_recording_level)
m_recorded_keys += key_to_str(key);
if (m_handle_key_level < m_recording_level)
{
write_to_debug_buffer("Macro recording started but not finished");
m_recording_reg = 0;
m_recording_level = -1;
}
} }
} }