[vte] widget: Move some methods to VteTerminalPrivate

[Christian Persch <chpe src gnome org>]

commit 1e2baeac23520491a2acd3625373db5953ca9c6b
Author: Christian Persch <chpe gnome org>
Date:   Thu Jan 14 17:05:34 2016 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vteinternal.hh |    4 ++++
 src/vteseq.cc      |   38 +++++++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index ed20864..27aee2e 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1110,6 +1110,10 @@ public:
         inline void seq_switch_screen(VteScreen *new_screen);
         inline void seq_normal_screen();
         inline void seq_alternate_screen();
+        inline void seq_save_cursor();
+        inline void seq_restore_cursor();
+        inline void seq_normal_screen_and_restore_cursor();
+        inline void seq_save_cursor_and_alternate_screen();
 };
 
 #define m_invalidated_all invalidated_all
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 403193c..d4cdd72 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -351,15 +351,27 @@ VteTerminalPrivate::seq_scroll_text(vte::grid::row_t scroll_amount)
 static void
 vte_sequence_handler_restore_cursor (VteTerminal *terminal, GValueArray *params)
 {
-        terminal->pvt->restore_cursor(terminal->pvt->screen);
-        terminal->pvt->ensure_cursor_is_onscreen();
+        terminal->pvt->seq_restore_cursor();
+}
+
+void
+VteTerminalPrivate::seq_restore_cursor()
+{
+        restore_cursor(m_screen);
+        ensure_cursor_is_onscreen();
 }
 
 /* Save cursor. */
 static void
 vte_sequence_handler_save_cursor (VteTerminal *terminal, GValueArray *params)
 {
-        terminal->pvt->save_cursor(terminal->pvt->screen);
+        terminal->pvt->seq_save_cursor();
+}
+
+void
+VteTerminalPrivate::seq_save_cursor()
+{
+        save_cursor(m_screen);
 }
 
 /* Switch to normal screen. */
@@ -406,16 +418,28 @@ VteTerminalPrivate::seq_alternate_screen()
 static void
 vte_sequence_handler_normal_screen_and_restore_cursor (VteTerminal *terminal, GValueArray *params)
 {
-        vte_sequence_handler_normal_screen (terminal, params);
-        vte_sequence_handler_restore_cursor (terminal, params);
+        terminal->pvt->seq_normal_screen_and_restore_cursor();
+}
+
+void
+VteTerminalPrivate::seq_normal_screen_and_restore_cursor()
+{
+        seq_normal_screen();
+        seq_restore_cursor();
 }
 
 /* Save cursor and switch to alternate screen (in this order). */
 static void
 vte_sequence_handler_save_cursor_and_alternate_screen (VteTerminal *terminal, GValueArray *params)
 {
-        vte_sequence_handler_save_cursor (terminal, params);
-        vte_sequence_handler_alternate_screen (terminal, params);
+        terminal->pvt->seq_save_cursor_and_alternate_screen();
+}
+
+void
+VteTerminalPrivate::seq_save_cursor_and_alternate_screen()
+{
+        seq_save_cursor();
+        seq_alternate_screen();
 }
 
 /* Set icon/window titles. */