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

ncurses: fix unicode handling in status line

Browse Source
This commit is contained in:
Maxime Coste 2013-03-06 19:03:58 +01:00
parent 5ff22d44be
commit a10bfed9e5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ncurses.cc
View File

@ -297,15 +297,20 @@ void NCursesUI::draw_status()
addutf8str(stdscr, m_status_line.begin(), m_status_line.end()); addutf8str(stdscr, m_status_line.begin(), m_status_line.end());
else else
{ {
auto cursor_it = utf8::advance(m_status_line.begin(), m_status_line.end(), Utf8Iterator begin{m_status_line.begin()};
(int)m_status_cursor); Utf8Iterator end{m_status_line.end()};
auto end = m_status_line.end(); Utf8Iterator cursor_it{begin};
cursor_it.advance(m_status_cursor, end);
addutf8str(stdscr, m_status_line.begin(), cursor_it); addutf8str(stdscr, m_status_line.begin(), cursor_it);
set_attribute(A_REVERSE, 1); set_attribute(A_REVERSE, 1);
addch((cursor_it == end) ? ' ' : utf8::codepoint<Utf8Policy>(cursor_it)); if (cursor_it == end)
addch(' ');
else
addutf8str(stdscr, cursor_it, cursor_it+1);
set_attribute(A_REVERSE, 0); set_attribute(A_REVERSE, 0);
if (cursor_it != end) if (cursor_it != end)
addutf8str(stdscr, utf8::next(cursor_it), end); addutf8str(stdscr, cursor_it+1, end);
} }
} }