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

When displaying a prompt content with line break char, replace them with their unicode control picture

Browse Source
This commit is contained in:
Maxime Coste 2015-10-09 13:55:55 +01:00
parent 256e4d7862
commit 50f5140cbd
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/input_handler.cc
View File

@ -440,6 +440,23 @@ public:
DisplayLine build_display_line(CharCount width) DisplayLine build_display_line(CharCount width)
{ {
auto cleanup = [](StringView str) {
String res;
auto pos = str.begin();
for (auto it = str.begin(), end = str.end(); it != end; ++it)
{
char c = *it;
if (c == '\n' or c == '\r')
{
res += StringView{pos, it};
utf8::dump(std::back_inserter(res), c == '\n' ? 0x2424 : 0x240D);
pos = it+1;
}
}
res += StringView{pos, str.end()};
return res;
};
kak_assert(m_cursor_pos <= m_line.char_length()); kak_assert(m_cursor_pos <= m_line.char_length());
if (m_cursor_pos < m_display_pos) if (m_cursor_pos < m_display_pos)
m_display_pos = m_cursor_pos; m_display_pos = m_cursor_pos;
@ -447,12 +464,12 @@ public:
m_display_pos = m_cursor_pos + 1 - width; m_display_pos = m_cursor_pos + 1 - width;
if (m_cursor_pos == m_line.char_length()) if (m_cursor_pos == m_line.char_length())
return DisplayLine{{ {m_line.substr(m_display_pos, width-1).str(), get_face("StatusLine")}, return DisplayLine{{ { cleanup(m_line.substr(m_display_pos, width-1)), get_face("StatusLine") },
{" "_str, get_face("StatusCursor")} }}; { " "_str, get_face("StatusCursor")} } };
else else
return DisplayLine({ { m_line.substr(m_display_pos, m_cursor_pos - m_display_pos).str(), get_face("StatusLine") }, return DisplayLine({ { cleanup(m_line.substr(m_display_pos, m_cursor_pos - m_display_pos)), get_face("StatusLine") },
{ m_line.substr(m_cursor_pos,1).str(), get_face("StatusCursor") }, { cleanup(m_line.substr(m_cursor_pos,1)), get_face("StatusCursor") },
{ m_line.substr(m_cursor_pos+1, width - m_cursor_pos + m_display_pos - 1).str(), get_face("StatusLine") } }); { cleanup(m_line.substr(m_cursor_pos+1, width - m_cursor_pos + m_display_pos - 1)), get_face("StatusLine") } });
} }
private: private:
CharCount m_cursor_pos = 0; CharCount m_cursor_pos = 0;