[vte/wip/sixels: 95/111] terminal: Properly get XTERM_SIXEL_PRIVATE_COLOR_REGISTERS from modes

[Christian Persch <chpe src gnome org>]

commit 8fcbc0ddd33e7e02a64ee2011c13e53e3c29ec69
Author: Hans Petter Jansson <hpj cl no>
Date:   Sat Aug 8 20:42:49 2020 +0200

    terminal: Properly get XTERM_SIXEL_PRIVATE_COLOR_REGISTERS from modes

 src/vte.cc         | 2 --
 src/vteinternal.hh | 1 -
 src/vteseq.cc      | 3 ++-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index c73a81bc..75fcd3cb 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9954,8 +9954,6 @@ Terminal::reset(bool clear_tabstops,
        m_modifiers = 0;
        /* Reset SIXEL-scrolls-right mode */
        m_sixel_scrolls_right = FALSE;
-       /* Reset privae color register mode */
-       m_sixel_use_private_register = FALSE;
        /* Reset SIXEL color register */
        sixel_parser_set_default_color(&m_sixel_state);
         /* Reset the saved cursor. */
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 43a5ccdf..cb248437 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -757,7 +757,6 @@ public:
         gboolean m_images_enabled;
 
         gboolean m_sixel_scrolls_right;
-        gboolean m_sixel_use_private_register;
         sixel_state_t m_sixel_state;
 
        /* State variables for handling match checks. */
diff --git a/src/vteseq.cc b/src/vteseq.cc
index b217cbc1..102bca07 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -4371,7 +4371,8 @@ Terminal::DECSIXEL(vte::parser::Sequence const& seq)
 
        /* Parse image */
 
-       if (sixel_parser_init(&m_sixel_state, nfg, nbg, m_sixel_use_private_register) < 0) {
+       if (sixel_parser_init(&m_sixel_state, nfg, nbg,
+                              m_modes_private.XTERM_SIXEL_PRIVATE_COLOR_REGISTERS()) < 0) {
                sixel_parser_deinit(&m_sixel_state);
                return;
        }