[vte] widget: Move some methods to VteTerminalPrivate
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Move some methods to VteTerminalPrivate
- Date: Thu, 14 Jan 2016 16:13:32 +0000 (UTC)
commit d50aed93fe822cdb9c7cc33730db58856906c934
Author: Christian Persch <chpe gnome org>
Date: Thu Jan 14 17:05:37 2016 +0100
widget: Move some methods to VteTerminalPrivate
src/vteinternal.hh | 1 +
src/vteseq.cc | 34 +++++++++++++++++-----------------
2 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index ffbd95a..2cfe9a6 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1160,6 +1160,7 @@ public:
inline void seq_delete_lines(vte::grid::row_t param);
inline void seq_device_status_report(long param);
inline void seq_dec_device_status_report(long param);
+ inline void seq_screen_alignment_test();
};
#define m_invalidated_all invalidated_all
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 1af8ed6..6e48bd8 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -2952,37 +2952,37 @@ vte_sequence_handler_save_mode (VteTerminal *terminal, GValueArray *params)
static void
vte_sequence_handler_screen_alignment_test (VteTerminal *terminal, GValueArray *params)
{
- long row;
- VteRowData *rowdata;
- VteScreen *screen;
- VteCell cell;
-
- screen = terminal->pvt->screen;
+ terminal->pvt->seq_screen_alignment_test();
+}
- for (row = terminal->pvt->screen->insert_delta;
- row < terminal->pvt->screen->insert_delta + terminal->pvt->row_count;
+void
+VteTerminalPrivate::seq_screen_alignment_test()
+{
+ for (auto row = m_screen->insert_delta;
+ row < m_screen->insert_delta + m_row_count;
row++) {
/* Find this row. */
- while (_vte_ring_next(screen->row_data) <= row)
- _vte_terminal_ring_append (terminal, FALSE);
- terminal->pvt->adjust_adjustments();
- rowdata = _vte_ring_index_writable (screen->row_data, row);
+ while (_vte_ring_next(m_screen->row_data) <= row)
+ _vte_terminal_ring_append(m_terminal, FALSE);
+ adjust_adjustments();
+ auto rowdata = _vte_ring_index_writable (screen->row_data, row);
g_assert(rowdata != NULL);
/* Clear this row. */
_vte_row_data_shrink (rowdata, 0);
- terminal->pvt->emit_text_deleted();
+ emit_text_deleted();
/* Fill this row. */
+ VteCell cell;
cell.c = 'E';
cell.attr = basic_cell.cell.attr;
cell.attr.columns = 1;
- _vte_row_data_fill (rowdata, &cell, terminal->pvt->column_count);
- terminal->pvt->emit_text_inserted();
+ _vte_row_data_fill(rowdata, &cell, m_column_count);
+ emit_text_inserted();
}
- terminal->pvt->invalidate_all();
+ invalidate_all();
/* We modified the display, so make a note of it for completeness. */
- terminal->pvt->text_modified_flag = TRUE;
+ m_text_modified_flag = TRUE;
}
/* DECSCUSR set cursor style */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]