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

Cleanup ncurses string writing code

Browse Source
This commit is contained in:
Maxime Coste 2015-09-23 00:40:09 +01:00
parent 20f744bd53
commit eed3e5459d
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ncurses_ui.cc
View File

@ -334,11 +334,9 @@ void NCursesUI::refresh()
m_dirty = false; m_dirty = false;
} }
using Utf8Policy = utf8::InvalidPolicy::Pass; void add_str(WINDOW* win, StringView str)
using Utf8Iterator = utf8::iterator<const char*, Utf8Policy>;
void addutf8str(WINDOW* win, Utf8Iterator begin, Utf8Iterator end)
{ {
waddnstr(win, begin.base(), end.base() - begin.base()); waddnstr(win, str.begin(), (int)str.length());
} }
void NCursesUI::draw_line(const DisplayLine& line, CharCount col_index, void NCursesUI::draw_line(const DisplayLine& line, CharCount col_index,
@ -352,20 +350,18 @@ void NCursesUI::draw_line(const DisplayLine& line, CharCount col_index,
if (content.empty()) if (content.empty())
continue; continue;
if (content[content.length()-1] == '\n' and const auto remaining_columns = m_dimensions.column - col_index;
content.char_length() - 1 < m_dimensions.column - col_index) if (content.back() == '\n' and
content.char_length() - 1 < remaining_columns)
{ {
addutf8str(m_window, Utf8Iterator{content.begin()}, add_str(m_window, content.substr(0, content.length()-1));
Utf8Iterator{content.end()}-1);
waddch(m_window, ' '); waddch(m_window, ' ');
} }
else else
{ {
Utf8Iterator begin{content.begin()}, end{content.end()}; content = content.substr(0_char, remaining_columns);
if (end - begin > m_dimensions.column - col_index) add_str(m_window, content);
end = begin + (m_dimensions.column - col_index); col_index += content.char_length();
addutf8str(m_window, begin, end);
col_index += end - begin;
} }
} }
} }
@ -628,12 +624,10 @@ void NCursesUI::draw_menu()
if (item_idx == m_selected_item) if (item_idx == m_selected_item)
wattron(m_menu.win, COLOR_PAIR(menu_fg)); wattron(m_menu.win, COLOR_PAIR(menu_fg));
StringView item = m_items[item_idx]; StringView item = m_items[item_idx].substr(0_char, column_width);
auto begin = item.begin(); add_str(m_menu.win, item);
auto end = utf8::advance(begin, item.end(), column_width); const CharCount pad = column_width - item.char_length();
addutf8str(m_menu.win, begin, end); add_str(m_menu.win, String{' ' COMMA pad});
const CharCount pad = column_width - utf8::distance(begin, end);
waddstr(m_menu.win, String{' ' COMMA pad}.c_str());
wattron(m_menu.win, COLOR_PAIR(menu_bg)); wattron(m_menu.win, COLOR_PAIR(menu_bg));
} }
const bool is_mark = line >= mark_line and const bool is_mark = line >= mark_line and
@ -641,7 +635,7 @@ void NCursesUI::draw_menu()
wclrtoeol(m_menu.win); wclrtoeol(m_menu.win);
wmove(m_menu.win, (int)line, (int)m_menu.size.column - 1); wmove(m_menu.win, (int)line, (int)m_menu.size.column - 1);
wattron(m_menu.win, COLOR_PAIR(menu_bg)); wattron(m_menu.win, COLOR_PAIR(menu_bg));
waddstr(m_menu.win, is_mark ? "█" : "░"); add_str(m_menu.win, is_mark ? "█" : "░");
} }
m_dirty = true; m_dirty = true;
} }
@ -727,6 +721,8 @@ void NCursesUI::menu_hide()
static CharCoord compute_needed_size(StringView str) static CharCoord compute_needed_size(StringView str)
{ {
using Utf8Iterator = utf8::iterator<const char*, utf8::InvalidPolicy::Pass>;
CharCoord res{1,0}; CharCoord res{1,0};
CharCount line_len = 0; CharCount line_len = 0;
for (Utf8Iterator begin{str.begin()}, end{str.end()}; for (Utf8Iterator begin{str.begin()}, end{str.end()};
@ -894,7 +890,7 @@ void NCursesUI::info_show(StringView title, StringView content,
{ {
wmove(m_info.win, line++, 0); wmove(m_info.win, line++, 0);
auto eol = std::find_if(it, end, [](char c) { return c == '\n'; }); auto eol = std::find_if(it, end, [](char c) { return c == '\n'; });
addutf8str(m_info.win, Utf8Iterator(it), Utf8Iterator(eol)); add_str(m_info.win, {it, eol});
if (eol == end) if (eol == end)
break; break;
it = eol + 1; it = eol + 1;