[vte/wip/egmont/bidi: 15/15] widget: Remove line_is_wrappable()



commit e317f15df77175a8b779fb5ad91a564060e0cb37
Author: Egmont Koblinger <egmont gmail com>
Date:   Wed Jun 5 23:25:35 2019 +0200

    widget: Remove line_is_wrappable()

 src/vte.cc         | 15 +++------------
 src/vteinternal.hh |  2 --
 2 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index c8631bca..a808b022 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -5372,15 +5372,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
@@ -5616,13 +5607,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. */
@@ -6569,7 +6560,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 8ffbf115..f948d5a0 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -906,8 +906,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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]