[vte/vte-0-36] emulation: Change bracketed paste mode to per-terminal

[Christian Persch <chpe src gnome org>]

commit 0117dcd74c804e37c93bdf99f29207b5e786a46b
Author: Egmont Koblinger <egmont gmail com>
Date:   Tue May 6 13:24:46 2014 +0200

    emulation: Change bracketed paste mode to per-terminal
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729533
    (cherry picked from commit 07a3f97381112dad889b99211ce655b84858ed66)

 src/vte-private.h |    2 +-
 src/vte.c         |    8 ++++----
 src/vteseq.c      |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/vte-private.h b/src/vte-private.h
index 1b5bb98..ca2a7a6 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -248,7 +248,6 @@ struct _VteTerminalPrivate {
                gboolean sendrecv_mode; /* sendrecv mode */
                gboolean insert_mode;   /* insert mode */
                gboolean linefeed_mode; /* linefeed mode */
-               gboolean bracketed_paste_mode;
                struct vte_scrolling_region {
                        int start, end;
                } scrolling_region;     /* the region we scroll in */
@@ -305,6 +304,7 @@ struct _VteTerminalPrivate {
        gboolean text_inserted_flag;
        gboolean text_deleted_flag;
        gboolean rewrap_on_resize;
+       gboolean bracketed_paste_mode;
 
        /* Scrolling options. */
        gboolean scroll_background;
diff --git a/src/vte.c b/src/vte.c
index f57a075..1803b6e 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5878,10 +5878,10 @@ vte_terminal_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
                                p++;
                        }
                }
-               if (terminal->pvt->screen->bracketed_paste_mode)
+               if (terminal->pvt->bracketed_paste_mode)
                        vte_terminal_feed_child(terminal, "\e[200~", -1);
                vte_terminal_feed_child(terminal, paste, length);
-               if (terminal->pvt->screen->bracketed_paste_mode)
+               if (terminal->pvt->bracketed_paste_mode)
                        vte_terminal_feed_child(terminal, "\e[201~", -1);
                g_free(paste);
        }
@@ -13968,14 +13968,12 @@ vte_terminal_reset(VteTerminal *terminal,
        pvt->normal_screen.linefeed_mode = FALSE;
        pvt->normal_screen.origin_mode = FALSE;
        pvt->normal_screen.reverse_mode = FALSE;
-       pvt->normal_screen.bracketed_paste_mode = FALSE;
        pvt->alternate_screen.scrolling_restricted = FALSE;
        pvt->alternate_screen.sendrecv_mode = TRUE;
        pvt->alternate_screen.insert_mode = FALSE;
        pvt->alternate_screen.linefeed_mode = FALSE;
        pvt->alternate_screen.origin_mode = FALSE;
        pvt->alternate_screen.reverse_mode = FALSE;
-       pvt->alternate_screen.bracketed_paste_mode = FALSE;
        pvt->cursor_visible = TRUE;
         /* For some reason, xterm doesn't reset alternateScroll, but we do. */
         pvt->alternate_screen_scroll = TRUE;
@@ -14010,6 +14008,8 @@ vte_terminal_reset(VteTerminal *terminal,
        pvt->mouse_smooth_scroll_delta = 0.;
        /* Clear modifiers. */
        pvt->modifiers = 0;
+       /* Reset miscellaneous stuff. */
+       pvt->bracketed_paste_mode = FALSE;
        /* Cause everything to be redrawn (or cleared). */
        vte_terminal_maybe_scroll_to_bottom(terminal);
        _vte_invalidate_all(terminal);
diff --git a/src/vteseq.c b/src/vteseq.c
index 28cc79b..acaf856 100644
--- a/src/vteseq.c
+++ b/src/vteseq.c
@@ -778,7 +778,7 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
                 TRUE,
                 NULL, NULL},
                /* 2004: Bracketed paste mode. */
-               {2004, SCREEN_OFFSET(bracketed_paste_mode), 0, 0,
+               {2004, PRIV_OFFSET(bracketed_paste_mode), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},