diff --git a/.gitignore b/.gitignore index cf9c907..1eb86d2 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /vte-0.66.0.tar.bz2 /vte-0.66.1.tar.bz2 /vte-0.66.2.tar.xz +/vte-0.67.90.tar.xz diff --git a/sources b/sources index 0322a4a..620f98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.66.2.tar.xz) = 6e89947f22c866a79270c700f761ec393ed8337557d4c6a90f3b7ba61caf7189406ab7731142754c99f121add6b483063d1b21e7791d2db148ad37abb7b525b9 +SHA512 (vte-0.67.90.tar.xz) = 867a3dfe9300a7ff691185e72195e3550c29d52022dc87428036d69f36710747ba2d76f26f989a9ed9b5c18ddb30464f4d42041e06264154143684ffb6949c10 diff --git a/vte291-0.66.2-vala-accessibility.patch b/vte291-0.66.2-vala-accessibility.patch deleted file mode 100644 index 0974708..0000000 --- a/vte291-0.66.2-vala-accessibility.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 069b68f393c46ebfc6734708f1446419ceed95da Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 1 Dec 2021 08:21:36 +0100 -Subject: [PATCH] vala: Fix accessibility of constant intializer expression - ---- - bindings/vala/app.vala | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 8ab27e5a..faaefe47 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -822,11 +822,11 @@ class App : Gtk.Application - { - public static bool audible = false; - public static string? command = null; -- private static string? cjk_ambiguous_width_string = null; -- private static string? cursor_blink_mode_string = null; -- private static string? cursor_background_color_string = null; -- private static string? cursor_foreground_color_string = null; -- private static string? cursor_shape_string = null; -+ public static string? cjk_ambiguous_width_string = null; -+ public static string? cursor_blink_mode_string = null; -+ public static string? cursor_background_color_string = null; -+ public static string? cursor_foreground_color_string = null; -+ public static string? cursor_shape_string = null; - public static string[]? dingus = null; - public static bool debug = false; - public static string? encoding = null; -@@ -834,8 +834,8 @@ class App : Gtk.Application - public static int extra_margin = 0; - public static string? font_string = null; - public static string? geometry = null; -- private static string? hl_bg_color_string = null; -- private static string? hl_fg_color_string = null; -+ public static string? hl_bg_color_string = null; -+ public static string? hl_fg_color_string = null; - public static string? icon_title = null; - public static bool keep = false; - public static bool no_argb_visual = false; --- -GitLab - diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 888acae..6032d7a 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,7 +1,107 @@ -From baa3752d4479336135d199b83ac3016fd1f71918 Mon Sep 17 00:00:00 2001 +From e723a6fa96bc50effbd046a2c2419cc51b3cc8c1 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Sat, 12 Feb 2022 21:10:08 +0100 +Subject: [PATCH 01/12] Revert "emulation: Support XTVERSION sequence" + +This reverts commit 0718a9a7f9300b2526eddb0fc74e25eef34795ba. + +Issue #235 shows commiting this was premature and there's more discussion needed. +--- + src/parser-reply.hh | 1 - + src/parser-seq.py | 2 -- + src/vteseq.cc | 32 ++------------------------------ + 3 files changed, 2 insertions(+), 33 deletions(-) + +diff --git a/src/parser-reply.hh b/src/parser-reply.hh +index c9046b1a..1ba3022a 100644 +--- a/src/parser-reply.hh ++++ b/src/parser-reply.hh +@@ -57,7 +57,6 @@ _VTE_REPLY(DECCTR, DCS, 's', NONE, CASH, _VTE_REPLY_PARAMS({2})) /* color + _VTE_REPLY(DECAUPSS, DCS, 'u', NONE, BANG, ) /* assign user preferred supplemental set */ + _VTE_REPLY(DECCIR, DCS, 'u', NONE, CASH, _VTE_REPLY_PARAMS({1})) /* cursor information report */ + _VTE_REPLY(DECRPTUI, DCS, '|', NONE, BANG, _VTE_REPLY_STRING("7E565445") /* "~VTE" */) /* report terminal unit ID */ +-_VTE_REPLY(XTERM_DSR, DCS, '|', GT, NONE, ) /* xterm terminal version report */ + _VTE_REPLY(DECRPFK, DCS, '}', NONE, DQUOTE,) /* report function key */ + _VTE_REPLY(DECCKSR, DCS, '~', NONE, BANG, ) /* memory checksum report */ + _VTE_REPLY(DECRPAK, DCS, '~', NONE, DQUOTE,) /* report all modifiers/alphanumeric key */ +diff --git a/src/parser-seq.py b/src/parser-seq.py +index c484c0ac..8692b147 100755 +--- a/src/parser-seq.py ++++ b/src/parser-seq.py +@@ -756,8 +756,6 @@ sequences = [ + comment='select terminal id'), + seq_CSI('DECCRTST', 'q', intermediates=(Intermediate.MINUS,), flags=Flags.NOP, + comment='CRT saver time'), +- seq_CSI('XTERM_VERSION', 'q', pintro=(ParameterIntro.GT,), +- comment='request xterm version report'), + seq_CSI('DECSTBM', 'r', + comment='set top and bottom margins'), + seq_CSI('DECSKCV', 'r', intermediates=(Intermediate.SPACE,), flags=Flags.NOP, +diff --git a/src/vteseq.cc b/src/vteseq.cc +index 007ddb69..874d2405 100644 +--- a/src/vteseq.cc ++++ b/src/vteseq.cc +@@ -69,11 +69,6 @@ enum { + VTE_SGR_COLOR_SPEC_LEGACY = 5 + }; + +-inline constexpr int firmware_version() noexcept +-{ +- return (VTE_MAJOR_VERSION * 100 + VTE_MINOR_VERSION) * 100 + VTE_MICRO_VERSION; +-} +- + void + vte::parser::Sequence::print() const noexcept + { +@@ -2410,7 +2405,8 @@ Terminal::DA2(vte::parser::Sequence const& seq) + if (seq.collect1(0, 0) != 0) + return; + +- reply(seq, VTE_REPLY_DECDA2R, {65, firmware_version(), 1}); ++ int const version = (VTE_MAJOR_VERSION * 100 + VTE_MINOR_VERSION) * 100 + VTE_MICRO_VERSION; ++ reply(seq, VTE_REPLY_DECDA2R, {65, version, 1}); + } + + void +@@ -8848,30 +8844,6 @@ Terminal::XTERM_STCAP(vte::parser::Sequence const& seq) + */ + } + +-void +-Terminal::XTERM_VERSION(vte::parser::Sequence const& seq) +-{ +- /* +- * XTERM_VERSION - xterm request version report +- * +- * Returns the xterm name and version as XTERM_DSR. +- * +- * Arguments: +- * args[0]: select function +- * 0: report xterm name and version +- * +- * Defaults: +- * args[0]: no defaults +- * +- * References: XTERM +- */ +- +- if (seq.collect1(0) != 0) +- return; +- +- reply(seq, VTE_REPLY_XTERM_DSR, {}, "VTE(%d)", firmware_version()); +-} +- + void + Terminal::XTERM_WM(vte::parser::Sequence const& seq) + { +-- +2.35.1 + + +From 90c5ba23a1fca5553c453f07ec010700eb2c70f2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 -Subject: [PATCH 01/11] Add sequences and signals for desktop notification +Subject: [PATCH 02/12] Add sequences and signals for desktop notification Add sequences OSC 777 ; notify ; SUMMARY ; BODY BEL @@ -36,10 +136,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 8b75883f..05cc5589 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals() +@@ -10032,6 +10032,14 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -55,23 +155,25 @@ 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 41f153d0..1e9a737a 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 05b82294..a09a2f75 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -1242,6 +1242,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -122,10 +224,10 @@ index 6b7a1ea2..8ba10395 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 77843507..b4dfb2a4 100644 +index eb95ad68..69a32276 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -663,6 +663,10 @@ public: +@@ -660,6 +660,10 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -136,7 +238,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: +@@ -673,6 +677,7 @@ public: TITLE = 1u << 0, CWD = 1u << 1, CWF = 1u << 2, @@ -155,7 +257,7 @@ 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 874d2405..537e8e13 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1376,6 +1376,33 @@ Terminal::delete_lines(vte::grid::row_t param) @@ -192,7 +294,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) +@@ -6541,6 +6568,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; @@ -203,7 +305,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) +@@ -6582,7 +6613,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,13 +314,13 @@ index 0a45c9b4..1a6bdc11 100644 default: break; -- -2.33.1 +2.35.1 -From 8cb45a1e47b4406343f5748bbedad3f694c36b60 Mon Sep 17 00:00:00 2001 +From 4f2b191321033a1ac5ee49f10bf7290b07dc0af1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 -Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND +Subject: [PATCH 03/12] vte.sh: Emit OSC 777 from PROMPT_COMMAND For some reason, the three consecutive backslashes break the parsing. As Christian Persch suggested, replacing the double quotes with @@ -248,13 +350,13 @@ index 242d6c42..50242223 100644 } -- -2.33.1 +2.35.1 -From bb722e49ee14906def24bac9bd0d4e594d71a3ce Mon Sep 17 00:00:00 2001 +From 1481641c0596217b6ca7f73243a5c5048202e10b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 -Subject: [PATCH 03/11] Test the notification-received signal +Subject: [PATCH 04/12] Test the notification-received signal --- bindings/vala/app.vala | 7 +++++++ @@ -262,7 +364,7 @@ Subject: [PATCH 03/11] Test the notification-received signal 2 files changed, 17 insertions(+) diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 8ab27e5a..025f971b 100644 +index 4bcb5804..06546440 100644 --- a/bindings/vala/app.vala +++ b/bindings/vala/app.vala @@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow @@ -287,10 +389,10 @@ index 8ab27e5a..025f971b 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 3beff861..00a3e3b2 100644 +index 3b7835aa..fc8220a5 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2205,6 +2205,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -2209,6 +2209,14 @@ window_window_title_changed_cb(VteTerminal* terminal, gtk_window_set_title(GTK_WINDOW(window), title && title[0] ? title : "Terminal"); } @@ -305,7 +407,7 @@ index 3beff861..00a3e3b2 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2501,6 +2509,8 @@ vteapp_window_constructed(GObject *object) +@@ -2505,6 +2513,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -315,13 +417,13 @@ index 3beff861..00a3e3b2 100644 #if VTE_GTK == 3 if (options.no_double_buffer) { -- -2.33.1 +2.35.1 -From 005e6d651cddca7145ca895a3ddf0bd19764454f Mon Sep 17 00:00:00 2001 +From e86c937f6d8f03930d97b942a13df4acd9bef92a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 -Subject: [PATCH 04/11] Add a property to configure the scroll speed +Subject: [PATCH 05/12] Add a property to configure the scroll speed By default, it is set to zero which gives the current behaviour of moving the buffer by a function of the number of visible rows. @@ -337,10 +439,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380 6 files changed, 77 insertions(+), 1 deletion(-) diff --git a/doc/reference/vte-sections.txt.in b/doc/reference/vte-sections.txt.in -index 1180f972..f097d4b9 100644 +index 283dd056..64907389 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 +@@ -58,6 +58,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 @@ -349,10 +451,10 @@ index 1180f972..f097d4b9 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index f39578ac..f027ce3b 100644 +index 05cc5589..a4e6069d 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9289,6 +9289,7 @@ vte_cairo_get_clip_region(cairo_t *cr) +@@ -9239,6 +9239,7 @@ vte_cairo_get_clip_region(cairo_t *cr) bool Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) { @@ -360,7 +462,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) +@@ -9273,7 +9274,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) return true; } @@ -375,7 +477,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 +@@ -9583,6 +9590,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -393,10 +495,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 1e9a737a..b63967a3 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 +510,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 a09a2f75..ab1de923 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -993,6 +993,9 @@ try @@ -453,7 +555,7 @@ index 04eceea1..7e405a39 100644 /** * VteTerminal:scrollback-lines: * -@@ -5666,6 +5687,36 @@ catch (...) +@@ -5726,6 +5747,36 @@ catch (...) return -1; } @@ -503,10 +605,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 69a32276..d3e25179 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -429,6 +429,7 @@ public: +@@ -426,6 +426,7 @@ public: bool m_fallback_scrolling{true}; bool m_scroll_on_output{false}; bool m_scroll_on_keystroke{true}; @@ -523,13 +625,13 @@ index b4dfb2a4..2da56ebd 100644 bool set_fallback_scrolling(bool set); auto fallback_scrolling() const noexcept { return m_fallback_scrolling; } -- -2.33.1 +2.35.1 -From dd4f63266f88bcb403513e14fc84e61a2a8e0656 Mon Sep 17 00:00:00 2001 +From a1da65e5390c1dfdd201a29c912181712de2e9d6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 -Subject: [PATCH 05/11] Test the scroll-speed property +Subject: [PATCH 06/12] Test the scroll-speed property https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- @@ -538,7 +640,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380 2 files changed, 8 insertions(+) diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 025f971b..51b5d641 100644 +index 06546440..552a702d 100644 --- a/bindings/vala/app.vala +++ b/bindings/vala/app.vala @@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow @@ -567,10 +669,10 @@ index 025f971b..51b5d641 100644 "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 fc8220a5..c6f5cc0b 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -116,6 +116,7 @@ public: +@@ -118,6 +118,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -578,7 +680,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: +@@ -620,6 +621,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 +689,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) +@@ -2549,6 +2552,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,13 +698,13 @@ 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.35.1 -From 145bbaedfe0dbd2102ca38acff53e749666c612a Mon Sep 17 00:00:00 2001 +From f7fafa786a3b6e5568eefab7ad318594813aa4d5 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 -Subject: [PATCH 06/11] Support preexec notifications from an interactive shell +Subject: [PATCH 07/12] Support preexec notifications from an interactive shell Add sequences OSC 777 ; preexec BEL @@ -628,10 +730,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 a4e6069d..6d8ab2bb 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10107,6 +10107,12 @@ Terminal::emit_pending_signals() +@@ -10057,6 +10057,12 @@ Terminal::emit_pending_signals() m_notification_body.c_str()); } @@ -661,23 +763,25 @@ 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 b63967a3..062b6694 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 ab1de923..a4d51bfb 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -725,10 +829,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 d3e25179..b4f1b4c9 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -682,6 +682,7 @@ public: +@@ -679,6 +679,7 @@ public: CWD = 1u << 1, CWF = 1u << 2, NOTIFICATION = 1u << 3, @@ -737,7 +841,7 @@ index 2da56ebd..041a9a81 100644 unsigned m_pending_changes{0}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 1a6bdc11..84341cda 100644 +index 537e8e13..dbc6276f 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1401,6 +1401,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -752,13 +856,13 @@ index 1a6bdc11..84341cda 100644 bool -- -2.33.1 +2.35.1 -From a6b24e55d1da9ffc35defa6c4d4cb4b16fc50814 Mon Sep 17 00:00:00 2001 +From 9921679046106711276fe5304bc2d04b71553dec Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 -Subject: [PATCH 07/11] Test the shell-preexec signal +Subject: [PATCH 08/12] Test the shell-preexec signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 @@ -768,7 +872,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 2 files changed, 13 insertions(+) diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 51b5d641..3975b988 100644 +index 552a702d..cc30f9ad 100644 --- a/bindings/vala/app.vala +++ b/bindings/vala/app.vala @@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow @@ -792,10 +896,10 @@ index 51b5d641..3975b988 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index a6f209bb..002db773 100644 +index c6f5cc0b..33a9481e 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2216,6 +2216,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -808,7 +912,7 @@ index a6f209bb..002db773 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2513,6 +2519,7 @@ vteapp_window_constructed(GObject *object) +@@ -2517,6 +2523,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,13 +921,13 @@ index a6f209bb..002db773 100644 /* Settings */ #if VTE_GTK == 3 -- -2.33.1 +2.35.1 -From a21192aa95629c59fdf1ca2e214b194ceac34fa0 Mon Sep 17 00:00:00 2001 +From 9a9c9b064447d50b0ebcd4c87284f68dc5414158 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 -Subject: [PATCH 08/11] Support precmd notifications from an interactive shell +Subject: [PATCH 09/12] Support precmd notifications from an interactive shell Add sequences OSC 777 ; precmd BEL @@ -841,18 +945,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 6d8ab2bb..e8a344ee 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10113,6 +10113,12 @@ Terminal::emit_pending_signals() +@@ -10063,6 +10063,12 @@ Terminal::emit_pending_signals() g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0); } @@ -879,24 +983,27 @@ index 01b44e23..877fe93d 100644 } diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 2b277e05..1e926166 100644 +index 062b6694..ed08880d 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 a4d51bfb..7020c2af 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -944,10 +1051,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 b4f1b4c9..eabc0062 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -683,6 +683,7 @@ public: +@@ -680,6 +680,7 @@ public: CWF = 1u << 2, NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, @@ -956,7 +1063,7 @@ index 041a9a81..5c1a5e50 100644 unsigned m_pending_changes{0}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 84341cda..35eff3dd 100644 +index dbc6276f..4de2a6f1 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1402,7 +1402,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -971,13 +1078,13 @@ index 84341cda..35eff3dd 100644 } } -- -2.33.1 +2.35.1 -From 92f19ab6d981507e6d348c45802701e7cd8b0503 Mon Sep 17 00:00:00 2001 +From 5a57ad11947fbffc2c70a46e4e99941fc9e7b22a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 -Subject: [PATCH 09/11] Test the shell-precmd signal +Subject: [PATCH 10/12] Test the shell-precmd signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 @@ -987,7 +1094,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 2 files changed, 13 insertions(+) diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 3975b988..ff5fb5df 100644 +index cc30f9ad..ecc4b769 100644 --- a/bindings/vala/app.vala +++ b/bindings/vala/app.vala @@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow @@ -1011,10 +1118,10 @@ index 3975b988..ff5fb5df 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index 002db773..dde27c9a 100644 +index 33a9481e..d30f8bd7 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2216,6 +2216,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1027,7 +1134,7 @@ index 002db773..dde27c9a 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -2519,6 +2525,7 @@ vteapp_window_constructed(GObject *object) +@@ -2523,6 +2529,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,13 +1143,13 @@ index 002db773..dde27c9a 100644 /* Settings */ -- -2.33.1 +2.35.1 -From 66afaa0b1eae0d55264068aadf689cd2d23d00a3 Mon Sep 17 00:00:00 2001 +From 5626cd2154d3c8ce63f679d876468ca776cc2279 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 -Subject: [PATCH 10/11] Support tracking the active container inside the +Subject: [PATCH 11/12] Support tracking the active container inside the terminal Add sequences @@ -1081,10 +1188,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 e8a344ee..a3ca5108 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10132,6 +10132,14 @@ Terminal::emit_pending_signals() +@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals() m_window_title_pending.clear(); } @@ -1100,7 +1207,7 @@ 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 ed08880d..d25eb93a 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 @@ -1115,7 +1222,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 7020c2af..2ee5b029 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -942,6 +942,12 @@ try @@ -1159,7 +1266,7 @@ index 4cc1b939..4544d9a0 100644 /** * VteTerminal:current-directory-uri: * -@@ -4869,6 +4896,56 @@ catch (...) +@@ -4929,6 +4956,56 @@ catch (...) return -1; } @@ -1230,7 +1337,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 eabc0062..dcb6a6fc 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -59,6 +59,7 @@ @@ -1260,7 +1367,7 @@ index 5c1a5e50..f3821475 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -664,6 +677,8 @@ public: +@@ -661,6 +674,8 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1269,7 +1376,7 @@ index 5c1a5e50..f3821475 100644 /* desktop notification */ std::string m_notification_summary; std::string m_notification_body; -@@ -684,6 +699,7 @@ public: +@@ -681,6 +696,7 @@ public: NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, SHELL_PRECMD = 1u << 5, @@ -1278,7 +1385,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 4de2a6f1..18c0d89c 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -19,10 +19,14 @@ @@ -1386,13 +1493,13 @@ index 35eff3dd..d0f206be 100644 ++token; -- -2.33.1 +2.35.1 -From 70c33c909b2ded3536a0f318c503df27bbd94722 Mon Sep 17 00:00:00 2001 +From 00055475b4238ed9089faf745ba56e652f97bbc3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 16 Feb 2021 16:30:44 +0100 -Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region +Subject: [PATCH 12/12] Revert "widget: Limit select-all to the writable region not including the scrollback" ... as decided by Fedora Workstation WG. @@ -1405,10 +1512,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 a3ca5108..1834b090 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -6555,10 +6555,7 @@ Terminal::maybe_end_selection() +@@ -6497,10 +6497,7 @@ Terminal::maybe_end_selection() /* * Terminal::select_all: * @@ -1420,7 +1527,7 @@ index d32e8eb7..aa246e5e 100644 */ void Terminal::select_all() -@@ -6567,8 +6564,8 @@ Terminal::select_all() +@@ -6509,8 +6506,8 @@ Terminal::select_all() m_selecting_had_delta = TRUE; @@ -1432,5 +1539,5 @@ index d32e8eb7..aa246e5e 100644 _vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n"); -- -2.33.1 +2.35.1 diff --git a/vte291.spec b/vte291.spec index b00fd92..fe71e9f 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,22 +10,20 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.66.2 -Release: 2%{?dist} +Version: 0.67.90 +Release: 1%{?dist} Summary: Terminal emulator library # libvte-2.91.so is generated from LGPLv2+ and MIT sources License: LGPLv3+ and MIT URL: https://wiki.gnome.org/Apps/Terminal/VTE -Source0: https://download.gnome.org/sources/vte/0.66/vte-%{version}.tar.xz +Source0: https://download.gnome.org/sources/vte/0.67/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 # https://pagure.io/fedora-workstation/issue/216 Patch0: vte291-cntnr-precmd-preexec-scroll.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2047106 -Patch1: vte291-0.66.2-vala-accessibility.patch BuildRequires: pkgconfig(fribidi) >= %{fribidi_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} @@ -133,6 +131,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Thu Feb 17 2022 David King - 0.67.90-1 +- Update to 0.67.90 + * Thu Jan 27 2022 David King - 0.66.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild