components/library/vte/patches/vte-05-past-mode.patch

   1 From 0117dcd74c804e37c93bdf99f29207b5e786a46b Mon Sep 17 00:00:00 2001
   2 From: Egmont Koblinger <egmont@gmail.com>
   3 Date: Tue, 6 May 2014 13:24:46 +0200
   4 Subject: emulation: Change bracketed paste mode to per-terminal
   5
   6 https://bugzilla.gnome.org/show_bug.cgi?id=729533
   7 (cherry picked from commit 07a3f97381112dad889b99211ce655b84858ed66)
   8 ---
   9  src/vte-private.h | 2 +-
  10  src/vte.c         | 8 ++++----
  11  src/vteseq.c      | 2 +-
  12  3 files changed, 6 insertions(+), 6 deletions(-)
  13
  14 diff --git a/src/vte-private.h b/src/vte-private.h
  15 index 1b5bb98..ca2a7a6 100644
  16 --- a/src/vte-private.h
  17 +++ b/src/vte-private.h
  18 @@ -219,7 +219,6 @@ struct _VteTerminalPrivate {
  19                 gboolean sendrecv_mode; /* sendrecv mode */
  20                 gboolean insert_mode;   /* insert mode */
  21                 gboolean linefeed_mode; /* linefeed mode */
  22 -               gboolean bracketed_paste_mode;
  23                 struct vte_scrolling_region {
  24                         int start, end;
  25                 } scrolling_region;     /* the region we scroll in */
  26 @@ -274,6 +273,7 @@
  27         gboolean text_modified_flag;
  28         gboolean text_inserted_flag;
  29         gboolean text_deleted_flag;
  30 +       gboolean bracketed_paste_mode;
  31
  32         /* Scrolling options. */
  33         gboolean scroll_background;
  34 diff --git a/src/vte.c b/src/vte.c
  35 index f57a075..1803b6e 100644
  36 --- a/src/vte.c
  37 +++ b/src/vte.c
  38 @@ -5878,10 +5878,10 @@ vte_terminal_paste_cb(GtkClipboard *clipboard, const gchar *text, gpointer data)
  39                                 p++;
  40                         }
  41                 }
  42 -               if (terminal->pvt->screen->bracketed_paste_mode)
  43 +               if (terminal->pvt->bracketed_paste_mode)
  44                         vte_terminal_feed_child(terminal, "\e[200~", -1);
  45                 vte_terminal_feed_child(terminal, paste, length);
  46 -               if (terminal->pvt->screen->bracketed_paste_mode)
  47 +               if (terminal->pvt->bracketed_paste_mode)
  48                         vte_terminal_feed_child(terminal, "\e[201~", -1);
  49                 g_free(paste);
  50         }
  51 @@ -13968,14 +13968,12 @@ vte_terminal_reset(VteTerminal *terminal,
  52         pvt->normal_screen.linefeed_mode = FALSE;
  53         pvt->normal_screen.origin_mode = FALSE;
  54         pvt->normal_screen.reverse_mode = FALSE;
  55 -       pvt->normal_screen.bracketed_paste_mode = FALSE;
  56         pvt->alternate_screen.scrolling_restricted = FALSE;
  57         pvt->alternate_screen.sendrecv_mode = TRUE;
  58         pvt->alternate_screen.insert_mode = FALSE;
  59         pvt->alternate_screen.linefeed_mode = FALSE;
  60         pvt->alternate_screen.origin_mode = FALSE;
  61         pvt->alternate_screen.reverse_mode = FALSE;
  62 -       pvt->alternate_screen.bracketed_paste_mode = FALSE;
  63         pvt->cursor_visible = TRUE;
  64          /* For some reason, xterm doesn't reset alternateScroll, but we do. */
  65          pvt->alternate_screen_scroll = TRUE;
  66 @@ -14010,6 +14008,8 @@ vte_terminal_reset(VteTerminal *terminal,
  67         pvt->mouse_smooth_scroll_delta = 0.;
  68         /* Clear modifiers. */
  69         pvt->modifiers = 0;
  70 +       /* Reset miscellaneous stuff. */
  71 +       pvt->bracketed_paste_mode = FALSE;
  72         /* Cause everything to be redrawn (or cleared). */
  73         vte_terminal_maybe_scroll_to_bottom(terminal);
  74         _vte_invalidate_all(terminal);
  75 diff --git a/src/vteseq.c b/src/vteseq.c
  76 index 28cc79b..acaf856 100644
  77 --- a/src/vteseq.c
  78 +++ b/src/vteseq.c
  79 @@ -737,7 +737,7 @@
  80                  GINT_TO_POINTER(TRUE),
  81                  NULL, NULL},
  82                 /* 2004: Bracketed paste mode. */
  83 -               {2004, &terminal->pvt->screen->bracketed_paste_mode, NULL, NULL,
  84 +               {2004, &terminal->pvt->bracketed_paste_mode, NULL, NULL,
  85                  GINT_TO_POINTER(FALSE),
  86                  GINT_TO_POINTER(TRUE),
  87                  NULL, NULL,},
  88 --
  89 cgit v0.12