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

Fix bug where idle timers of disabled modes were still run

Browse Source
This commit is contained in:
Maxime Coste 2017-05-22 16:56:06 +01:00
parent bc11e52960
commit 28bcb45b92
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/context.cc
View File

@ -148,10 +148,6 @@ void Context::change_buffer(Buffer& buffer)
if (m_edition_level > 0) if (m_edition_level > 0)
this->buffer().commit_undo_group(); this->buffer().commit_undo_group();
if (has_input_handler())
input_handler().reset_normal_mode();
m_window.reset(); m_window.reset();
if (has_client()) if (has_client())
{ {
@ -161,6 +157,9 @@ void Context::change_buffer(Buffer& buffer)
} }
else else
m_selections = SelectionList{buffer, Selection{}}; m_selections = SelectionList{buffer, Selection{}};
if (has_input_handler())
input_handler().reset_normal_mode();
} }
SelectionList& Context::selections() SelectionList& Context::selections()

27
src/input_handler.cc
View File

@ -31,6 +31,8 @@ public:
virtual void on_enabled() {} virtual void on_enabled() {}
virtual void on_disabled() {} virtual void on_disabled() {}
bool enabled() const { return &m_input_handler.current_mode() == this; }
Context& context() const { return m_input_handler.context(); } Context& context() const { return m_input_handler.context(); }
virtual DisplayLine mode_line() const = 0; virtual DisplayLine mode_line() const = 0;
@ -173,13 +175,8 @@ public:
void on_enabled() override void on_enabled() override
{ {
m_enabled = true;
if (context().has_client()) if (context().has_client())
{
context().client().info_hide();
context().client().check_if_buffer_needs_reloading(); context().client().check_if_buffer_needs_reloading();
}
m_fs_check_timer.set_next_date(Clock::now() + get_fs_check_timeout(context())); m_fs_check_timer.set_next_date(Clock::now() + get_fs_check_timeout(context()));
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context())); m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
@ -195,8 +192,6 @@ public:
void on_disabled() override void on_disabled() override
{ {
m_enabled = false;
m_idle_timer.set_next_date(TimePoint::max()); m_idle_timer.set_next_date(TimePoint::max());
m_fs_check_timer.set_next_date(TimePoint::max()); m_fs_check_timer.set_next_date(TimePoint::max());
@ -210,7 +205,7 @@ public:
bool do_restore_hooks = false; bool do_restore_hooks = false;
auto restore_hooks = on_scope_end([&, this]{ auto restore_hooks = on_scope_end([&, this]{
if (m_hooks_disabled and m_enabled and do_restore_hooks) if (m_hooks_disabled and enabled() and do_restore_hooks)
{ {
context().hooks_disabled().unset(); context().hooks_disabled().unset();
m_hooks_disabled = false; m_hooks_disabled = false;
@ -281,7 +276,8 @@ public:
} }
context().hooks().run_hook("NormalKey", key_to_str(key), context()); context().hooks().run_hook("NormalKey", key_to_str(key), context());
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context())); if (enabled()) // The hook might have changed mode
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
DisplayLine mode_line() const override DisplayLine mode_line() const override
@ -307,7 +303,6 @@ private:
NormalParams m_params = { 0, 0 }; NormalParams m_params = { 0, 0 };
bool m_hooks_disabled = false; bool m_hooks_disabled = false;
bool m_enabled = false;
NestedBool m_in_on_key; NestedBool m_in_on_key;
Timer m_idle_timer; Timer m_idle_timer;
Timer m_fs_check_timer; Timer m_fs_check_timer;
@ -865,7 +860,8 @@ public:
display(); display();
m_callback(line, PromptEvent::Change, context()); m_callback(line, PromptEvent::Change, context());
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context())); if (enabled()) // The callback might have disabled us
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
void set_prompt_face(Face face) void set_prompt_face(Face face)
@ -1207,7 +1203,8 @@ public:
{ {
insert(*cp); insert(*cp);
context().hooks().run_hook("InsertKey", key_to_str(key), context()); context().hooks().run_hook("InsertKey", key_to_str(key), context());
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context())); if (enabled())
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
}, "raw insert", "enter key to insert"); }, "raw insert", "enter key to insert");
update_completions = false; update_completions = false;
@ -1219,11 +1216,11 @@ public:
} }
context().hooks().run_hook("InsertKey", key_to_str(key), context()); context().hooks().run_hook("InsertKey", key_to_str(key), context());
if (update_completions)
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
if (moved) if (moved)
context().hooks().run_hook("InsertMove", key_to_str(key), context()); context().hooks().run_hook("InsertMove", key_to_str(key), context());
if (update_completions and enabled()) // Hooks might have disabled us
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
DisplayLine mode_line() const override DisplayLine mode_line() const override