[vte] widget: Move some methods to VteTerminalPrivate

[Christian Persch <chpe src gnome org>]

commit 2111ea4210c71bd609af3b9418398db9ab67d0a1
Author: Christian Persch <chpe gnome org>
Date:   Thu Jan 14 17:05:37 2016 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vte.cc         |    6 ++++++
 src/vteinternal.hh |    3 +++
 src/vteseq.cc      |   43 ++++++++++++++++++++++---------------------
 3 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 83e83a5..e194bbb 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -5658,6 +5658,12 @@ VteTerminalPrivate::feed_focus_event(bool in)
 }
 
 void
+VteTerminalPrivate::feed_focus_event_initial()
+{
+        feed_focus_event(gtk_widget_has_focus(m_widget));
+}
+
+void
 VteTerminalPrivate::maybe_feed_focus_event(bool in)
 {
         if (m_focus_tracking_mode)
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 656f31d..58b671b 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1013,6 +1013,7 @@ public:
                                    GdkEventType event_type);
 
         void feed_focus_event(bool in);
+        void feed_focus_event_initial();
         void maybe_feed_focus_event(bool in);
 
 #ifdef WITH_PCRE2
@@ -1120,6 +1121,8 @@ public:
         inline void seq_set_mode_internal(long setting,
                                           bool value);
         inline void set_mouse_smooth_scroll_delta(double value);
+        inline void seq_decset_internal_post(long setting,
+                                             bool set);
         inline void set_character_replacements(unsigned slot,
                                                VteCharacterReplacement replacement);
         inline void set_character_replacement(unsigned slot);
diff --git a/src/vteseq.cc b/src/vteseq.cc
index cded2c8..0fb7926 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -580,7 +580,7 @@ vte_set_focus_tracking_mode(VteTerminal *terminal,
         /* We immediately send the terminal a focus event, since otherwise
          * it has no way to know the current status.
          */
-        terminal->pvt->feed_focus_event(gtk_widget_has_focus(&terminal->widget));
+        terminal->pvt->feed_focus_event_initial();
 }
 
 struct decset_t {
@@ -866,6 +866,13 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
                }
        } while (0);
 
+        terminal->pvt->seq_decset_internal_post(setting, set);
+}
+
+void
+VteTerminalPrivate::seq_decset_internal_post(long setting,
+                                             bool set)
+{
        /* Do whatever's necessary when the setting changes. */
        switch (setting) {
        case 1:
@@ -875,36 +882,34 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
                break;
        case 3:
                 /* 3: DECCOLM set/reset to 132/80 columns mode, clear screen and cursor home */
-                if (terminal->pvt->deccolm_mode) {
-                        terminal->pvt->emit_resize_window(
-                                                        set ? 132 : 80,
-                                                        terminal->pvt->row_count);
-                        terminal->pvt->seq_clear_screen();
-                        terminal->pvt->seq_home_cursor();
+                if (m_deccolm_mode) {
+                        emit_resize_window(set ? 132 : 80,
+                                           m_row_count);
+                        seq_clear_screen();
+                        seq_home_cursor();
                 }
                break;
        case 5:
                /* Repaint everything in reverse mode. */
-                terminal->pvt->invalidate_all();
+                invalidate_all();
                break;
        case 6:
                /* Reposition the cursor in its new home position. */
-                terminal->pvt->seq_home_cursor();
+                seq_home_cursor();
                break;
        case 47:
        case 1047:
        case 1049:
                 /* Clear the alternate screen if we're switching to it */
                if (set) {
-                       terminal->pvt->seq_clear_screen();
+                       seq_clear_screen();
                }
                /* Reset scrollbars and repaint everything. */
-               gtk_adjustment_set_value(terminal->pvt->vadjustment,
-                                        terminal->pvt->screen->scroll_delta);
-               vte_terminal_set_scrollback_lines(terminal,
-                               terminal->pvt->scrollback_lines);
-               terminal->pvt->queue_contents_changed();
-                terminal->pvt->invalidate_all();
+               gtk_adjustment_set_value(m_vadjustment,
+                                        m_screen->scroll_delta);
+               set_scrollback_lines(m_scrollback_lines);
+                queue_contents_changed();
+                invalidate_all();
                break;
        case 9:
        case 1000:
@@ -912,7 +917,7 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
        case 1002:
        case 1003:
                /* Make the pointer visible. */
-               terminal->pvt->set_pointer_visible(true);
+                set_pointer_visible(true);
                break;
        case 66:
                _vte_debug_print(VTE_DEBUG_KEYBOARD, set ?
@@ -924,12 +929,8 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
        }
 }
 
-
-
-
 /* THE HANDLERS */
 
-
 /* Do nothing. */
 static void
 vte_sequence_handler_nop (VteTerminal *terminal, GValueArray *params)