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

Check for buffer external change when entering insert mode

Browse Source
This commit is contained in:
Maxime Coste 2014-01-30 12:01:19 +00:00
parent d2a1c5ce46
commit 938f66badd
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/input_handler.cc
View File

@ -26,7 +26,8 @@ public:
InputMode& operator=(const InputMode&) = delete; InputMode& operator=(const InputMode&) = delete;
virtual void on_key(Key key) = 0; virtual void on_key(Key key) = 0;
virtual void on_replaced() {} virtual void on_enabled() {}
virtual void on_disabled() {}
Context& context() const { return m_input_handler.context(); } Context& context() const { return m_input_handler.context(); }
virtual String description() const = 0; virtual String description() const = 0;
@ -62,11 +63,19 @@ public:
context().client().check_buffer_fs_timestamp(); context().client().check_buffer_fs_timestamp();
timer.set_next_date(Clock::now() + fs_check_timeout); timer.set_next_date(Clock::now() + fs_check_timeout);
}} }}
{}
void on_enabled() override
{ {
if (not context().has_client())
return;
context().client().check_buffer_fs_timestamp();
m_fs_check_timer.set_next_date(Clock::now() + fs_check_timeout);
context().hooks().run_hook("NormalBegin", "", context()); context().hooks().run_hook("NormalBegin", "", context());
} }
void on_replaced() override void on_disabled() override
{ {
context().hooks().run_hook("NormalEnd", "", context()); context().hooks().run_hook("NormalEnd", "", context());
} }
@ -1141,7 +1150,7 @@ private:
buffer.check_invariant(); buffer.check_invariant();
} }
void on_replaced() override void on_disabled() override
{ {
for (auto& sel : context().selections()) for (auto& sel : context().selections())
{ {
@ -1177,9 +1186,10 @@ InputHandler::~InputHandler()
void InputHandler::change_input_mode(InputMode* new_mode) void InputHandler::change_input_mode(InputMode* new_mode)
{ {
m_mode->on_replaced(); m_mode->on_disabled();
m_mode_trash.emplace_back(std::move(m_mode)); m_mode_trash.emplace_back(std::move(m_mode));
m_mode.reset(new_mode); m_mode.reset(new_mode);
new_mode->on_enabled();
} }
void InputHandler::insert(InsertMode mode) void InputHandler::insert(InsertMode mode)