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

Split clearing to end of line out of NCursesUI::Window::draw

Browse Source 
Explicitely clear instead of relying on a brittle heuristic.
This commit is contained in:
Maxime Coste 2019-11-04 21:51:03 +11:00
parent 0f292d343b
commit 6f3124d678
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/ncurses_ui.cc
View File

@ -62,8 +62,14 @@ void NCursesUI::Window::move_cursor(DisplayCoord coord)
wmove(win, (int)coord.line, (int)coord.column); wmove(win, (int)coord.line, (int)coord.column);
} }
void NCursesUI::Window::clear_to_eol(Palette& palette, const Face& face)
{
wbkgdset(win, COLOR_PAIR(palette.get_color_pair(face)));
wclrtoeol(win);
}
void NCursesUI::Window::draw(Palette& palette, ConstArrayView<DisplayAtom> atoms, void NCursesUI::Window::draw(Palette& palette, ConstArrayView<DisplayAtom> atoms,
ColumnCount max_width, const Face& default_face) const Face& default_face)
{ {
auto add_str = [&](StringView str) { waddnstr(win, str.begin(), (int)str.length()); }; auto add_str = [&](StringView str) { waddnstr(win, str.begin(), (int)str.length()); };
@ -93,11 +99,10 @@ void NCursesUI::Window::draw(Palette& palette, ConstArrayView<DisplayAtom> atoms
#endif #endif
}; };
wbkgdset(win, COLOR_PAIR(palette.get_color_pair(default_face)));
ColumnCount column = 0; ColumnCount column = 0;
for (const DisplayAtom& atom : atoms) for (const DisplayAtom& atom : atoms)
{ {
StringView content = atom.content().substr(0_col, max_width - column); StringView content = atom.content();
if (content.empty()) if (content.empty())
continue; continue;
@ -111,8 +116,6 @@ void NCursesUI::Window::draw(Palette& palette, ConstArrayView<DisplayAtom> atoms
add_str(content); add_str(content);
column += content.column_length(); column += content.column_length();
} }
if (column < max_width)
wclrtoeol(win);
} }
constexpr int NCursesUI::default_shift_function_key; constexpr int NCursesUI::default_shift_function_key;
@ -448,7 +451,8 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
for (const DisplayLine& line : display_buffer.lines()) for (const DisplayLine& line : display_buffer.lines())
{ {
m_window.move_cursor(line_index); m_window.move_cursor(line_index);
m_window.draw(m_palette, line.atoms(), dim.column, default_face); m_window.draw(m_palette, line.atoms(), default_face);
m_window.clear_to_eol(m_palette, default_face);
++line_index; ++line_index;
} }
@ -456,7 +460,8 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
while (line_index < dim.line + line_offset) while (line_index < dim.line + line_offset)
{ {
m_window.move_cursor(line_index++); m_window.move_cursor(line_index++);
m_window.draw(m_palette, DisplayAtom("~"), dim.column, face); m_window.draw(m_palette, DisplayAtom("~"), face);
m_window.clear_to_eol(m_palette, face);
} }
m_dirty = true; m_dirty = true;
@ -469,7 +474,8 @@ void NCursesUI::draw_status(const DisplayLine& status_line,
const LineCount status_line_pos = m_status_on_top ? 0 : m_dimensions.line; const LineCount status_line_pos = m_status_on_top ? 0 : m_dimensions.line;
m_window.move_cursor(status_line_pos); m_window.move_cursor(status_line_pos);
m_window.draw(m_palette, status_line.atoms(), m_dimensions.column, default_face); m_window.draw(m_palette, status_line.atoms(), default_face);
m_window.clear_to_eol(m_palette, default_face);
const auto mode_len = mode_line.length(); const auto mode_len = mode_line.length();
m_status_len = status_line.length(); m_status_len = status_line.length();
@ -478,7 +484,7 @@ void NCursesUI::draw_status(const DisplayLine& status_line,
{ {
ColumnCount col = m_dimensions.column - mode_len; ColumnCount col = m_dimensions.column - mode_len;
m_window.move_cursor({status_line_pos, col}); m_window.move_cursor({status_line_pos, col});
m_window.draw(m_palette, mode_line.atoms(), m_dimensions.column - col, default_face); m_window.draw(m_palette, mode_line.atoms(), default_face);
} }
else if (remaining > 2) else if (remaining > 2)
{ {
@ -489,7 +495,7 @@ void NCursesUI::draw_status(const DisplayLine& status_line,
ColumnCount col = m_dimensions.column - remaining + 1; ColumnCount col = m_dimensions.column - remaining + 1;
m_window.move_cursor({status_line_pos, col}); m_window.move_cursor({status_line_pos, col});
m_window.draw(m_palette, trimmed_mode_line.atoms(), m_dimensions.column - col, default_face); m_window.draw(m_palette, trimmed_mode_line.atoms(), default_face);
} }
if (m_set_title) if (m_set_title)
@ -554,8 +560,7 @@ void NCursesUI::check_resize(bool force)
info_show(m_info.title, m_info.content, m_info.anchor, m_info.face, m_info.style); info_show(m_info.title, m_info.content, m_info.anchor, m_info.face, m_info.style);
set_resize_pending(); set_resize_pending();
clearok(curscr, true); wclear(curscr);
werase(curscr);
} }
Optional<Key> NCursesUI::get_next_key() Optional<Key> NCursesUI::get_next_key()
@ -701,6 +706,8 @@ Optional<Key> NCursesUI::get_next_key()
return masked_key(Key::F11 + params[0] - 23); return masked_key(Key::F11 + params[0] - 23);
} }
return {}; return {};
case 'u':
return masked_key(static_cast<Codepoint>(params[0]));
case 'Z': return shift(Key::Tab); case 'Z': return shift(Key::Tab);
case 'I': return {Key::FocusIn}; case 'I': return {Key::FocusIn};
case 'O': return {Key::FocusOut}; case 'O': return {Key::FocusOut};
@ -786,8 +793,7 @@ void NCursesUI::draw_menu()
ColumnCount pos = 0; ColumnCount pos = 0;
m_menu.move_cursor({0, 0}); m_menu.move_cursor({0, 0});
m_menu.draw(m_palette, DisplayAtom(m_menu.first_item > 0 ? "< " : " "), m_menu.draw(m_palette, DisplayAtom(m_menu.first_item > 0 ? "< " : " "), m_menu.bg);
m_menu.size.column, m_menu.bg);
int i = m_menu.first_item; int i = m_menu.first_item;
for (; i < item_count and pos < win_width; ++i) for (; i < item_count and pos < win_width; ++i)
@ -795,14 +801,14 @@ void NCursesUI::draw_menu()
const DisplayLine& item = m_menu.items[i]; const DisplayLine& item = m_menu.items[i];
const ColumnCount item_width = item.length(); const ColumnCount item_width = item.length();
auto& face = i == m_menu.selected_item ? m_menu.fg : m_menu.bg; auto& face = i == m_menu.selected_item ? m_menu.fg : m_menu.bg;
m_menu.draw(m_palette, item.atoms(), win_width - pos, face); m_menu.draw(m_palette, item.atoms(), face);
m_menu.draw(m_palette, DisplayAtom(item_width > win_width - pos ? "…" : " "), m_menu.draw(m_palette, DisplayAtom(item_width > win_width - pos ? "…" : " "),
win_width - pos - item_width, m_menu.bg); m_menu.bg);
pos += item_width + 1; pos += item_width + 1;
} }
auto end_str = String{' ', pos > win_width ? 0 : win_width - pos + 1} + (i == item_count ? " " : ">"); auto end_str = String{' ', pos > win_width ? 0 : win_width - pos + 1} + (i == item_count ? " " : ">");
m_menu.draw(m_palette, DisplayAtom(end_str), m_menu.size.column - pos, m_menu.bg); m_menu.draw(m_palette, DisplayAtom(end_str), m_menu.bg);
m_dirty = true; m_dirty = true;
return; return;
@ -830,16 +836,12 @@ void NCursesUI::draw_menu()
int item_idx = (first_col + col) * (int)m_menu.size.line + (int)line; int item_idx = (first_col + col) * (int)m_menu.size.line + (int)line;
auto& face = item_idx < item_count and item_idx == m_menu.selected_item ? m_menu.fg : m_menu.bg; auto& face = item_idx < item_count and item_idx == m_menu.selected_item ? m_menu.fg : m_menu.bg;
if (item_idx < item_count) if (item_idx < item_count)
{ m_menu.draw(m_palette, m_menu.items[item_idx].atoms(), face);
const DisplayLine& item = m_menu.items[item_idx]; m_menu.clear_to_eol(m_palette, face);
m_menu.draw(m_palette, item.atoms(), column_width, face);
}
else
m_menu.draw(m_palette, DisplayAtom(String{}), column_width, face);
} }
const bool is_mark = line >= mark_line and line < mark_line + mark_height; const bool is_mark = line >= mark_line and line < mark_line + mark_height;
m_menu.move_cursor({line, m_menu.size.column - 1}); m_menu.move_cursor({line, m_menu.size.column - 1});
m_menu.draw(m_palette, DisplayAtom(is_mark ? "█" : "░"), 1, m_menu.bg); m_menu.draw(m_palette, DisplayAtom(is_mark ? "█" : "░"), m_menu.bg);
} }
m_dirty = true; m_dirty = true;
} }
@ -1165,7 +1167,8 @@ void NCursesUI::info_show(StringView title, StringView content,
for (auto line = 0_line; line < info_box.size.line; ++line) for (auto line = 0_line; line < info_box.size.line; ++line)
{ {
m_info.move_cursor(line); m_info.move_cursor(line);
m_info.draw(m_palette, DisplayAtom(info_box.contents[(int)line]), info_box.size.column, face); m_info.draw(m_palette, DisplayAtom(info_box.contents[(int)line]), face);
m_info.clear_to_eol(m_palette, face);
} }
m_dirty = true; m_dirty = true;
} }

3
src/ncurses_ui.hh
View File

@ -101,8 +101,9 @@ private:
void destroy(); void destroy();
void refresh(bool force); void refresh(bool force);
void move_cursor(DisplayCoord coord); void move_cursor(DisplayCoord coord);
void clear_to_eol(Palette& palette, const Face& face);
void draw(Palette& palette, ConstArrayView<DisplayAtom> atoms, void draw(Palette& palette, ConstArrayView<DisplayAtom> atoms,
ColumnCount width, const Face& default_face); const Face& default_face);
explicit operator bool() const { return win; } explicit operator bool() const { return win; }