[vte/wip/egmont/bidi: 3/3] widget: Remove line_is_wrappable()
- From: Egmont Koblinger <egmontkob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/wip/egmont/bidi: 3/3] widget: Remove line_is_wrappable()
- Date: Wed, 5 Jun 2019 22:52:07 +0000 (UTC)
commit 37f0ff28fa19db6370712e12705f456dc85c52ec
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 66a705b8..138ff8dc 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -5338,15 +5338,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
@@ -5582,13 +5573,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. */
@@ -6520,7 +6511,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 57869583..64a6092b 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -905,8 +905,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]