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

Fix support for macro being recorded and replay during :exec (non draft)

Browse Source
This commit is contained in:
Maxime Coste 2016-04-13 21:21:49 +01:00
parent b0060ed79e
commit 7833b53272
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input_handler.cc
View File

@ -1395,14 +1395,22 @@ void InputHandler::handle_key(Key key)
// do not record the key that made us enter or leave recording mode, // do not record the key that made us enter or leave recording mode,
// and the ones that are triggered recursively by previous keys. // and the ones that are triggered recursively by previous keys.
if (was_recording and is_recording() and m_handle_key_level == 1) if (was_recording and is_recording() and m_handle_key_level == m_recording_level)
m_recorded_keys += key_to_str(key); 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_handle_key_level = -1;
}
} }
} }
void InputHandler::start_recording(char reg) void InputHandler::start_recording(char reg)
{ {
kak_assert(m_recording_reg == 0); kak_assert(m_recording_reg == 0);
m_recording_level = m_handle_key_level;
m_recorded_keys = ""; m_recorded_keys = "";
m_recording_reg = reg; m_recording_reg = reg;
} }
@ -1417,6 +1425,7 @@ void InputHandler::stop_recording()
kak_assert(m_recording_reg != 0); kak_assert(m_recording_reg != 0);
RegisterManager::instance()[m_recording_reg] = ConstArrayView<String>(m_recorded_keys); RegisterManager::instance()[m_recording_reg] = ConstArrayView<String>(m_recorded_keys);
m_recording_reg = 0; m_recording_reg = 0;
m_recording_level = -1;
} }
DisplayLine InputHandler::mode_line() const DisplayLine InputHandler::mode_line() const

1
src/input_handler.hh
View File

@ -109,6 +109,7 @@ private:
char m_recording_reg = 0; char m_recording_reg = 0;
String m_recorded_keys; String m_recorded_keys;
int m_recording_level = -1;
int m_handle_key_level = 0; int m_handle_key_level = 0;
}; };