diff options
| author | Egmont Koblinger <egmont@gmail.com> | 2019-06-05 23:25:35 +0200 |
|---|---|---|
| committer | Egmont Koblinger <egmont@gmail.com> | 2019-06-30 15:06:15 +0200 |
| commit | aed48b71efc235b7995edd17bc8386390aec2468 (patch) | |
| tree | 52b292c23d7ab9bd0909ba30e9a618acb9b44543 | |
| parent | e58b6f03e705b96b69b4f860fce3a869383409ae (diff) | |
| download | vte-wip/egmont/bidi.tar.gz | |
widget: Remove line_is_wrappable()wip/egmont/bidi
| -rw-r--r-- | src/vte.cc | 15 | ||||
| -rw-r--r-- | src/vteinternal.hh | 2 |
2 files changed, 3 insertions, 14 deletions
@@ -5369,15 +5369,6 @@ Terminal::is_same_class(vte::grid::column_t acol, return false; } -/* Check if we soft-wrapped on the given line. */ -// FIXMEchpe replace this with a method on VteRing -bool -Terminal::line_is_wrappable(vte::grid::row_t row) const -{ - VteRowData const* rowdata = find_row_data(row); - return rowdata && rowdata->attr.soft_wrapped; -} - /* * Convert the mouse click or drag location (left or right half of a cell) into a selection endpoint * (a boundary between characters), extending the selection according to the current mode, in the @@ -5613,13 +5604,13 @@ Terminal::resolve_selection_endpoint(vte::grid::halfcoords const& rowcolhalf, bo /* Back up as far as we can go. */ while (row > 0 && _vte_ring_contains (m_screen->row_data, row - 1) && - line_is_wrappable(row - 1)) { + m_screen->row_data->is_soft_wrapped(row - 1)) { row--; } } else { /* Move forward as far as we can go. */ while (_vte_ring_contains (m_screen->row_data, row) && - line_is_wrappable(row)) { + m_screen->row_data->is_soft_wrapped(row)) { row++; } row++; /* One more row, since the column is 0. */ @@ -6566,7 +6557,7 @@ Terminal::get_text(vte::grid::row_t start_row, else if (row < end_row) { /* If we didn't softwrap, add a newline. */ /* XXX need to clear row->soft_wrap on deletion! */ - if (!line_is_wrappable(row)) { + if (!m_screen->row_data->is_soft_wrapped(row)) { string = g_string_append_c(string, '\n'); } } diff --git a/src/vteinternal.hh b/src/vteinternal.hh index 846056a9..b0b6239e 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -902,8 +902,6 @@ public: vte::grid::column_t bcol, vte::grid::row_t brow) const; - inline bool line_is_wrappable(vte::grid::row_t row) const; - GString* get_text(vte::grid::row_t start_row, vte::grid::column_t start_col, vte::grid::row_t end_row, |