vte3: 0.66.2 -> 0.69.92 Closes FS#1912

4 files changed, 159 insertions, 264 deletions

diff --git a/vte3/.footprint b/vte3/.footprint
index d1599e780..3bebf6b0d 100644
--- a/vte3/.footprint
+++ b/vte3/.footprint
@@ -23,8 +23,8 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Vte-2.91.typelib
 lrwxrwxrwx	root/root	usr/lib/libvte-2.91.so -> libvte-2.91.so.0
-lrwxrwxrwx	root/root	usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.6800.0
--rwxr-xr-x	root/root	usr/lib/libvte-2.91.so.0.6800.0
+lrwxrwxrwx	root/root	usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.6992.0
+-rwxr-xr-x	root/root	usr/lib/libvte-2.91.so.0.6992.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/vte-2.91.pc
 -rwxr-xr-x	root/root	usr/lib/vte-urlencode-cwd
diff --git a/vte3/.signature b/vte3/.signature
index 8851ea7e2..6b35aeda0 100644
--- a/vte3/.signature
+++ b/vte3/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SYCYna9xzuZbPBuIkEInUCMGI2vZiypVfZtU0texE0Uz65Xe2qA+uWMGeK7J3ZIRkdeXb3YPevXhn5QMuswwwE=
-SHA256 (Pkgfile) = 9f853816e6ac820102b47cc947550b01f974c8e26c5c921119bcf193ba674f4c
-SHA256 (.footprint) = 13ac64ed6ee252779e4d4405fb86dda7fa865670c95159b1efeb9a42f13077be
-SHA256 (vte-0.68.0.tar.bz2) = cfb6fe3a11967de4f1ac5f7e0606d821036dca3171f9eddf35183956f7879e55
+RWSE3ohX2g5d/axZHcXIjGiy8yVqzZX7L4bNLGtxvIAGCMbISuPA2HrKKwvoPKptZ+nnaCwjfpzHUciHoU0MyFu8B/SetwzIkQs=
+SHA256 (Pkgfile) = 56d8f6c2c6952e45617a98ddcb2a3b5c703c799c09a91a6830fa3e9c91b50c15
+SHA256 (.footprint) = 8743854c8b2f393df54c53f5a4d54fc758a808932c13bd1ac66d064f4b4baa14
+SHA256 (vte-0.69.92.tar.bz2) = 9b79718d08e109e5acc13c1dd2196b543916abe9aadce5f37b544bdb2dc05158
+SHA256 (vte-cntnr-precmd-preexec-scroll.patch) = bf19d7d9655b1ca7fbd1e3dd26875e5c89f4d6f165ef72cd7a8ae584ac5e59fb
diff --git a/vte3/Pkgfile b/vte3/Pkgfile
index f3a5aa4f2..d8769a1ca 100644
--- a/vte3/Pkgfile
+++ b/vte3/Pkgfile
@@ -5,15 +5,21 @@
 # Optional: icu vala
 
 name=vte3
-version=0.68.0
+version=0.69.92
 release=1
-source=(https://gitlab.gnome.org/GNOME/vte/-/archive/$version/vte-$version.tar.bz2)
+source=(https://gitlab.gnome.org/GNOME/vte/-/archive/$version/vte-$version.tar.bz2
+	vte-cntnr-precmd-preexec-scroll.patch)
 
 build() {
 	prt-get isinst gtk4 && PKGMK_VTE+=' -D gtk4=true'
 	prt-get isinst vala || PKGMK_VTE+=' -D vapi=false'
 	prt-get isinst icu || PKGMK_VTE+=' -D icu=false'
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711059
+	# https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7378
+	# https://pagure.io/fedora-workstation/issue/261
+	patch -d vte-$version -p1 -i $SRC/vte-cntnr-precmd-preexec-scroll.patch
+
 	meson build vte-$version ${PKGMK_VTE} \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
diff --git a/vte3/vte-cntnr-precmd-preexec-scroll.patch b/vte3/vte-cntnr-precmd-preexec-scroll.patch
index 888acae90..7443b38e7 100644
--- a/vte3/vte-cntnr-precmd-preexec-scroll.patch
+++ b/vte3/vte-cntnr-precmd-preexec-scroll.patch
@@ -1,4 +1,4 @@
-From baa3752d4479336135d199b83ac3016fd1f71918 Mon Sep 17 00:00:00 2001
+From 22704d787b39e7f8d583a36d3a323854d43bebda Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 7 Jan 2015 16:01:00 +0100
 Subject: [PATCH 01/11] Add sequences and signals for desktop notification
@@ -36,10 +36,10 @@ index 241128c3..4412cf3d 100644
  VOID:STRING,UINT
  VOID:UINT,UINT
 diff --git a/src/vte.cc b/src/vte.cc
-index ec330490..f39578ac 100644
+index 00cd243b..2c4a66b5 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals()
+@@ -10281,6 +10281,14 @@ Terminal::emit_pending_signals()
  
  	emit_adjustment_changed();
  
@@ -55,26 +55,28 @@ index ec330490..f39578ac 100644
                  if (m_window_title != m_window_title_pending) {
                          m_window_title.swap(m_window_title_pending);
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 05f6674f..0b9b8dc4 100644
+index 6f8a7751..0fdfce1e 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -109,8 +109,10 @@ struct _VteTerminalClass {
+@@ -108,10 +108,12 @@ struct _VteTerminalClass {
  
  	void (*bell)(VteTerminal* terminal);
  
 +	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
 +
-         /* Padding for future expansion. */
--        gpointer padding[16];
-+        gpointer padding[15];
+ #if _VTE_GTK == 3
+         /* Compatibility padding due to fedora patches intruding on our ABI */
+         /*< private >*/
+-        gpointer _extra_padding[3];
++        gpointer _extra_padding[2];
+ #endif /* _VTE_GTK == 3 */
  
- // FIXMEgtk4 use class private data instead
-         VteTerminalClassPrivate *priv;
+         /* Add new vfuncs here, and subtract from the padding below. */
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 000be62d..04eceea1 100644
+index 034c023b..778b69b2 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
-@@ -1242,6 +1242,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1274,6 +1274,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
  	klass->child_exited = NULL;
  	klass->encoding_changed = NULL;
  	klass->char_size_changed = NULL;
@@ -82,7 +84,7 @@ index 000be62d..04eceea1 100644
  	klass->window_title_changed = NULL;
  	klass->icon_title_changed = NULL;
  	klass->selection_changed = NULL;
-@@ -1325,6 +1326,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1357,6 +1358,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
                                     G_OBJECT_CLASS_TYPE(klass),
                                     g_cclosure_marshal_VOID__INTv);
  
@@ -110,7 +112,7 @@ index 000be62d..04eceea1 100644
           * VteTerminal::window-title-changed:
           * @vteterminal: the object which received the signal
 diff --git a/src/vtegtk.hh b/src/vtegtk.hh
-index 6b7a1ea2..8ba10395 100644
+index 778b555a..67c456b5 100644
 --- a/src/vtegtk.hh
 +++ b/src/vtegtk.hh
 @@ -52,6 +52,7 @@ enum {
@@ -122,10 +124,10 @@ index 6b7a1ea2..8ba10395 100644
          LAST_SIGNAL
  };
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 77843507..b4dfb2a4 100644
+index 5037096d..1e8a27f6 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -663,6 +663,10 @@ public:
+@@ -688,6 +688,10 @@ public:
          gboolean m_cursor_moved_pending;
          gboolean m_contents_changed_pending;
  
@@ -136,7 +138,7 @@ index 77843507..b4dfb2a4 100644
          std::string m_window_title{};
          std::string m_current_directory_uri{};
          std::string m_current_file_uri{};
-@@ -676,6 +680,7 @@ public:
+@@ -701,6 +705,7 @@ public:
                  TITLE = 1u << 0,
                  CWD   = 1u << 1,
                  CWF   = 1u << 2,
@@ -144,7 +146,7 @@ index 77843507..b4dfb2a4 100644
          };
          unsigned m_pending_changes{0};
  
-@@ -1488,6 +1493,9 @@ public:
+@@ -1539,6 +1544,9 @@ public:
                               int osc) noexcept;
  
          /* OSC handlers */
@@ -155,10 +157,10 @@ index 77843507..b4dfb2a4 100644
                         vte::parser::StringTokeniser::const_iterator& token,
                         vte::parser::StringTokeniser::const_iterator const& endtoken,
 diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 0a45c9b4..1a6bdc11 100644
+index 9efde087..772ba4f3 100644
 --- a/src/vteseq.cc
 +++ b/src/vteseq.cc
-@@ -1376,6 +1376,33 @@ Terminal::delete_lines(vte::grid::row_t param)
+@@ -1408,6 +1408,33 @@ Terminal::delete_lines(vte::grid::row_t param)
          m_text_deleted_flag = TRUE;
  }
  
@@ -192,7 +194,7 @@ index 0a45c9b4..1a6bdc11 100644
  bool
  Terminal::get_osc_color_index(int osc,
                                          int value,
-@@ -6535,6 +6562,10 @@ Terminal::OSC(vte::parser::Sequence const& seq)
+@@ -6687,6 +6714,10 @@ Terminal::OSC(vte::parser::Sequence const& seq)
                  reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE);
                  break;
  
@@ -203,7 +205,7 @@ index 0a45c9b4..1a6bdc11 100644
          case VTE_OSC_XTERM_SET_ICON_TITLE:
          case VTE_OSC_XTERM_SET_XPROPERTY:
          case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG:
-@@ -6576,7 +6607,6 @@ Terminal::OSC(vte::parser::Sequence const& seq)
+@@ -6728,7 +6759,6 @@ Terminal::OSC(vte::parser::Sequence const& seq)
          case VTE_OSC_URXVT_SET_FONT_BOLD_ITALIC:
          case VTE_OSC_URXVT_VIEW_UP:
          case VTE_OSC_URXVT_VIEW_DOWN:
@@ -212,10 +214,10 @@ index 0a45c9b4..1a6bdc11 100644
          default:
                  break;
 -- 
-2.33.1
+2.37.1
 
 
-From 8cb45a1e47b4406343f5748bbedad3f694c36b60 Mon Sep 17 00:00:00 2001
+From b885c59413ac8f64891ced008767efc180d8d90a Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 29 Jan 2015 13:09:17 +0100
 Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND
@@ -248,49 +250,23 @@ index 242d6c42..50242223 100644
  }
  
 -- 
-2.33.1
+2.37.1
 
 
-From bb722e49ee14906def24bac9bd0d4e594d71a3ce Mon Sep 17 00:00:00 2001
+From ce224baf4eac101842a05e848874608bda2dd715 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 22 Jan 2015 16:37:10 +0100
 Subject: [PATCH 03/11] Test the notification-received signal
 
 ---
- bindings/vala/app.vala |  7 +++++++
- src/app/app.cc         | 10 ++++++++++
- 2 files changed, 17 insertions(+)
+ src/app/app.cc | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 8ab27e5a..025f971b 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow
-     if (Options.object_notifications)
-       terminal.notify.connect(notify_cb);
- 
-+    terminal.notification_received.connect(notification_received_cb);
-+
-     /* Settings */
-     if (Options.no_double_buffer)
-       terminal.set_double_buffered(false);
-@@ -780,6 +782,11 @@ class Window : Gtk.ApplicationWindow
-     set_title(terminal.get_window_title());
-   }
- 
-+  private void notification_received_cb(Vte.Terminal terminal, string summary, string? body)
-+  {
-+    print ("[%s]: %s\n", summary, body);
-+  }
-+
- } /* class Window */
- 
- class App : Gtk.Application
 diff --git a/src/app/app.cc b/src/app/app.cc
-index 3beff861..00a3e3b2 100644
+index 9d53f274..3c666816 100644
 --- a/src/app/app.cc
 +++ b/src/app/app.cc
-@@ -2205,6 +2205,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
+@@ -2245,6 +2245,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
          gtk_window_set_title(GTK_WINDOW(window), title && title[0] ? title : "Terminal");
  }
  
@@ -305,7 +281,7 @@ index 3beff861..00a3e3b2 100644
  static void
  window_lower_window_cb(VteTerminal* terminal,
                         VteappWindow* window)
-@@ -2501,6 +2509,8 @@ vteapp_window_constructed(GObject *object)
+@@ -2541,6 +2549,8 @@ vteapp_window_constructed(GObject *object)
          if (options.object_notifications)
                  g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window);
  
@@ -315,10 +291,10 @@ index 3beff861..00a3e3b2 100644
  #if VTE_GTK == 3
          if (options.no_double_buffer) {
 -- 
-2.33.1
+2.37.1
 
 
-From 005e6d651cddca7145ca895a3ddf0bd19764454f Mon Sep 17 00:00:00 2001
+From 574e63dbad4c0ae09cf9ff4fff2fdc00de49e9a3 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 13 May 2016 17:53:54 +0200
 Subject: [PATCH 04/11] Add a property to configure the scroll speed
@@ -328,31 +304,18 @@ moving the buffer by a function of the number of visible rows.
 
 https://bugzilla.redhat.com/show_bug.cgi?id=1103380
 ---
- doc/reference/vte-sections.txt.in |  1 +
- src/vte.cc                        | 19 +++++++++++-
- src/vte/vteterminal.h             |  4 +++
- src/vtegtk.cc                     | 51 +++++++++++++++++++++++++++++++
- src/vtegtk.hh                     |  1 +
- src/vteinternal.hh                |  2 ++
- 6 files changed, 77 insertions(+), 1 deletion(-)
+ src/vte.cc            | 19 +++++++++++++++-
+ src/vte/vteterminal.h |  4 ++++
+ src/vtegtk.cc         | 51 +++++++++++++++++++++++++++++++++++++++++++
+ src/vtegtk.hh         |  1 +
+ src/vteinternal.hh    |  2 ++
+ 5 files changed, 76 insertions(+), 1 deletion(-)
 
-diff --git a/doc/reference/vte-sections.txt.in b/doc/reference/vte-sections.txt.in
-index 1180f972..f097d4b9 100644
---- a/doc/reference/vte-sections.txt.in
-+++ b/doc/reference/vte-sections.txt.in
-@@ -56,6 +56,7 @@ vte_terminal_get_cursor_blink_mode
- vte_terminal_set_cursor_blink_mode
- vte_terminal_get_text_blink_mode
- vte_terminal_set_text_blink_mode
-+vte_terminal_set_scroll_speed
- vte_terminal_set_scrollback_lines
- vte_terminal_get_scrollback_lines
- vte_terminal_set_font
 diff --git a/src/vte.cc b/src/vte.cc
-index f39578ac..f027ce3b 100644
+index 2c4a66b5..93fc18d2 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -9289,6 +9289,7 @@ vte_cairo_get_clip_region(cairo_t *cr)
+@@ -9455,6 +9455,7 @@ vte_cairo_get_clip_region(cairo_t *cr)
  bool
  Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
  {
@@ -360,7 +323,7 @@ index f39578ac..f027ce3b 100644
  	gdouble v;
  	gint cnt, i;
  	int button;
-@@ -9323,7 +9324,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
+@@ -9489,7 +9490,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
  		return true;
  	}
  
@@ -375,7 +338,7 @@ index f39578ac..f027ce3b 100644
  	_vte_debug_print(VTE_DEBUG_EVENTS,
  			"Scroll speed is %d lines per non-smooth scroll unit\n",
  			(int) v);
-@@ -9633,6 +9640,16 @@ Terminal::decscusr_cursor_shape() const noexcept
+@@ -9799,6 +9806,16 @@ Terminal::decscusr_cursor_shape() const noexcept
          }
  }
  
@@ -393,10 +356,10 @@ index f39578ac..f027ce3b 100644
  Terminal::set_scrollback_lines(long lines)
  {
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 0b9b8dc4..20c930f7 100644
+index 0fdfce1e..c1240e8a 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -324,6 +324,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
+@@ -330,6 +330,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
  _VTE_PUBLIC
  VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
  
@@ -408,7 +371,7 @@ index 0b9b8dc4..20c930f7 100644
  _VTE_PUBLIC
  void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 04eceea1..7e405a39 100644
+index 778b69b2..3992766f 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
 @@ -993,6 +993,9 @@ try
@@ -421,7 +384,7 @@ index 04eceea1..7e405a39 100644
                  case PROP_SCROLLBACK_LINES:
                          g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal));
                          break;
-@@ -1114,6 +1117,9 @@ try
+@@ -1130,6 +1133,9 @@ try
                  case PROP_REWRAP_ON_RESIZE:
                          vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value));
                          break;
@@ -431,7 +394,7 @@ index 04eceea1..7e405a39 100644
                  case PROP_SCROLLBACK_LINES:
                          vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
                          break;
-@@ -2210,6 +2216,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -2246,6 +2252,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
                                        TRUE,
                                        (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
  
@@ -453,7 +416,7 @@ index 04eceea1..7e405a39 100644
          /**
           * VteTerminal:scrollback-lines:
           *
-@@ -5666,6 +5687,36 @@ catch (...)
+@@ -5851,6 +5872,36 @@ catch (...)
          return -1;
  }
  
@@ -491,7 +454,7 @@ index 04eceea1..7e405a39 100644
   * vte_terminal_set_scrollback_lines:
   * @terminal: a #VteTerminal
 diff --git a/src/vtegtk.hh b/src/vtegtk.hh
-index 8ba10395..f6cd891b 100644
+index 67c456b5..64ff8be8 100644
 --- a/src/vtegtk.hh
 +++ b/src/vtegtk.hh
 @@ -86,6 +86,7 @@ enum {
@@ -503,10 +466,10 @@ index 8ba10395..f6cd891b 100644
          PROP_SCROLL_ON_KEYSTROKE,
          PROP_SCROLL_ON_OUTPUT,
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index b4dfb2a4..2da56ebd 100644
+index 1e8a27f6..0e5a8ace 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -429,6 +429,7 @@ public:
+@@ -439,6 +439,7 @@ public:
          bool m_fallback_scrolling{true};
          bool m_scroll_on_output{false};
          bool m_scroll_on_keystroke{true};
@@ -514,7 +477,7 @@ index b4dfb2a4..2da56ebd 100644
          vte::grid::row_t m_scrollback_lines{0};
  
          inline auto scroll_limit_lower() const noexcept
-@@ -1363,6 +1364,7 @@ public:
+@@ -1412,6 +1413,7 @@ public:
          bool set_input_enabled(bool enabled);
          bool set_mouse_autohide(bool autohide);
          bool set_rewrap_on_resize(bool rewrap);
@@ -523,54 +486,24 @@ index b4dfb2a4..2da56ebd 100644
          bool set_fallback_scrolling(bool set);
          auto fallback_scrolling() const noexcept { return m_fallback_scrolling; }
 -- 
-2.33.1
+2.37.1
 
 
-From dd4f63266f88bcb403513e14fc84e61a2a8e0656 Mon Sep 17 00:00:00 2001
+From 57e1446aa0085ecb194ef91b6a54a67f6005230c Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 13 May 2016 17:54:57 +0200
 Subject: [PATCH 05/11] Test the scroll-speed property
 
 https://bugzilla.redhat.com/show_bug.cgi?id=1103380
 ---
- bindings/vala/app.vala | 4 ++++
- src/app/app.cc         | 4 ++++
- 2 files changed, 8 insertions(+)
+ src/app/app.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
 
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 025f971b..51b5d641 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow
-     terminal.set_rewrap_on_resize(!Options.no_rewrap);
-     terminal.set_scroll_on_output(false);
-     terminal.set_scroll_on_keystroke(true);
-+    terminal.set_scroll_speed(Options.scroll_speed);
-     terminal.set_scrollback_lines(Options.scrollback_lines);
- 
-     /* Style */
-@@ -857,6 +858,7 @@ class App : Gtk.Application
-     public static bool object_notifications = false;
-     public static string? output_filename = null;
-     public static bool reverse = false;
-+    public static uint scroll_speed = 0;
-     public static int scrollback_lines = 512;
-     public static int transparency_percent = 0;
-     public static bool version = false;
-@@ -1050,6 +1052,8 @@ class App : Gtk.Application
-         "Save terminal contents to file at exit", null },
-       { "reverse", 0, 0, OptionArg.NONE, ref reverse,
-         "Reverse foreground/background colors", null },
-+      { "scroll-speed", 0, 0, OptionArg.INT, ref scroll_speed,
-+        "Specify the scroll speed", null },
-       { "scrollback-lines", 'n', 0, OptionArg.INT, ref scrollback_lines,
-         "Specify the number of scrollback-lines", null },
-       { "transparent", 'T', 0, OptionArg.INT, ref transparency_percent,
 diff --git a/src/app/app.cc b/src/app/app.cc
-index 00a3e3b2..a6f209bb 100644
+index 3c666816..2c2e8bde 100644
 --- a/src/app/app.cc
 +++ b/src/app/app.cc
-@@ -116,6 +116,7 @@ public:
+@@ -119,6 +119,7 @@ public:
          int verbosity{0};
          double cell_height_scale{1.0};
          double cell_width_scale{1.0};
@@ -578,7 +511,7 @@ index 00a3e3b2..a6f209bb 100644
          VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM};
          VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK};
          VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS};
-@@ -618,6 +619,8 @@ public:
+@@ -647,6 +648,8 @@ public:
                            "Reverse foreground/background colors", nullptr },
                          { "require-systemd-scope", 0, 0, G_OPTION_ARG_NONE, &require_systemd_scope,
                            "Require use of a systemd user scope", nullptr },
@@ -587,7 +520,7 @@ index 00a3e3b2..a6f209bb 100644
                          { "scroll-unit-is-pixels", 0, 0, G_OPTION_ARG_NONE, &scroll_unit_is_pixels,
                            "Use pixels as scroll unit", nullptr },
                          { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines,
-@@ -2545,6 +2548,7 @@ vteapp_window_constructed(GObject *object)
+@@ -2586,6 +2589,7 @@ vteapp_window_constructed(GObject *object)
          vte_terminal_set_rewrap_on_resize(window->terminal, !options.no_rewrap);
          vte_terminal_set_scroll_on_output(window->terminal, false);
          vte_terminal_set_scroll_on_keystroke(window->terminal, true);
@@ -596,10 +529,10 @@ index 00a3e3b2..a6f209bb 100644
          vte_terminal_set_scrollback_lines(window->terminal, options.scrollback_lines);
          vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode);
 -- 
-2.33.1
+2.37.1
 
 
-From 145bbaedfe0dbd2102ca38acff53e749666c612a Mon Sep 17 00:00:00 2001
+From 6909335767cfbdee9a8e05949eef21f9cedffe20 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 7 Jan 2015 16:01:00 +0100
 Subject: [PATCH 06/11] Support preexec notifications from an interactive shell
@@ -628,10 +561,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
  7 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/src/vte.cc b/src/vte.cc
-index f027ce3b..36cf379f 100644
+index 93fc18d2..77c50558 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -10107,6 +10107,12 @@ Terminal::emit_pending_signals()
+@@ -10306,6 +10306,12 @@ Terminal::emit_pending_signals()
                                m_notification_body.c_str());
          }
  
@@ -661,26 +594,28 @@ index 50242223..01b44e23 100644
  
  elif [[ -n "${ZSH_VERSION:-}" ]]; then
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 20c930f7..2b277e05 100644
+index c1240e8a..eba96927 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -110,9 +110,10 @@ struct _VteTerminalClass {
+@@ -109,11 +109,12 @@ struct _VteTerminalClass {
  	void (*bell)(VteTerminal* terminal);
  
  	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
 +	void (*shell_preexec)(VteTerminal* terminal);
  
-         /* Padding for future expansion. */
--        gpointer padding[15];
-+        gpointer padding[14];
+ #if _VTE_GTK == 3
+         /* Compatibility padding due to fedora patches intruding on our ABI */
+         /*< private >*/
+-        gpointer _extra_padding[2];
++        gpointer _extra_padding[1];
+ #endif /* _VTE_GTK == 3 */
  
- // FIXMEgtk4 use class private data instead
-         VteTerminalClassPrivate *priv;
+         /* Add new vfuncs here, and subtract from the padding below. */
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 7e405a39..22b6412b 100644
+index 3992766f..4ef646d7 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
-@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1281,6 +1281,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
  	klass->encoding_changed = NULL;
  	klass->char_size_changed = NULL;
  	klass->notification_received = NULL;
@@ -688,7 +623,7 @@ index 7e405a39..22b6412b 100644
  	klass->window_title_changed = NULL;
  	klass->icon_title_changed = NULL;
  	klass->selection_changed = NULL;
-@@ -1352,6 +1353,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1384,6 +1385,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
                               G_TYPE_NONE,
                               2, G_TYPE_STRING, G_TYPE_STRING);
  
@@ -713,7 +648,7 @@ index 7e405a39..22b6412b 100644
           * VteTerminal::window-title-changed:
           * @vteterminal: the object which received the signal
 diff --git a/src/vtegtk.hh b/src/vtegtk.hh
-index f6cd891b..bf85bdf4 100644
+index 64ff8be8..179222a1 100644
 --- a/src/vtegtk.hh
 +++ b/src/vtegtk.hh
 @@ -52,6 +52,7 @@ enum {
@@ -725,10 +660,10 @@ index f6cd891b..bf85bdf4 100644
          SIGNAL_WINDOW_TITLE_CHANGED,
          LAST_SIGNAL
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 2da56ebd..041a9a81 100644
+index 0e5a8ace..11965778 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -682,6 +682,7 @@ public:
+@@ -707,6 +707,7 @@ public:
                  CWD   = 1u << 1,
                  CWF   = 1u << 2,
                  NOTIFICATION = 1u << 3,
@@ -737,10 +672,10 @@ index 2da56ebd..041a9a81 100644
          unsigned m_pending_changes{0};
  
 diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 1a6bdc11..84341cda 100644
+index 772ba4f3..76b9329e 100644
 --- a/src/vteseq.cc
 +++ b/src/vteseq.cc
-@@ -1401,6 +1401,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
+@@ -1433,6 +1433,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
                  m_notification_body = *token;
                  return;
          }
@@ -752,10 +687,10 @@ index 1a6bdc11..84341cda 100644
  
  bool
 -- 
-2.33.1
+2.37.1
 
 
-From a6b24e55d1da9ffc35defa6c4d4cb4b16fc50814 Mon Sep 17 00:00:00 2001
+From 39c75a48973425aad1bf25f0181d49600c7d8119 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 20 Apr 2018 18:21:53 +0200
 Subject: [PATCH 07/11] Test the shell-preexec signal
@@ -763,39 +698,14 @@ Subject: [PATCH 07/11] Test the shell-preexec signal
 https://bugzilla.gnome.org/show_bug.cgi?id=711059
 https://bugzilla.gnome.org/show_bug.cgi?id=711060
 ---
- bindings/vala/app.vala | 6 ++++++
- src/app/app.cc         | 7 +++++++
- 2 files changed, 13 insertions(+)
+ src/app/app.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 51b5d641..3975b988 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow
-       terminal.notify.connect(notify_cb);
- 
-     terminal.notification_received.connect(notification_received_cb);
-+    terminal.shell_preexec.connect(shell_preexec_cb);
- 
-     /* Settings */
-     if (Options.no_double_buffer)
-@@ -788,6 +789,11 @@ class Window : Gtk.ApplicationWindow
-     print ("[%s]: %s\n", summary, body);
-   }
- 
-+  private void shell_preexec_cb(Vte.Terminal terminal)
-+  {
-+    print("[shell] executing command\n");
-+  }
-+
- } /* class Window */
- 
- class App : Gtk.Application
 diff --git a/src/app/app.cc b/src/app/app.cc
-index a6f209bb..002db773 100644
+index 2c2e8bde..a66b56f0 100644
 --- a/src/app/app.cc
 +++ b/src/app/app.cc
-@@ -2216,6 +2216,12 @@ notification_received_cb(VteTerminal *terminal,
+@@ -2256,6 +2256,12 @@ notification_received_cb(VteTerminal *terminal,
          g_print("[%s]: %s\n", summary, body);
  }
  
@@ -808,7 +718,7 @@ index a6f209bb..002db773 100644
  static void
  window_lower_window_cb(VteTerminal* terminal,
                         VteappWindow* window)
-@@ -2513,6 +2519,7 @@ vteapp_window_constructed(GObject *object)
+@@ -2553,6 +2559,7 @@ vteapp_window_constructed(GObject *object)
                  g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window);
  
          g_signal_connect(window->terminal, "notification-received", G_CALLBACK(notification_received_cb), NULL);
@@ -817,10 +727,10 @@ index a6f209bb..002db773 100644
          /* Settings */
  #if VTE_GTK == 3
 -- 
-2.33.1
+2.37.1
 
 
-From a21192aa95629c59fdf1ca2e214b194ceac34fa0 Mon Sep 17 00:00:00 2001
+From bfb447be5a97cda7523719ab901c1ea6b0293a6b Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 2 May 2018 17:20:30 +0200
 Subject: [PATCH 08/11] Support precmd notifications from an interactive shell
@@ -841,18 +751,18 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
 ---
  src/vte.cc            |  6 ++++++
  src/vte.sh.in         |  2 +-
- src/vte/vteterminal.h |  3 ++-
+ src/vte/vteterminal.h |  7 +------
  src/vtegtk.cc         | 18 ++++++++++++++++++
  src/vtegtk.hh         |  1 +
  src/vteinternal.hh    |  1 +
  src/vteseq.cc         |  4 +++-
- 7 files changed, 32 insertions(+), 3 deletions(-)
+ 7 files changed, 31 insertions(+), 8 deletions(-)
 
 diff --git a/src/vte.cc b/src/vte.cc
-index 36cf379f..172174e0 100644
+index 77c50558..604890e3 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -10113,6 +10113,12 @@ Terminal::emit_pending_signals()
+@@ -10312,6 +10312,12 @@ Terminal::emit_pending_signals()
                  g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0);
          }
  
@@ -879,27 +789,30 @@ index 01b44e23..877fe93d 100644
  }
  
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 2b277e05..1e926166 100644
+index eba96927..c49f217e 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -110,10 +110,11 @@ struct _VteTerminalClass {
+@@ -109,14 +109,9 @@ struct _VteTerminalClass {
  	void (*bell)(VteTerminal* terminal);
  
  	void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
 +	void (*shell_precmd)(VteTerminal* terminal);
  	void (*shell_preexec)(VteTerminal* terminal);
  
-         /* Padding for future expansion. */
--        gpointer padding[14];
-+        gpointer padding[13];
+-#if _VTE_GTK == 3
+-        /* Compatibility padding due to fedora patches intruding on our ABI */
+-        /*< private >*/
+-        gpointer _extra_padding[1];
+-#endif /* _VTE_GTK == 3 */
+-
+         /* Add new vfuncs here, and subtract from the padding below. */
  
- // FIXMEgtk4 use class private data instead
-         VteTerminalClassPrivate *priv;
+         /* Padding for future expansion. */
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 22b6412b..4cc1b939 100644
+index 4ef646d7..54ed6fc1 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
-@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1281,6 +1281,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
  	klass->encoding_changed = NULL;
  	klass->char_size_changed = NULL;
  	klass->notification_received = NULL;
@@ -907,7 +820,7 @@ index 22b6412b..4cc1b939 100644
  	klass->shell_preexec = NULL;
  	klass->window_title_changed = NULL;
  	klass->icon_title_changed = NULL;
-@@ -1353,6 +1354,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -1385,6 +1386,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
                               G_TYPE_NONE,
                               2, G_TYPE_STRING, G_TYPE_STRING);
  
@@ -932,7 +845,7 @@ index 22b6412b..4cc1b939 100644
           * VteTerminal::shell-preexec:
           * @vteterminal: the object which received the signal
 diff --git a/src/vtegtk.hh b/src/vtegtk.hh
-index bf85bdf4..cee56b65 100644
+index 179222a1..c66aeda2 100644
 --- a/src/vtegtk.hh
 +++ b/src/vtegtk.hh
 @@ -52,6 +52,7 @@ enum {
@@ -944,10 +857,10 @@ index bf85bdf4..cee56b65 100644
          SIGNAL_NOTIFICATION_RECEIVED,
          SIGNAL_WINDOW_TITLE_CHANGED,
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 041a9a81..5c1a5e50 100644
+index 11965778..d4a10935 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
-@@ -683,6 +683,7 @@ public:
+@@ -708,6 +708,7 @@ public:
                  CWF   = 1u << 2,
                  NOTIFICATION = 1u << 3,
                  SHELL_PREEXEC = 1u << 4,
@@ -956,10 +869,10 @@ index 041a9a81..5c1a5e50 100644
          unsigned m_pending_changes{0};
  
 diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 84341cda..35eff3dd 100644
+index 76b9329e..fb958962 100644
 --- a/src/vteseq.cc
 +++ b/src/vteseq.cc
-@@ -1402,7 +1402,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
+@@ -1434,7 +1434,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
                  return;
          }
  
@@ -971,10 +884,10 @@ index 84341cda..35eff3dd 100644
          }
  }
 -- 
-2.33.1
+2.37.1
 
 
-From 92f19ab6d981507e6d348c45802701e7cd8b0503 Mon Sep 17 00:00:00 2001
+From d84dd319c31ffdcfd73b08750228efba34e226fb Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 2 May 2018 17:30:48 +0200
 Subject: [PATCH 09/11] Test the shell-precmd signal
@@ -982,39 +895,14 @@ Subject: [PATCH 09/11] Test the shell-precmd signal
 https://bugzilla.gnome.org/show_bug.cgi?id=711059
 https://bugzilla.gnome.org/show_bug.cgi?id=711060
 ---
- bindings/vala/app.vala | 6 ++++++
- src/app/app.cc         | 7 +++++++
- 2 files changed, 13 insertions(+)
+ src/app/app.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 3975b988..ff5fb5df 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow
-       terminal.notify.connect(notify_cb);
- 
-     terminal.notification_received.connect(notification_received_cb);
-+    terminal.shell_precmd.connect(shell_precmd_cb);
-     terminal.shell_preexec.connect(shell_preexec_cb);
- 
-     /* Settings */
-@@ -789,6 +790,11 @@ class Window : Gtk.ApplicationWindow
-     print ("[%s]: %s\n", summary, body);
-   }
- 
-+  private void shell_precmd_cb(Vte.Terminal terminal)
-+  {
-+    print("[shell] showing command prompt\n");
-+  }
-+
-   private void shell_preexec_cb(Vte.Terminal terminal)
-   {
-     print("[shell] executing command\n");
 diff --git a/src/app/app.cc b/src/app/app.cc
-index 002db773..dde27c9a 100644
+index a66b56f0..9d02499b 100644
 --- a/src/app/app.cc
 +++ b/src/app/app.cc
-@@ -2216,6 +2216,12 @@ notification_received_cb(VteTerminal *terminal,
+@@ -2256,6 +2256,12 @@ notification_received_cb(VteTerminal *terminal,
          g_print("[%s]: %s\n", summary, body);
  }
  
@@ -1027,7 +915,7 @@ index 002db773..dde27c9a 100644
  static void
  shell_preexec_cb(VteTerminal *terminal)
  {
-@@ -2519,6 +2525,7 @@ vteapp_window_constructed(GObject *object)
+@@ -2559,6 +2565,7 @@ vteapp_window_constructed(GObject *object)
                  g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window);
  
          g_signal_connect(window->terminal, "notification-received", G_CALLBACK(notification_received_cb), NULL);
@@ -1036,10 +924,10 @@ index 002db773..dde27c9a 100644
  
          /* Settings */
 -- 
-2.33.1
+2.37.1
 
 
-From 66afaa0b1eae0d55264068aadf689cd2d23d00a3 Mon Sep 17 00:00:00 2001
+From 691fece42c52662dcf53b4bf5360ca0d48822580 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Mon, 10 Jun 2019 20:30:18 +0200
 Subject: [PATCH 10/11] Support tracking the active container inside the
@@ -1081,10 +969,10 @@ agreed upon across multiple different terminal emulators [1].
  6 files changed, 193 insertions(+)
 
 diff --git a/src/vte.cc b/src/vte.cc
-index 172174e0..d32e8eb7 100644
+index 604890e3..fca21ddf 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -10132,6 +10132,14 @@ Terminal::emit_pending_signals()
+@@ -10331,6 +10331,14 @@ Terminal::emit_pending_signals()
                  m_window_title_pending.clear();
  	}
  
@@ -1100,10 +988,10 @@ index 172174e0..d32e8eb7 100644
                  if (m_current_directory_uri != m_current_directory_uri_pending) {
                          m_current_directory_uri.swap(m_current_directory_uri_pending);
 diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
-index 1e926166..f81133e4 100644
+index c49f217e..c490f157 100644
 --- a/src/vte/vteterminal.h
 +++ b/src/vte/vteterminal.h
-@@ -511,6 +511,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT
+@@ -514,6 +514,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT
  _VTE_PUBLIC
  const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
  _VTE_PUBLIC
@@ -1115,7 +1003,7 @@ index 1e926166..f81133e4 100644
  _VTE_PUBLIC
  const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
 diff --git a/src/vtegtk.cc b/src/vtegtk.cc
-index 4cc1b939..4544d9a0 100644
+index 54ed6fc1..b2ec8f40 100644
 --- a/src/vtegtk.cc
 +++ b/src/vtegtk.cc
 @@ -942,6 +942,12 @@ try
@@ -1131,7 +1019,7 @@ index 4cc1b939..4544d9a0 100644
                  case PROP_CURRENT_DIRECTORY_URI:
                          g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal));
                          break;
-@@ -2357,6 +2363,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
+@@ -2393,6 +2399,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
                                       NULL,
                                       (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
  
@@ -1159,7 +1047,7 @@ index 4cc1b939..4544d9a0 100644
          /**
           * VteTerminal:current-directory-uri:
           *
-@@ -4869,6 +4896,56 @@ catch (...)
+@@ -5022,6 +5049,56 @@ catch (...)
          return -1;
  }
  
@@ -1217,7 +1105,7 @@ index 4cc1b939..4544d9a0 100644
   * vte_terminal_get_current_directory_uri:
   * @terminal: a #VteTerminal
 diff --git a/src/vtegtk.hh b/src/vtegtk.hh
-index cee56b65..e41f2f3a 100644
+index c66aeda2..cf572de4 100644
 --- a/src/vtegtk.hh
 +++ b/src/vtegtk.hh
 @@ -72,6 +72,8 @@ enum {
@@ -1230,7 +1118,7 @@ index cee56b65..e41f2f3a 100644
          PROP_CURRENT_FILE_URI,
          PROP_DELETE_BINDING,
 diff --git a/src/vteinternal.hh b/src/vteinternal.hh
-index 5c1a5e50..f3821475 100644
+index d4a10935..0f219dc6 100644
 --- a/src/vteinternal.hh
 +++ b/src/vteinternal.hh
 @@ -59,6 +59,7 @@
@@ -1241,7 +1129,7 @@ index 5c1a5e50..f3821475 100644
  #include <string>
  #include <variant>
  #include <vector>
-@@ -110,6 +111,18 @@ typedef enum _VteCharacterReplacement {
+@@ -114,6 +115,18 @@ typedef enum _VteCharacterReplacement {
          VTE_CHARACTER_REPLACEMENT_LINE_DRAWING
  } VteCharacterReplacement;
  
@@ -1260,7 +1148,7 @@ index 5c1a5e50..f3821475 100644
  typedef struct _VtePaletteColor {
  	struct {
  		vte::color::rgb color;
-@@ -664,6 +677,8 @@ public:
+@@ -689,6 +702,8 @@ public:
          gboolean m_cursor_moved_pending;
          gboolean m_contents_changed_pending;
  
@@ -1269,7 +1157,7 @@ index 5c1a5e50..f3821475 100644
          /* desktop notification */
          std::string m_notification_summary;
          std::string m_notification_body;
-@@ -684,6 +699,7 @@ public:
+@@ -709,6 +724,7 @@ public:
                  NOTIFICATION = 1u << 3,
                  SHELL_PREEXEC = 1u << 4,
                  SHELL_PRECMD = 1u << 5,
@@ -1278,7 +1166,7 @@ index 5c1a5e50..f3821475 100644
          unsigned m_pending_changes{0};
  
 diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 35eff3dd..d0f206be 100644
+index fb958962..5b36dd9b 100644
 --- a/src/vteseq.cc
 +++ b/src/vteseq.cc
 @@ -19,10 +19,14 @@
@@ -1296,7 +1184,7 @@ index 35eff3dd..d0f206be 100644
  #ifdef HAVE_SYS_SYSLIMITS_H
  #include <sys/syslimits.h>
  #endif
-@@ -1384,6 +1388,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
+@@ -1416,6 +1420,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
          if (token == endtoken)
                  return;
  
@@ -1386,10 +1274,10 @@ index 35eff3dd..d0f206be 100644
                  ++token;
  
 -- 
-2.33.1
+2.37.1
 
 
-From 70c33c909b2ded3536a0f318c503df27bbd94722 Mon Sep 17 00:00:00 2001
+From 09b7ad967e395ef95f3428982596a2d80a0097e1 Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Tue, 16 Feb 2021 16:30:44 +0100
 Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region
@@ -1405,10 +1293,10 @@ This reverts commit 73713ec0644e232fb740170e399282be778d97f9.
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/src/vte.cc b/src/vte.cc
-index d32e8eb7..aa246e5e 100644
+index fca21ddf..eeb29eab 100644
 --- a/src/vte.cc
 +++ b/src/vte.cc
-@@ -6555,10 +6555,7 @@ Terminal::maybe_end_selection()
+@@ -6566,10 +6566,7 @@ Terminal::maybe_end_selection()
  /*
   * Terminal::select_all:
   *
@@ -1420,7 +1308,7 @@ index d32e8eb7..aa246e5e 100644
   */
  void
  Terminal::select_all()
-@@ -6567,8 +6564,8 @@ Terminal::select_all()
+@@ -6578,8 +6575,8 @@ Terminal::select_all()
  
  	m_selecting_had_delta = TRUE;
  
@@ -1432,5 +1320,5 @@ index d32e8eb7..aa246e5e 100644
  	_vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n");
  
 -- 
-2.33.1
+2.37.1