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

NCurses::draw: maintain current column without using ncurses

Browse Source
This commit is contained in:
Maxime Coste 2012-10-27 15:48:08 +02:00
parent 031ed91ea6
commit b24a80a3ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ncurses.cc
View File

@ -152,6 +152,7 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
{ {
move((int)line_index, 0); move((int)line_index, 0);
clrtoeol(); clrtoeol();
CharCount col_index = 0;
for (const DisplayAtom& atom : line) for (const DisplayAtom& atom : line)
{ {
set_attribute(A_UNDERLINE, atom.attribute & Underline); set_attribute(A_UNDERLINE, atom.attribute & Underline);
@ -162,10 +163,8 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
set_color(atom.fg_color, atom.bg_color); set_color(atom.fg_color, atom.bg_color);
String content = atom.content.content(); String content = atom.content.content();
int y,x;
getyx(stdscr, y,x);
if (content[content.length()-1] == '\n' and if (content[content.length()-1] == '\n' and
content.char_length() - 1 < m_dimensions.column - x) content.char_length() - 1 < m_dimensions.column - col_index)
{ {
addutf8str(Utf8Iterator(content.begin()), Utf8Iterator(content.end())-1); addutf8str(Utf8Iterator(content.begin()), Utf8Iterator(content.end())-1);
addch(' '); addch(' ');
@ -173,9 +172,10 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
else else
{ {
Utf8Iterator begin(content.begin()), end(content.end()); Utf8Iterator begin(content.begin()), end(content.end());
if (end - begin > m_dimensions.column - x) if (end - begin > m_dimensions.column - col_index)
end = begin + m_dimensions.column - x; end = begin + m_dimensions.column - col_index;
addutf8str(begin, end); addutf8str(begin, end);
col_index += end - begin;
} }
} }
++line_index; ++line_index;