diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2013-07-23 19:11:26 +0100 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2013-07-24 01:33:12 +0200 |
| commit | c7e52a650ddaf90309f9fd46de1b6e01c30fc2df (patch) | |
| tree | 641bd49c06dde3ee75c9399b6aa232c94c55c97c /src/input_handler.cc | |
| parent | 486ebed098a687bb58b4740db14eaf77f51ef874 (diff) | |
DisplayLine no longer map to a single buffer line, but to a buffer range
Diffstat (limited to 'src/input_handler.cc')
| -rw-r--r-- | src/input_handler.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 9e8610c5..bdee3b2b 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -146,12 +146,12 @@ public: { kak_assert(m_cursor_pos <= m_line.char_length()); if (m_cursor_pos == m_line.char_length()) - return DisplayLine{-1, { {m_line, get_color("StatusLine")}, - {" "_str, get_color("StatusCursor")} }}; + return DisplayLine{{ {m_line, get_color("StatusLine")}, + {" "_str, get_color("StatusCursor")} }}; else - return DisplayLine(-1, { DisplayAtom{ m_line.substr(0, m_cursor_pos), get_color("StatusLine") }, - DisplayAtom{ m_line.substr(m_cursor_pos, 1), get_color("StatusCursor") }, - DisplayAtom{ m_line.substr(m_cursor_pos+1), get_color("StatusLine") } }); + return DisplayLine({ { m_line.substr(0, m_cursor_pos), get_color("StatusLine") }, + { m_line.substr(m_cursor_pos, 1), get_color("StatusCursor") }, + { m_line.substr(m_cursor_pos+1), get_color("StatusLine") } }); } private: CharCount m_cursor_pos = 0; @@ -181,7 +181,7 @@ public: if (key == Key(Key::Modifiers::Control, 'm')) { context().ui().menu_hide(); - context().ui().print_status(DisplayLine{ -1 }); + context().ui().print_status(DisplayLine{}); reset_normal_mode(); int selected = m_selected - m_choices.begin(); m_callback(selected, MenuEvent::Validate, context()); @@ -194,7 +194,7 @@ public: m_edit_filter = false; m_filter = boost::regex(".*"); m_filter_editor.reset(""); - context().ui().print_status(DisplayLine{ -1 }); + context().ui().print_status(DisplayLine{}); } else { @@ -319,7 +319,7 @@ public: history.erase(it); history.push_back(line); } - context().ui().print_status(DisplayLine{ -1 }); + context().ui().print_status(DisplayLine{}); context().ui().menu_hide(); reset_normal_mode(); // call callback after reset_normal_mode so that callback @@ -329,7 +329,7 @@ public: } else if (key == Key::Escape or key == Key { Key::Modifiers::Control, 'c' }) { - context().ui().print_status(DisplayLine{ -1 }); + context().ui().print_status(DisplayLine{}); context().ui().menu_hide(); reset_normal_mode(); m_callback(line, PromptEvent::Abort, context()); |