[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:06 +0000 (UTC)
commit 20687f52d1ae45be2c4dbad9ca1b1a2d94359a20
Author: Christian Persch <chpe gnome org>
Date: Thu Jan 14 17:05:36 2016 +0100
widget: Move some methods to VteTerminalPrivate
src/vteinternal.hh | 2 ++
src/vteseq.cc | 33 ++++++++++++++++++++++-----------
2 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 14c36b0..56f421a 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1150,6 +1150,8 @@ public:
inline void seq_reverse_index();
inline void seq_tab_set();
inline void seq_tab();
+ inline void seq_tab_clear(long param);
+ inline void seq_send_secondary_device_attributes();
};
#define m_invalidated_all invalidated_all
diff --git a/src/vteseq.cc b/src/vteseq.cc
index fe4c350..710645b 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1982,14 +1982,19 @@ vte_sequence_handler_tab_clear (VteTerminal *terminal, GValueArray *params)
param = g_value_get_long(value);
}
}
+
+ terminal->pvt->seq_tab_clear(param);
+}
+
+void
+VteTerminalPrivate::seq_tab_clear(long param)
+{
if (param == 0) {
- terminal->pvt->clear_tabstop(
- terminal->pvt->cursor.col);
- } else
- if (param == 3) {
- if (terminal->pvt->tabstops != NULL) {
- g_hash_table_destroy(terminal->pvt->tabstops);
- terminal->pvt->tabstops = NULL;
+ clear_tabstop(m_cursor.col);
+ } else if (param == 3) {
+ if (m_tabstops != nullptr) {
+ g_hash_table_destroy(m_tabstops);
+ m_tabstops = nullptr;
}
}
}
@@ -2304,14 +2309,14 @@ vte_sequence_handler_cursor_position_top_row (VteTerminal *terminal, GValueArray
static void
vte_sequence_handler_request_terminal_parameters (VteTerminal *terminal, GValueArray *params)
{
- vte_terminal_feed_child(terminal, "\e[?x", -1);
+ terminal->pvt->feed_child("\e[?x", -1);
}
/* Request terminal attributes. */
static void
vte_sequence_handler_return_terminal_status (VteTerminal *terminal, GValueArray *params)
{
- vte_terminal_feed_child(terminal, "", 0);
+ terminal->pvt->feed_child("", 0);
}
/* Send primary device attributes. */
@@ -2319,7 +2324,7 @@ static void
vte_sequence_handler_send_primary_device_attributes (VteTerminal *terminal, GValueArray *params)
{
/* Claim to be a VT220 with only national character set support. */
- vte_terminal_feed_child(terminal, "\e[?62;c", -1);
+ terminal->pvt->feed_child("\e[?62;c", -1);
}
/* Send terminal ID. */
@@ -2333,6 +2338,12 @@ vte_sequence_handler_return_terminal_id (VteTerminal *terminal, GValueArray *par
static void
vte_sequence_handler_send_secondary_device_attributes (VteTerminal *terminal, GValueArray *params)
{
+ terminal->pvt->seq_send_secondary_device_attributes();
+}
+
+void
+VteTerminalPrivate::seq_send_secondary_device_attributes()
+{
char **version;
char buf[128];
long ver = 0, i;
@@ -2347,7 +2358,7 @@ vte_sequence_handler_send_secondary_device_attributes (VteTerminal *terminal, GV
g_strfreev(version);
}
g_snprintf(buf, sizeof (buf), _VTE_CAP_ESC "[>1;%ld;0c", ver);
- vte_terminal_feed_child(terminal, buf, -1);
+ feed_child(buf, -1);
}
/* Set one or the other. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]