summaryrefslogtreecommitdiff
path: root/src/input_handler.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2021-08-17 20:40:30 +1000
committerMaxime Coste <mawww@kakoune.org>2021-08-17 20:40:30 +1000
commit7187784936edc640d547ad497ef9b644a2483a2e (patch)
treea75399641deeb7c698533bda1c9eb61e2ce05c6a /src/input_handler.cc
parent94388dc51e22770e1a9a79ad310cc3c78443ef36 (diff)
Move control character escaping responsibility to the terminal UI
Fix atom text at display time, allow tabs/eol/etc... in display atoms and escape them just-in-time Fixes #4293
Diffstat (limited to 'src/input_handler.cc')
-rw-r--r--src/input_handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc
index fde468d5..85904e7f 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -575,12 +575,12 @@ public:
const Face cursor_face = m_faces["StatusCursor"];
if (m_cursor_pos == str.char_length())
- return DisplayLine{{ { fix_atom_text(str.substr(m_display_pos, width-1)), line_face },
+ return DisplayLine{{ { str.substr(m_display_pos, width-1).str(), line_face },
{ " "_str, cursor_face} } };
else
- return DisplayLine({ { fix_atom_text(str.substr(m_display_pos, m_cursor_pos - m_display_pos)), line_face },
- { fix_atom_text(str.substr(m_cursor_pos,1)), cursor_face },
- { fix_atom_text(str.substr(m_cursor_pos+1, width - m_cursor_pos + m_display_pos - 1)), line_face } });
+ return DisplayLine({ { str.substr(m_display_pos, m_cursor_pos - m_display_pos).str(), line_face },
+ { str.substr(m_cursor_pos,1).str(), cursor_face },
+ { str.substr(m_cursor_pos+1, width - m_cursor_pos + m_display_pos - 1).str(), line_face } });
}
private:
CharCount m_cursor_pos = 0;