[vte] widget: Move some methods to VteTerminalPrivate



commit e19adc1a78e2c6e3bf4dd24a89849d55c7283342
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 30 17:23:34 2015 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vte.cc         |   15 ++++++++-------
 src/vteinternal.hh |    2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index d5776c7..59996fb 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4078,8 +4078,8 @@ next_match:
                        _vte_incoming_chunks_count(m_incoming));
 }
 
-static void
-_vte_terminal_feed_chunks (VteTerminal *terminal, struct _vte_incoming_chunk *chunks)
+void
+VteTerminalPrivate::feed_chunks(struct _vte_incoming_chunk *chunks)
 {
        struct _vte_incoming_chunk *last;
 
@@ -4088,9 +4088,10 @@ _vte_terminal_feed_chunks (VteTerminal *terminal, struct _vte_incoming_chunk *ch
                        _vte_incoming_chunks_count(chunks));
 
        for (last = chunks; last->next != NULL; last = last->next) ;
-       last->next = terminal->pvt->incoming;
-       terminal->pvt->incoming = chunks;
+       last->next = m_incoming;
+       m_incoming = chunks;
 }
+
 /* Read and handle data from the child. */
 static gboolean
 vte_terminal_io_read_cb(GIOChannel *channel,
@@ -4204,7 +4205,7 @@ out:
                }
 
                if (chunks != NULL) {
-                       _vte_terminal_feed_chunks(m_terminal, chunks);
+                       feed_chunks(chunks);
                }
                if (!vte_terminal_is_processing(m_terminal)) {
                         G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
@@ -4292,7 +4293,7 @@ VteTerminalPrivate::feed(char const* data,
                        chunk = m_incoming;
                } else {
                        chunk = get_chunk ();
-                       _vte_terminal_feed_chunks(m_terminal, chunk);
+                       feed_chunks(chunk);
                }
                do { /* break the incoming data into chunks */
                        gsize rem = sizeof (chunk->data) - chunk->len;
@@ -4306,7 +4307,7 @@ VteTerminalPrivate::feed(char const* data,
                        data += len;
 
                        chunk = get_chunk ();
-                       _vte_terminal_feed_chunks(m_terminal, chunk);
+                       feed_chunks(chunk);
                } while (1);
                vte_terminal_start_processing(m_terminal);
        }
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index a3f347b..71777ed 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -546,6 +546,8 @@ public:
                          GIOCondition condition);
         bool pty_io_write(GIOChannel *channel,
                           GIOCondition condition);
+
+        void feed_chunks(struct _vte_incoming_chunk *chunks);
         void send_child(char const* data,
                         gssize length,
                         bool local_echo,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]