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

Re-merge clear_to_eol in draw

Browse Source
This commit is contained in:
Maxime Coste 2019-11-13 22:10:42 +11:00
parent 7afced07d0
commit e33ba455c8
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ncurses_ui.cc
View File

@ -63,12 +63,6 @@ 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,
const Face& default_face) const Face& default_face)
{ {
@ -100,7 +94,7 @@ void NCursesUI::Window::draw(Palette& palette, ConstArrayView<DisplayAtom> atoms
#endif #endif
}; };
ColumnCount column = 0; ColumnCount column = getcurx(win);
for (const DisplayAtom& atom : atoms) for (const DisplayAtom& atom : atoms)
{ {
StringView content = atom.content(); StringView content = atom.content();
@ -117,6 +111,12 @@ 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 < size.column)
{
wbkgdset(win, COLOR_PAIR(palette.get_color_pair(default_face)));
wclrtoeol(win);
}
} }
constexpr int NCursesUI::default_shift_function_key; constexpr int NCursesUI::default_shift_function_key;
@ -454,17 +454,14 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
LineCount line_index = line_offset; LineCount line_index = line_offset;
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.clear_to_eol(m_palette, default_face);
m_window.draw(m_palette, line.atoms(), default_face); m_window.draw(m_palette, line.atoms(), default_face);
++line_index;
} }
auto face = merge_faces(default_face, padding_face); auto face = merge_faces(default_face, padding_face);
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.clear_to_eol(m_palette, face);
m_window.draw(m_palette, DisplayAtom("~"), face); m_window.draw(m_palette, DisplayAtom("~"), face);
} }
@ -478,7 +475,6 @@ 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.clear_to_eol(m_palette, default_face);
m_window.draw(m_palette, status_line.atoms(), default_face); m_window.draw(m_palette, status_line.atoms(), default_face);
const auto mode_len = mode_line.length(); const auto mode_len = mode_line.length();
@ -839,9 +835,8 @@ void NCursesUI::draw_menu()
m_menu.move_cursor({line, col * column_width}); m_menu.move_cursor({line, col * column_width});
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;
m_menu.clear_to_eol(m_palette, face); auto atoms = item_idx < item_count ? m_menu.items[item_idx].atoms() : ConstArrayView<DisplayAtom>{};
if (item_idx < item_count) m_menu.draw(m_palette, atoms, face);
m_menu.draw(m_palette, m_menu.items[item_idx].atoms(), 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});
@ -1171,7 +1166,6 @@ 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.clear_to_eol(m_palette, face);
m_info.draw(m_palette, DisplayAtom(info_box.contents[(int)line]), face); m_info.draw(m_palette, DisplayAtom(info_box.contents[(int)line]), face);
} }
m_dirty = true; m_dirty = true;

1
src/ncurses_ui.hh
View File

@ -101,7 +101,6 @@ 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,
const Face& default_face); const Face& default_face);