[vte/wip/egmont/bidi: 23/91] cleanup
- From: Egmont Koblinger <egmontkob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/wip/egmont/bidi: 23/91] cleanup
- Date: Tue, 5 Feb 2019 19:17:56 +0000 (UTC)
commit 50510e44d588528ede68a01f822c89ce45f01a03
Author: Egmont Koblinger <egmont gmail com>
Date: Tue Aug 21 15:12:56 2018 +0200
cleanup
src/bidi.cc | 6 +++---
src/vte.cc | 6 +-----
src/vteinternal.hh | 3 +--
3 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/bidi.cc b/src/bidi.cc
index c79809e2..5505cf76 100644
--- a/src/bidi.cc
+++ b/src/bidi.cc
@@ -39,11 +39,11 @@ static void bidi_shuffle_explicit (int width, gboolean rtl)
if (rtl) {
for (i = 0; i < width; i++) {
L_to_V[i] = V_to_L[i] = width - 1 - i;
- }
+ }
} else {
for (i = 0; i < width; i++) {
L_to_V[i] = V_to_L[i] = i;
- }
+ }
}
}
@@ -68,7 +68,7 @@ void bidi_shuffle (const VteRowData *rowdata, int width)
str[i] = _vte_unistr_get_base(rowdata->cells[i].c);
}
- pbase_dir = (rowdata->attr.bidi_flags & VTE_BIDI_AUTO)
+ pbase_dir = (rowdata->attr.bidi_flags & VTE_BIDI_AUTO)
? FRIBIDI_PAR_ON
: (rowdata->attr.bidi_flags & VTE_BIDI_RTL) ? FRIBIDI_PAR_RTL : FRIBIDI_PAR_LTR;
diff --git a/src/vte.cc b/src/vte.cc
index 941b8cf3..8d7cbcf1 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -402,11 +402,9 @@ Terminal::find_row_data_writable(vte::grid::row_t row) const
* Note that calling this method may invalidate the return value of
* a previous find_row_data() call. */
// FIXMEchpe replace this with a method on VteRing
-// FIXME do we do overloading? and default parameter?
VteCell const*
Terminal::find_charcell(vte::grid::column_t col,
- vte::grid::row_t row,
- guint8 *bidi_flags = nullptr) const
+ vte::grid::row_t row) const
{
VteRowData const* rowdata;
VteCell const* ret = nullptr;
@@ -414,8 +412,6 @@ Terminal::find_charcell(vte::grid::column_t col,
if (_vte_ring_contains(m_screen->row_data, row)) {
rowdata = _vte_ring_index(m_screen->row_data, row);
ret = _vte_row_data_get (rowdata, col);
- if (bidi_flags != nullptr)
- *bidi_flags = rowdata->attr.bidi_flags;
}
return ret;
}
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 2a322b51..eef61651 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -612,8 +612,7 @@ public:
inline VteRowData const* find_row_data(vte::grid::row_t row) const;
inline VteRowData* find_row_data_writable(vte::grid::row_t row) const;
inline VteCell const* find_charcell(vte::grid::column_t col,
- vte::grid::row_t row,
- guint8 *bidi_flags) const;
+ vte::grid::row_t row) const;
inline vte::grid::column_t find_start_column(vte::grid::column_t col,
vte::grid::row_t row) const;
inline vte::grid::column_t find_end_column(vte::grid::column_t col,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]