[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 1c1d51e4c9cb08d67879cf20d04beff251cac936
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 18:53:13 2016 +0100

    widget: Rename instance members
    
    Now that all of VteTerminalPrivate is ported over, remove the #define
    and just rename the member variable.

 src/vte.cc         |   10 +++++-----
 src/vteinternal.hh |    5 +----
 src/vteseq.cc      |    8 ++++----
 3 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 828d81d..37bb4d8 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -2193,7 +2193,7 @@ VteTerminalPrivate::adjust_adjustments()
        /* Snap the insert delta and the cursor position to be in the visible
         * area.  Leave the scrolling delta alone because it will be updated
         * when the adjustment changes. */
-       screen->insert_delta = MAX(m_screen->insert_delta, delta);
+       m_screen->insert_delta = MAX(m_screen->insert_delta, delta);
         m_screen->cursor.row = MAX(m_screen->cursor.row,
                                    m_screen->insert_delta);
 
@@ -3674,7 +3674,7 @@ VteTerminalPrivate::process_incoming()
 
         auto previous_screen = m_screen;
 
-        bottom = screen->insert_delta == (long)m_screen->scroll_delta;
+        bottom = m_screen->insert_delta == (long)m_screen->scroll_delta;
 
         auto top_row = first_displayed_row();
         auto bottom_row = last_displayed_row();
@@ -3796,8 +3796,8 @@ skip_chunk:
                         // FIXME m_screen may be != previous_screen, check for that!
 
                         new_in_scroll_region = m_scrolling_restricted
-                            && (m_screen->cursor.row >= (screen->insert_delta + m_scrolling_region.start))
-                            && (m_screen->cursor.row <= (screen->insert_delta + m_scrolling_region.end));
+                            && (m_screen->cursor.row >= (m_screen->insert_delta + m_scrolling_region.start))
+                            && (m_screen->cursor.row <= (m_screen->insert_delta + m_scrolling_region.end));
 
                         /* delta may have changed from sequence. */
                         top_row = first_displayed_row();
@@ -5048,7 +5048,7 @@ VteTerminalPrivate::widget_key_press(GdkEventKey *event)
                /* Keypad/motion keys. */
                case GDK_KEY_KP_Up:
                case GDK_KEY_Up:
-                       if (m_screen == &normal_screen &&
+                       if (m_screen == &m_normal_screen &&
                            m_modifiers & GDK_CONTROL_MASK &&
                             m_modifiers & GDK_SHIFT_MASK) {
                                scroll_lines(-1);
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index f3f7937..7f42c8e 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -332,8 +332,7 @@ public:
 
        /* Screen data.  We support the normal screen, and an alternate
         * screen, which seems to be a DEC-specific feature. */
-       struct _VteScreen normal_screen, alternate_screen, *screen;
-#define m_screen screen
+        struct _VteScreen m_normal_screen, m_alternate_screen, *m_screen;
 
         /* Values we save along with the cursor */
         gboolean reverse_mode; /* reverse mode */
@@ -1270,8 +1269,6 @@ public:
 #define m_input_enabled input_enabled
 #define m_backspace_binding backspace_binding
 #define m_delete_binding delete_binding
-#define m_normal_screen normal_screen
-#define m_alternate_screen alternate_screen
 #define m_meta_sends_escape meta_sends_escape
 #define m_scroll_on_keystroke scroll_on_keystroke
 #define m_scroll_on_output scroll_on_output
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 1f20c12..cd820b3 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -234,7 +234,7 @@ VteTerminalPrivate::seq_home_cursor()
 void
 VteTerminalPrivate::seq_clear_screen()
 {
-        auto row = m_screen->cursor.row - screen->insert_delta;
+        auto row = m_screen->cursor.row - m_screen->insert_delta;
         auto initial = _vte_ring_next(m_screen->row_data);
        /* Add a new screen's worth of rows. */
         for (auto i = 0; i < m_row_count; i++)
@@ -803,7 +803,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                }
 
 #define STRUCT_MEMBER_P(type,total_offset) \
-                (type) (total_offset >= 0 ? G_STRUCT_MEMBER_P(that, total_offset) : 
G_STRUCT_MEMBER_P(that->screen, -total_offset))
+                (type) (total_offset >= 0 ? G_STRUCT_MEMBER_P(that, total_offset) : 
G_STRUCT_MEMBER_P(that->m_screen, -total_offset))
 
                 if (key.boffset) {
                         bvalue = STRUCT_MEMBER_P(gboolean*, key.boffset);
@@ -1357,7 +1357,7 @@ VteTerminalPrivate::set_scrolling_region(vte::grid::row_t start /* relative */,
                 m_scrolling_restricted = FALSE;
        } else {
                /* Maybe extend the ring -- bug 710483 */
-                while (_vte_ring_next(screen->row_data) < m_screen->insert_delta + m_row_count)
+                while (_vte_ring_next(m_screen->row_data) < m_screen->insert_delta + m_row_count)
                         _vte_ring_insert(m_screen->row_data, _vte_ring_next(m_screen->row_data));
        }
 
@@ -2966,7 +2966,7 @@ VteTerminalPrivate::seq_screen_alignment_test()
                 while (_vte_ring_next(m_screen->row_data) <= row)
                         ring_append(false);
                 adjust_adjustments();
-                auto rowdata = _vte_ring_index_writable (screen->row_data, row);
+                auto rowdata = _vte_ring_index_writable (m_screen->row_data, row);
                g_assert(rowdata != NULL);
                /* Clear this row. */
                _vte_row_data_shrink (rowdata, 0);