From 8beb9e47477c90e97e6ee4c2f1d153253daf99a8 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 19 Feb 2020 16:51:38 +0100 Subject: [PATCH 01/13] Update to 0.59.0 - Rebase downstream patches --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 184 +++++++++++------------ vte291.spec | 10 +- 4 files changed, 101 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index 9f13573..c07a9d0 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /vte-0.58.1.tar.xz /vte-0.58.2.tar.xz /vte-0.58.3.tar.xz +/vte-0.59.0.tar.xz diff --git a/sources b/sources index 401de7a..5136aa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.58.3.tar.xz) = b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a +SHA512 (vte-0.59.0.tar.xz) = 533d1e87a699137a33a6ddb82bf0f010925ba578974e1f6c87bae0b497309dd84c3cb2f5f6884f34f7fbcfad94fbaa07eb3a80387ee9f16b5f3f0ea2679e7376 diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 2a9267f..a20c1b2 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From 71e9d26cb88f0837ce1e2f3a4d4ac001aae5365e Mon Sep 17 00:00:00 2001 +From c40936e82cf274b1fe828ec5f3ac2cc5acd6a6cf Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/10] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index e7815b4446d1..d5fc77536e54 100644 +index 45d480c83f67..afc394c6f633 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10696,6 +10696,15 @@ Terminal::emit_pending_signals() +@@ -10427,6 +10427,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -56,7 +56,7 @@ index e7815b4446d1..d5fc77536e54 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 18ac0714244a..ea5c9313162a 100644 +index cf02367d1a18..4c69e37cf7d5 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -104,8 +104,10 @@ struct _VteTerminalClass { @@ -72,10 +72,10 @@ index 18ac0714244a..ea5c9313162a 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index c18a178af178..92ff9d07752d 100644 +index fe5d1c4134f9..12c37e5c56a8 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -739,6 +739,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -729,6 +729,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -83,7 +83,7 @@ index c18a178af178..92ff9d07752d 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -820,6 +821,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -810,6 +811,26 @@ vte_terminal_class_init(VteTerminalClass *klass) G_OBJECT_CLASS_TYPE(klass), g_cclosure_marshal_VOID__INTv); @@ -123,10 +123,10 @@ index e2515b3491ae..c175f6d7b06f 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index b0b6239e38e3..554a4506f49f 100644 +index 17d1c4db4fe8..a5df13416d6e 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -560,6 +560,11 @@ public: +@@ -631,6 +631,11 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -138,7 +138,7 @@ index b0b6239e38e3..554a4506f49f 100644 std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -1313,6 +1318,9 @@ public: +@@ -1381,6 +1386,9 @@ public: int osc) noexcept; /* OSC handlers */ @@ -149,10 +149,10 @@ index b0b6239e38e3..554a4506f49f 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 9ee154778974..3688462478e5 100644 +index 771a413b07df..932964a1b19e 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1398,6 +1398,33 @@ Terminal::delete_lines(vte::grid::row_t param) +@@ -1397,6 +1397,33 @@ Terminal::delete_lines(vte::grid::row_t param) m_text_deleted_flag = TRUE; } @@ -186,7 +186,7 @@ index 9ee154778974..3688462478e5 100644 bool Terminal::get_osc_color_index(int osc, int value, -@@ -6488,6 +6515,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6487,6 +6514,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; @@ -197,7 +197,7 @@ index 9ee154778974..3688462478e5 100644 case VTE_OSC_XTERM_SET_ICON_TITLE: case VTE_OSC_XTERM_SET_XPROPERTY: case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG: -@@ -6528,7 +6559,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6527,7 +6558,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: @@ -206,10 +206,10 @@ index 9ee154778974..3688462478e5 100644 default: break; -- -2.20.1 +2.24.1 -From 92222d93d5a51a3bfa232b2b99c80303abbaa699 Mon Sep 17 00:00:00 2001 +From 7dc608083309754da4f6801657ea42709609dbea Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -242,10 +242,10 @@ index c200493c34a6..ee010aa36505 100644 case "$TERM" in -- -2.20.1 +2.24.1 -From a6802affd1e2d8e1869312221e4be55b2b458d28 Mon Sep 17 00:00:00 2001 +From 1bf1f20f1d6fe60f0d1898011fe7c3e21a5c55c1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/10] Test the notification-received signal @@ -281,10 +281,10 @@ index fc26c2b0dfc3..634b8ddeeb91 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index d845b5ce26a4..90148baf34e3 100644 +index 5e9f852f19be..cc8aaee14265 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1679,6 +1679,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1673,6 +1673,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -299,20 +299,20 @@ index d845b5ce26a4..90148baf34e3 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1907,6 +1915,8 @@ vteapp_window_constructed(GObject *object) +@@ -1901,6 +1909,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) 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); + /* Settings */ - if (options.no_double_buffer) - gtk_widget_set_double_buffered(GTK_WIDGET(window->terminal), false); + if (options.no_double_buffer) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; -- -2.20.1 +2.24.1 -From 0903623fab2a9d3b4653014e44a7dd717c162b7f Mon Sep 17 00:00:00 2001 +From bb1b7dba7b0137aa64443332025765a6a02f4d82 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/10] Add a property to configure the scroll speed @@ -343,10 +343,10 @@ index 8b67f28359a4..b6a5fcfc2779 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index d5fc77536e54..8ca4ca03bcfb 100644 +index afc394c6f633..454bf3a7da23 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9901,6 +9901,7 @@ void +@@ -9632,6 +9632,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,7 +354,7 @@ index d5fc77536e54..8ca4ca03bcfb 100644 gdouble v; gint cnt, i; int button; -@@ -9957,7 +9958,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9688,7 +9689,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } @@ -369,7 +369,7 @@ index d5fc77536e54..8ca4ca03bcfb 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -10254,6 +10261,16 @@ Terminal::decscusr_cursor_shape() +@@ -9985,6 +9992,16 @@ Terminal::decscusr_cursor_shape() } } @@ -387,7 +387,7 @@ index d5fc77536e54..8ca4ca03bcfb 100644 Terminal::set_scrollback_lines(long lines) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index ea5c9313162a..90e3e05153a3 100644 +index 4c69e37cf7d5..af9818d6447b 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -291,6 +291,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, @@ -402,10 +402,10 @@ index ea5c9313162a..90e3e05153a3 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 92ff9d07752d..eb754969ac40 100644 +index 12c37e5c56a8..570da86dc39d 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -523,6 +523,9 @@ vte_terminal_get_property (GObject *object, +@@ -519,6 +519,9 @@ vte_terminal_get_property (GObject *object, case PROP_REWRAP_ON_RESIZE: g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal)); break; @@ -415,7 +415,7 @@ index 92ff9d07752d..eb754969ac40 100644 case PROP_SCROLLBACK_LINES: g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal)); break; -@@ -630,6 +633,9 @@ vte_terminal_set_property (GObject *object, +@@ -626,6 +629,9 @@ vte_terminal_set_property (GObject *object, case PROP_REWRAP_ON_RESIZE: vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value)); break; @@ -425,7 +425,7 @@ index 92ff9d07752d..eb754969ac40 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -1693,6 +1699,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1684,6 +1690,21 @@ vte_terminal_class_init(VteTerminalClass *klass) TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -447,7 +447,7 @@ index 92ff9d07752d..eb754969ac40 100644 /** * VteTerminal:scrollback-lines: * -@@ -4335,6 +4356,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4326,6 +4347,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -491,7 +491,7 @@ index c175f6d7b06f..5541e8a4f875 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 554a4506f49f..1dd2467c9bc7 100644 +index a5df13416d6e..e34a4c57cfaf 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -423,6 +423,7 @@ public: @@ -502,7 +502,7 @@ index 554a4506f49f..1dd2467c9bc7 100644 vte::grid::row_t m_scrollback_lines; /* Restricted scrolling */ -@@ -1191,6 +1192,7 @@ public: +@@ -1259,6 +1260,7 @@ public: bool set_pty(VtePty *pty, bool proces_remaining = true); bool set_rewrap_on_resize(bool rewrap); @@ -511,10 +511,10 @@ index 554a4506f49f..1dd2467c9bc7 100644 bool set_scroll_on_keystroke(bool scroll); bool set_scroll_on_output(bool scroll); -- -2.20.1 +2.24.1 -From 09dfe4cb1a05299526646b030be90647a88e6a7b Mon Sep 17 00:00:00 2001 +From 1d6ddc80ea7b9daa02d45f478ee99e1bc82792bf Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/10] Test the scroll-speed property @@ -555,7 +555,7 @@ index 634b8ddeeb91..c984b868246d 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 90148baf34e3..2636defdef8f 100644 +index cc8aaee14265..218fd7a9e8d8 100644 --- a/src/app/app.cc +++ b/src/app/app.cc @@ -95,6 +95,7 @@ public: @@ -575,7 +575,7 @@ index 90148baf34e3..2636defdef8f 100644 { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, "Specify the number of scrollback-lines (-1 for infinite)", nullptr }, { "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent, -@@ -1947,6 +1950,7 @@ vteapp_window_constructed(GObject *object) +@@ -1944,6 +1947,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); @@ -584,10 +584,10 @@ index 90148baf34e3..2636defdef8f 100644 vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode); -- -2.20.1 +2.24.1 -From be6f135af60af8b2699d507d5a74d8753d4a61cc Mon Sep 17 00:00:00 2001 +From 88fb27490d87bfb9daf669ea555ed0a679ce98cf Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -620,10 +620,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 8ca4ca03bcfb..eb3cd6b33c7f 100644 +index 454bf3a7da23..4d64f69f15dc 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10722,6 +10722,13 @@ Terminal::emit_pending_signals() +@@ -10453,6 +10453,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -651,7 +651,7 @@ index ee010aa36505..ee424ce70521 100644 ;; esac diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 90e3e05153a3..3db163051077 100644 +index af9818d6447b..57f00989d4f6 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -105,9 +105,10 @@ struct _VteTerminalClass { @@ -667,10 +667,10 @@ index 90e3e05153a3..3db163051077 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index eb754969ac40..cc502bf495d8 100644 +index 570da86dc39d..858fea4b2e50 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -746,6 +746,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -736,6 +736,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -678,7 +678,7 @@ index eb754969ac40..cc502bf495d8 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -847,6 +848,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -837,6 +838,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -715,10 +715,10 @@ index 5541e8a4f875..a4d9ac8ae1c5 100644 SIGNAL_TEXT_INSERTED, SIGNAL_TEXT_MODIFIED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 1dd2467c9bc7..d2c49becaeae 100644 +index e34a4c57cfaf..774eff8870a2 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -566,6 +566,8 @@ public: +@@ -637,6 +637,8 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -728,10 +728,10 @@ index 1dd2467c9bc7..d2c49becaeae 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 3688462478e5..28de93f5b3af 100644 +index 932964a1b19e..3b82d914c544 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1423,6 +1423,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1422,6 +1422,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, m_notification_body = *token; return; } @@ -743,10 +743,10 @@ index 3688462478e5..28de93f5b3af 100644 bool -- -2.20.1 +2.24.1 -From e2b0e5ead4c1512bf06c887ad6d4c1af537fa353 Mon Sep 17 00:00:00 2001 +From 6d5a0397ed1023deb0c42bcfa74166f42e034a2c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -783,10 +783,10 @@ index c984b868246d..83af686be106 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 2636defdef8f..2d0c48576643 100644 +index 218fd7a9e8d8..267ad650844c 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1690,6 +1690,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1684,6 +1684,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -799,19 +799,19 @@ index 2636defdef8f..2d0c48576643 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1919,6 +1925,7 @@ vteapp_window_constructed(GObject *object) +@@ -1913,6 +1919,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); + g_signal_connect(window->terminal, "shell-preexec", G_CALLBACK(shell_preexec_cb), NULL); /* Settings */ - if (options.no_double_buffer) + if (options.no_double_buffer) { -- -2.20.1 +2.24.1 -From bbec4f9fe8d0387be88edf6ef2f16ef029adfd59 Mon Sep 17 00:00:00 2001 +From f17c99d8727513c643c8380097bf1690b519b369 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -840,10 +840,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index eb3cd6b33c7f..d427f0995b2b 100644 +index 4d64f69f15dc..0e6dbdf13e68 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10729,6 +10729,13 @@ Terminal::emit_pending_signals() +@@ -10460,6 +10460,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -871,7 +871,7 @@ index ee424ce70521..331bfec3d3ba 100644 case "$TERM" in diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 3db163051077..8ef9e1dcdeb4 100644 +index 57f00989d4f6..21d99e6abd93 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -105,10 +105,11 @@ struct _VteTerminalClass { @@ -888,10 +888,10 @@ index 3db163051077..8ef9e1dcdeb4 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index cc502bf495d8..b93c76d00296 100644 +index 858fea4b2e50..6c53aec2eab1 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -746,6 +746,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -736,6 +736,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -899,7 +899,7 @@ index cc502bf495d8..b93c76d00296 100644 klass->shell_preexec = NULL; klass->window_title_changed = NULL; klass->icon_title_changed = NULL; -@@ -848,6 +849,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -838,6 +839,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -936,10 +936,10 @@ index a4d9ac8ae1c5..3d46483e3a56 100644 SIGNAL_TEXT_DELETED, SIGNAL_TEXT_INSERTED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index d2c49becaeae..8dd59f237d20 100644 +index 774eff8870a2..842755f92915 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -566,6 +566,7 @@ public: +@@ -637,6 +637,7 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -948,10 +948,10 @@ index d2c49becaeae..8dd59f237d20 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 28de93f5b3af..c0bce6995093 100644 +index 3b82d914c544..d21181684a75 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1424,7 +1424,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1423,7 +1423,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, return; } @@ -963,10 +963,10 @@ index 28de93f5b3af..c0bce6995093 100644 } } -- -2.20.1 +2.24.1 -From 4767996ace813a6d5c8e1278cb5accd6005cfca1 Mon Sep 17 00:00:00 2001 +From 8e38fc8dc123a796ec5fc4202115ea9a09f5d2d8 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -1003,10 +1003,10 @@ index 83af686be106..300384f5c74b 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index 2d0c48576643..e3ec0026e1dc 100644 +index 267ad650844c..eab844eabc4a 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1690,6 +1690,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1684,6 +1684,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1019,7 +1019,7 @@ index 2d0c48576643..e3ec0026e1dc 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -1925,6 +1931,7 @@ vteapp_window_constructed(GObject *object) +@@ -1919,6 +1925,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); @@ -1028,10 +1028,10 @@ index 2d0c48576643..e3ec0026e1dc 100644 /* Settings */ -- -2.20.1 +2.24.1 -From 1470d44065d81a0d8e093b012489ba60333e8d65 Mon Sep 17 00:00:00 2001 +From 0ec82af9c13db70a3275467daff7aa268fea6348 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the @@ -1065,10 +1065,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index d427f0995b2b..2a328a37022a 100644 +index 0e6dbdf13e68..c99d19702b10 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10750,6 +10750,15 @@ Terminal::emit_pending_signals() +@@ -10481,6 +10481,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1085,10 +1085,10 @@ index d427f0995b2b..2a328a37022a 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 8ef9e1dcdeb4..a59a15a81766 100644 +index 21d99e6abd93..b55df3f76e50 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -467,6 +467,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); +@@ -462,6 +462,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); _VTE_PUBLIC const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); _VTE_PUBLIC @@ -1100,10 +1100,10 @@ index 8ef9e1dcdeb4..a59a15a81766 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index b93c76d00296..e0e50ae12907 100644 +index 6c53aec2eab1..2427e6bfd2a1 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -478,6 +478,12 @@ vte_terminal_get_property (GObject *object, +@@ -474,6 +474,12 @@ vte_terminal_get_property (GObject *object, case PROP_CURSOR_BLINK_MODE: g_value_set_enum (value, vte_terminal_get_cursor_blink_mode (terminal)); break; @@ -1116,7 +1116,7 @@ index b93c76d00296..e0e50ae12907 100644 case PROP_CURRENT_DIRECTORY_URI: g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal)); break; -@@ -1812,6 +1818,27 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1803,6 +1809,27 @@ vte_terminal_class_init(VteTerminalClass *klass) NULL, (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -1144,7 +1144,7 @@ index b93c76d00296..e0e50ae12907 100644 /** * VteTerminal:current-directory-uri: * -@@ -3704,6 +3731,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) +@@ -3699,6 +3726,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) return IMPL(terminal)->m_column_count; } @@ -1203,7 +1203,7 @@ index 3d46483e3a56..24052b15f75c 100644 PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 8dd59f237d20..be13f827a85c 100644 +index 842755f92915..20c4bcc5d900 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -41,6 +41,7 @@ @@ -1212,8 +1212,8 @@ index 8dd59f237d20..be13f827a85c 100644 #include +#include #include + #include #include - @@ -118,6 +119,18 @@ typedef enum _VteCharacterReplacement { VTE_CHARACTER_REPLACEMENT_BRITISH } VteCharacterReplacement; @@ -1233,7 +1233,7 @@ index 8dd59f237d20..be13f827a85c 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -561,6 +574,9 @@ public: +@@ -632,6 +645,9 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1244,10 +1244,10 @@ index 8dd59f237d20..be13f827a85c 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index c0bce6995093..dd64310caaf7 100644 +index d21181684a75..a521241df03f 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1406,6 +1406,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1405,6 +1405,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, if (token == endtoken) return; @@ -1286,5 +1286,5 @@ index c0bce6995093..dd64310caaf7 100644 ++token; -- -2.20.1 +2.24.1 diff --git a/vte291.spec b/vte291.spec index 75961b0..02e268d 100644 --- a/vte291.spec +++ b/vte291.spec @@ -8,13 +8,13 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.58.3 -Release: 2%{?dist} +Version: 0.59.0 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/vte/0.58/vte-%{version}.tar.xz +Source0: http://download.gnome.org/sources/vte/0.59/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 @@ -109,6 +109,10 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Wed Feb 19 2020 Debarshi Ray - 0.59.0-1 +- Update to 0.59.0 +- Rebase downstream patches + * Fri Jan 31 2020 Fedora Release Engineering - 0.58.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 46e17d738a3be09e8bb51d988079aff06085584a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 20 Feb 2020 16:10:27 +0100 Subject: [PATCH 02/13] Update the GLib and GTK requirements No need to issue a build just for this. --- vte291.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vte291.spec b/vte291.spec index 02e268d..5f8e3f1 100644 --- a/vte291.spec +++ b/vte291.spec @@ -1,9 +1,9 @@ %global apiver 2.91 %global fribidi_version 1.0.0 -%global glib2_version 2.40.0 +%global glib2_version 2.52.0 %global gnutls_version 3.2.7 -%global gtk3_version 3.19.5 +%global gtk3_version 3.20.0 %global pango_version 1.22.0 %global pcre2_version 10.21 From 60928508f27ee746760ce2f5bd4b0ccd52aee500 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 20 Feb 2020 16:04:04 +0100 Subject: [PATCH 03/13] Update to 0.59.91 - Rebase downstream patches --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 252 +++++++++++------------ vte291.spec | 16 +- 4 files changed, 143 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index c07a9d0..c26bd6d 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /vte-0.58.2.tar.xz /vte-0.58.3.tar.xz /vte-0.59.0.tar.xz +/vte-0.59.91.tar.xz diff --git a/sources b/sources index 5136aa4..d1db3d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.59.0.tar.xz) = 533d1e87a699137a33a6ddb82bf0f010925ba578974e1f6c87bae0b497309dd84c3cb2f5f6884f34f7fbcfad94fbaa07eb3a80387ee9f16b5f3f0ea2679e7376 +SHA512 (vte-0.59.91.tar.xz) = 29d4ec3afeb117427880fa377d92f5b185ccdeac58d4bbd9af3042bd30cb021fcd65e12dc7ae0e0febaff2863a2f3b17f5112144e063fb233789c097e5644d4e diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index a20c1b2..3e425e2 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From c40936e82cf274b1fe828ec5f3ac2cc5acd6a6cf Mon Sep 17 00:00:00 2001 +From e7e3b8b73367060135627028e6d148c5ba601cb7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/10] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 45d480c83f67..afc394c6f633 100644 +index c1c85f7a1f69..2e16d0cdee3e 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10427,6 +10427,15 @@ Terminal::emit_pending_signals() +@@ -10239,6 +10239,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -56,7 +56,7 @@ index 45d480c83f67..afc394c6f633 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 cf02367d1a18..4c69e37cf7d5 100644 +index 31012518362e..6ad0987d22ca 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -104,8 +104,10 @@ struct _VteTerminalClass { @@ -72,10 +72,10 @@ index cf02367d1a18..4c69e37cf7d5 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index fe5d1c4134f9..12c37e5c56a8 100644 +index 33534b4c758e..c012bf6c54d7 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -729,6 +729,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -738,6 +738,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -83,7 +83,7 @@ index fe5d1c4134f9..12c37e5c56a8 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -810,6 +811,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -819,6 +820,26 @@ vte_terminal_class_init(VteTerminalClass *klass) G_OBJECT_CLASS_TYPE(klass), g_cclosure_marshal_VOID__INTv); @@ -111,7 +111,7 @@ index fe5d1c4134f9..12c37e5c56a8 100644 * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index e2515b3491ae..c175f6d7b06f 100644 +index ae9fb08c310a..baf681e45b2c 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -56,6 +56,7 @@ enum { @@ -123,10 +123,10 @@ index e2515b3491ae..c175f6d7b06f 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 17d1c4db4fe8..a5df13416d6e 100644 +index 93e905270c29..ae4f705ea80d 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -631,6 +631,11 @@ public: +@@ -709,6 +709,11 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -138,7 +138,7 @@ index 17d1c4db4fe8..a5df13416d6e 100644 std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -1381,6 +1386,9 @@ public: +@@ -1426,6 +1431,9 @@ public: int osc) noexcept; /* OSC handlers */ @@ -149,10 +149,10 @@ index 17d1c4db4fe8..a5df13416d6e 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 771a413b07df..932964a1b19e 100644 +index f05b67e0252b..13cae0934b22 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1397,6 +1397,33 @@ Terminal::delete_lines(vte::grid::row_t param) +@@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param) m_text_deleted_flag = TRUE; } @@ -186,7 +186,7 @@ index 771a413b07df..932964a1b19e 100644 bool Terminal::get_osc_color_index(int osc, int value, -@@ -6487,6 +6514,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6464,6 +6491,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; @@ -197,7 +197,7 @@ index 771a413b07df..932964a1b19e 100644 case VTE_OSC_XTERM_SET_ICON_TITLE: case VTE_OSC_XTERM_SET_XPROPERTY: case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG: -@@ -6527,7 +6558,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6504,7 +6535,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: @@ -209,7 +209,7 @@ index 771a413b07df..932964a1b19e 100644 2.24.1 -From 7dc608083309754da4f6801657ea42709609dbea Mon Sep 17 00:00:00 2001 +From b3c6f5757073e04cf0604ba348fd69f8d0ef05de Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -220,14 +220,14 @@ singles fixes it. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/vte.sh | 4 +++- + src/vte.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/vte.sh b/src/vte.sh -index c200493c34a6..ee010aa36505 100644 ---- a/src/vte.sh -+++ b/src/vte.sh -@@ -50,10 +50,12 @@ __vte_osc7 () { +diff --git a/src/vte.sh.in b/src/vte.sh.in +index 8b3153da0f1a..d6769de82766 100644 +--- a/src/vte.sh.in ++++ b/src/vte.sh.in +@@ -27,10 +27,12 @@ __vte_osc7 () { } __vte_prompt_command() { @@ -236,16 +236,16 @@ index c200493c34a6..ee010aa36505 100644 local pwd='~' [ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/} pwd="${pwd//[[:cntrl:]]}" -- printf "\033]0;%s@%s:%s\033\\%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)" -+ printf '\033]777;notify;Command completed;%s\033\\\033]0;%s@%s:%s\033\\%s' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)" +- printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${pwd}" ++ printf '\033]777;notify;Command completed;%s\033\\\033]0;%s@%s:%s\033\\' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" + __vte_osc7 } - case "$TERM" in -- 2.24.1 -From 1bf1f20f1d6fe60f0d1898011fe7c3e21a5c55c1 Mon Sep 17 00:00:00 2001 +From afde67f33dca5651cfb31612f130caac712b9fd4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/10] Test the notification-received signal @@ -281,10 +281,10 @@ index fc26c2b0dfc3..634b8ddeeb91 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 5e9f852f19be..cc8aaee14265 100644 +index 6257c2f1c0e8..842b0408836f 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1673,6 +1673,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1636,6 +1636,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -299,7 +299,7 @@ index 5e9f852f19be..cc8aaee14265 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1901,6 +1909,8 @@ vteapp_window_constructed(GObject *object) +@@ -1864,6 +1872,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -312,7 +312,7 @@ index 5e9f852f19be..cc8aaee14265 100644 2.24.1 -From bb1b7dba7b0137aa64443332025765a6a02f4d82 Mon Sep 17 00:00:00 2001 +From 763bab8df736d7f8b812a4004f4ba2401227ce05 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/10] Add a property to configure the scroll speed @@ -331,10 +331,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt -index 8b67f28359a4..b6a5fcfc2779 100644 +index 20067c88bae3..2cc8d70ca4f9 100644 --- a/doc/reference/vte-sections.txt +++ b/doc/reference/vte-sections.txt -@@ -53,6 +53,7 @@ vte_terminal_get_cursor_blink_mode +@@ -52,6 +52,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 @@ -343,10 +343,10 @@ index 8b67f28359a4..b6a5fcfc2779 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index afc394c6f633..454bf3a7da23 100644 +index 2e16d0cdee3e..ee71d6b0f1c5 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9632,6 +9632,7 @@ void +@@ -9443,6 +9443,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,13 +354,13 @@ index afc394c6f633..454bf3a7da23 100644 gdouble v; gint cnt, i; int button; -@@ -9688,7 +9689,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9499,7 +9500,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } -- v = MAX (1., ceil (gtk_adjustment_get_page_increment (m_vadjustment) / 10.)); +- v = MAX (1., ceil (gtk_adjustment_get_page_increment (m_vadjustment.get()) / 10.)); + if (m_scroll_speed == 0) { -+ scroll_speed = ceil (gtk_adjustment_get_page_increment (m_vadjustment) / 10.); ++ scroll_speed = ceil (gtk_adjustment_get_page_increment (m_vadjustment.get()) / 10.); + } else { + scroll_speed = m_scroll_speed; + } @@ -369,7 +369,7 @@ index afc394c6f633..454bf3a7da23 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9985,6 +9992,16 @@ Terminal::decscusr_cursor_shape() +@@ -9796,6 +9803,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -387,10 +387,10 @@ index afc394c6f633..454bf3a7da23 100644 Terminal::set_scrollback_lines(long lines) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 4c69e37cf7d5..af9818d6447b 100644 +index 6ad0987d22ca..94febee1d494 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -291,6 +291,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, +@@ -287,6 +287,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, _VTE_PUBLIC VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); @@ -402,10 +402,10 @@ index 4c69e37cf7d5..af9818d6447b 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 12c37e5c56a8..570da86dc39d 100644 +index c012bf6c54d7..cbfc44670e2e 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -519,6 +519,9 @@ vte_terminal_get_property (GObject *object, +@@ -528,6 +528,9 @@ vte_terminal_get_property (GObject *object, case PROP_REWRAP_ON_RESIZE: g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal)); break; @@ -415,7 +415,7 @@ index 12c37e5c56a8..570da86dc39d 100644 case PROP_SCROLLBACK_LINES: g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal)); break; -@@ -626,6 +629,9 @@ vte_terminal_set_property (GObject *object, +@@ -635,6 +638,9 @@ vte_terminal_set_property (GObject *object, case PROP_REWRAP_ON_RESIZE: vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value)); break; @@ -425,7 +425,7 @@ index 12c37e5c56a8..570da86dc39d 100644 case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -1684,6 +1690,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1708,6 +1714,21 @@ vte_terminal_class_init(VteTerminalClass *klass) TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -447,7 +447,7 @@ index 12c37e5c56a8..570da86dc39d 100644 /** * VteTerminal:scrollback-lines: * -@@ -4326,6 +4347,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4420,6 +4441,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -479,7 +479,7 @@ index 12c37e5c56a8..570da86dc39d 100644 * vte_terminal_set_scrollback_lines: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index c175f6d7b06f..5541e8a4f875 100644 +index baf681e45b2c..a9c256635948 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -88,6 +88,7 @@ enum { @@ -491,20 +491,20 @@ index c175f6d7b06f..5541e8a4f875 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index a5df13416d6e..e34a4c57cfaf 100644 +index ae4f705ea80d..9c0b8b454468 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -423,6 +423,7 @@ public: +@@ -487,6 +487,7 @@ public: /* Scrolling options. */ - gboolean m_scroll_on_output; - gboolean m_scroll_on_keystroke; + bool m_scroll_on_output{false}; + bool m_scroll_on_keystroke{true}; + guint m_scroll_speed; - vte::grid::row_t m_scrollback_lines; + vte::grid::row_t m_scrollback_lines{0}; /* Restricted scrolling */ -@@ -1259,6 +1260,7 @@ public: - bool set_pty(VtePty *pty, - bool proces_remaining = true); +@@ -1304,6 +1305,7 @@ public: + bool set_input_enabled(bool enabled); + bool set_mouse_autohide(bool autohide); bool set_rewrap_on_resize(bool rewrap); + bool set_scroll_speed(unsigned int scroll_speed); bool set_scrollback_lines(long lines); @@ -514,7 +514,7 @@ index a5df13416d6e..e34a4c57cfaf 100644 2.24.1 -From 1d6ddc80ea7b9daa02d45f478ee99e1bc82792bf Mon Sep 17 00:00:00 2001 +From 479cff28fe58bad250b07c8cecf2cf741ed3e1ae Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/10] Test the scroll-speed property @@ -555,10 +555,10 @@ index 634b8ddeeb91..c984b868246d 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 cc8aaee14265..218fd7a9e8d8 100644 +index 842b0408836f..f40495f77ecf 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -95,6 +95,7 @@ public: +@@ -97,6 +97,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -566,16 +566,16 @@ index cc8aaee14265..218fd7a9e8d8 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -411,6 +412,8 @@ public: - "Save terminal contents to file at exit", nullptr }, - { "reverse", 0, 0, G_OPTION_ARG_NONE, &reverse, +@@ -415,6 +416,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 }, + { "scroll-speed", 0, 0, G_OPTION_ARG_INT, &scroll_speed, + "Specify the scroll speed", nullptr }, { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, "Specify the number of scrollback-lines (-1 for infinite)", nullptr }, { "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent, -@@ -1944,6 +1947,7 @@ vteapp_window_constructed(GObject *object) +@@ -1905,6 +1908,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); @@ -587,7 +587,7 @@ index cc8aaee14265..218fd7a9e8d8 100644 2.24.1 -From 88fb27490d87bfb9daf669ea555ed0a679ce98cf Mon Sep 17 00:00:00 2001 +From 5a08736420dea1ed7e784f19cf93ae19944b0aa2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -611,7 +611,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- src/vte.cc | 7 +++++++ - src/vte.sh | 2 +- + src/vte.sh.in | 2 +- src/vte/vteterminal.h | 3 ++- src/vtegtk.cc | 18 ++++++++++++++++++ src/vtegtk.hh | 1 + @@ -620,10 +620,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 454bf3a7da23..4d64f69f15dc 100644 +index ee71d6b0f1c5..6c95909b2e79 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10453,6 +10453,13 @@ Terminal::emit_pending_signals() +@@ -10265,6 +10265,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -637,11 +637,11 @@ index 454bf3a7da23..4d64f69f15dc 100644 if (m_window_title_changed) { if (m_window_title != m_window_title_pending) { m_window_title.swap(m_window_title_pending); -diff --git a/src/vte.sh b/src/vte.sh -index ee010aa36505..ee424ce70521 100644 ---- a/src/vte.sh -+++ b/src/vte.sh -@@ -60,7 +60,7 @@ __vte_prompt_command() { +diff --git a/src/vte.sh.in b/src/vte.sh.in +index d6769de82766..e4ff39e9d405 100644 +--- a/src/vte.sh.in ++++ b/src/vte.sh.in +@@ -38,7 +38,7 @@ __vte_prompt_command() { case "$TERM" in xterm*|vte*) @@ -651,7 +651,7 @@ index ee010aa36505..ee424ce70521 100644 ;; esac diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index af9818d6447b..57f00989d4f6 100644 +index 94febee1d494..2d757afbdcc0 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -105,9 +105,10 @@ struct _VteTerminalClass { @@ -667,10 +667,10 @@ index af9818d6447b..57f00989d4f6 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 570da86dc39d..858fea4b2e50 100644 +index cbfc44670e2e..83c8ebc37a1b 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -736,6 +736,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -678,7 +678,7 @@ index 570da86dc39d..858fea4b2e50 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -837,6 +838,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -846,6 +847,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -703,7 +703,7 @@ index 570da86dc39d..858fea4b2e50 100644 * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 5541e8a4f875..a4d9ac8ae1c5 100644 +index a9c256635948..79c528ea8243 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -52,6 +52,7 @@ enum { @@ -715,10 +715,10 @@ index 5541e8a4f875..a4d9ac8ae1c5 100644 SIGNAL_TEXT_INSERTED, SIGNAL_TEXT_MODIFIED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index e34a4c57cfaf..774eff8870a2 100644 +index 9c0b8b454468..dd98905860f4 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -637,6 +637,8 @@ public: +@@ -715,6 +715,8 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -728,10 +728,10 @@ index e34a4c57cfaf..774eff8870a2 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 932964a1b19e..3b82d914c544 100644 +index 13cae0934b22..cc31e9c06364 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1422,6 +1422,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, m_notification_body = *token; return; } @@ -746,7 +746,7 @@ index 932964a1b19e..3b82d914c544 100644 2.24.1 -From 6d5a0397ed1023deb0c42bcfa74166f42e034a2c Mon Sep 17 00:00:00 2001 +From e6709af27700bb9fca3d856ae7ebb4a1e2095a04 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -783,10 +783,10 @@ index c984b868246d..83af686be106 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 218fd7a9e8d8..267ad650844c 100644 +index f40495f77ecf..ce480ed70aae 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1684,6 +1684,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -799,7 +799,7 @@ index 218fd7a9e8d8..267ad650844c 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1913,6 +1919,7 @@ vteapp_window_constructed(GObject *object) +@@ -1876,6 +1882,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); @@ -811,7 +811,7 @@ index 218fd7a9e8d8..267ad650844c 100644 2.24.1 -From f17c99d8727513c643c8380097bf1690b519b369 Mon Sep 17 00:00:00 2001 +From 61810a3bfb4b059bb5d9c13896c82625d09d147c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -831,7 +831,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- src/vte.cc | 7 +++++++ - src/vte.sh | 2 +- + src/vte.sh.in | 2 +- src/vte/vteterminal.h | 3 ++- src/vtegtk.cc | 18 ++++++++++++++++++ src/vtegtk.hh | 1 + @@ -840,10 +840,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 4d64f69f15dc..0e6dbdf13e68 100644 +index 6c95909b2e79..3d6f856fb31c 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10460,6 +10460,13 @@ Terminal::emit_pending_signals() +@@ -10272,6 +10272,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -857,21 +857,21 @@ index 4d64f69f15dc..0e6dbdf13e68 100644 if (m_window_title_changed) { if (m_window_title != m_window_title_pending) { m_window_title.swap(m_window_title_pending); -diff --git a/src/vte.sh b/src/vte.sh -index ee424ce70521..331bfec3d3ba 100644 ---- a/src/vte.sh -+++ b/src/vte.sh -@@ -55,7 +55,7 @@ __vte_prompt_command() { +diff --git a/src/vte.sh.in b/src/vte.sh.in +index e4ff39e9d405..d0b88d658607 100644 +--- a/src/vte.sh.in ++++ b/src/vte.sh.in +@@ -32,7 +32,7 @@ __vte_prompt_command() { local pwd='~' [ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/} pwd="${pwd//[[:cntrl:]]}" -- printf '\033]777;notify;Command completed;%s\033\\\033]0;%s@%s:%s\033\\%s' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)" -+ printf '\033]777;notify;Command completed;%s\033\\\033]777;precmd\033\\\033]0;%s@%s:%s\033\\%s' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)" +- printf '\033]777;notify;Command completed;%s\033\\\033]0;%s@%s:%s\033\\' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" ++ printf '\033]777;notify;Command completed;%s\033\\\033]777;precmd\033\\\033]0;%s@%s:%s\033\\' "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" + __vte_osc7 } - case "$TERM" in diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 57f00989d4f6..21d99e6abd93 100644 +index 2d757afbdcc0..a75ae7ee2640 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h @@ -105,10 +105,11 @@ struct _VteTerminalClass { @@ -888,10 +888,10 @@ index 57f00989d4f6..21d99e6abd93 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 858fea4b2e50..6c53aec2eab1 100644 +index 83c8ebc37a1b..af4056299ae3 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -736,6 +736,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->encoding_changed = NULL; klass->char_size_changed = NULL; klass->notification_received = NULL; @@ -899,7 +899,7 @@ index 858fea4b2e50..6c53aec2eab1 100644 klass->shell_preexec = NULL; klass->window_title_changed = NULL; klass->icon_title_changed = NULL; -@@ -838,6 +839,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -847,6 +848,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -924,7 +924,7 @@ index 858fea4b2e50..6c53aec2eab1 100644 * VteTerminal::shell-preexec: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index a4d9ac8ae1c5..3d46483e3a56 100644 +index 79c528ea8243..534298ada75c 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -52,6 +52,7 @@ enum { @@ -936,10 +936,10 @@ index a4d9ac8ae1c5..3d46483e3a56 100644 SIGNAL_TEXT_DELETED, SIGNAL_TEXT_INSERTED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 774eff8870a2..842755f92915 100644 +index dd98905860f4..6b1feb377df7 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -637,6 +637,7 @@ public: +@@ -715,6 +715,7 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -948,10 +948,10 @@ index 774eff8870a2..842755f92915 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 3b82d914c544..d21181684a75 100644 +index cc31e9c06364..06170cc58ab6 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1423,7 +1423,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, return; } @@ -966,7 +966,7 @@ index 3b82d914c544..d21181684a75 100644 2.24.1 -From 8e38fc8dc123a796ec5fc4202115ea9a09f5d2d8 Mon Sep 17 00:00:00 2001 +From 89bb0922590820b86ced74be1181104dadca19a7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -1003,10 +1003,10 @@ index 83af686be106..300384f5c74b 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index 267ad650844c..eab844eabc4a 100644 +index ce480ed70aae..9583b1a83481 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1684,6 +1684,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1019,7 +1019,7 @@ index 267ad650844c..eab844eabc4a 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -1919,6 +1925,7 @@ vteapp_window_constructed(GObject *object) +@@ -1882,6 +1888,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); @@ -1031,7 +1031,7 @@ index 267ad650844c..eab844eabc4a 100644 2.24.1 -From 0ec82af9c13db70a3275467daff7aa268fea6348 Mon Sep 17 00:00:00 2001 +From 2edbaae5c6169164ae6f5a427433fb208d725874 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the @@ -1065,10 +1065,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index 0e6dbdf13e68..c99d19702b10 100644 +index 3d6f856fb31c..9d1c9711838d 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10481,6 +10481,15 @@ Terminal::emit_pending_signals() +@@ -10293,6 +10293,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1085,10 +1085,10 @@ index 0e6dbdf13e68..c99d19702b10 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 21d99e6abd93..b55df3f76e50 100644 +index a75ae7ee2640..53de9c737000 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -462,6 +462,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); +@@ -458,6 +458,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); _VTE_PUBLIC const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); _VTE_PUBLIC @@ -1100,10 +1100,10 @@ index 21d99e6abd93..b55df3f76e50 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 6c53aec2eab1..2427e6bfd2a1 100644 +index af4056299ae3..de5f96ff25c2 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -474,6 +474,12 @@ vte_terminal_get_property (GObject *object, +@@ -483,6 +483,12 @@ vte_terminal_get_property (GObject *object, case PROP_CURSOR_BLINK_MODE: g_value_set_enum (value, vte_terminal_get_cursor_blink_mode (terminal)); break; @@ -1116,7 +1116,7 @@ index 6c53aec2eab1..2427e6bfd2a1 100644 case PROP_CURRENT_DIRECTORY_URI: g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal)); break; -@@ -1803,6 +1809,27 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1827,6 +1833,27 @@ vte_terminal_class_init(VteTerminalClass *klass) NULL, (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); @@ -1144,7 +1144,7 @@ index 6c53aec2eab1..2427e6bfd2a1 100644 /** * VteTerminal:current-directory-uri: * -@@ -3699,6 +3726,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) +@@ -3797,6 +3824,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) return IMPL(terminal)->m_column_count; } @@ -1190,7 +1190,7 @@ index 6c53aec2eab1..2427e6bfd2a1 100644 * vte_terminal_get_current_directory_uri: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 3d46483e3a56..24052b15f75c 100644 +index 534298ada75c..66d2f1425fad 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh @@ -76,6 +76,8 @@ enum { @@ -1203,19 +1203,19 @@ index 3d46483e3a56..24052b15f75c 100644 PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 842755f92915..20c4bcc5d900 100644 +index 6b1feb377df7..2329d7fd4c13 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -41,6 +41,7 @@ - +@@ -61,6 +61,7 @@ #include #include + #include +#include #include #include #include -@@ -118,6 +119,18 @@ typedef enum _VteCharacterReplacement { - VTE_CHARACTER_REPLACEMENT_BRITISH +@@ -98,6 +99,18 @@ typedef enum _VteCharacterReplacement { + VTE_CHARACTER_REPLACEMENT_LINE_DRAWING } VteCharacterReplacement; +struct VteContainer { @@ -1233,7 +1233,7 @@ index 842755f92915..20c4bcc5d900 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -632,6 +645,9 @@ public: +@@ -710,6 +723,9 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1244,10 +1244,10 @@ index 842755f92915..20c4bcc5d900 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index d21181684a75..a521241df03f 100644 +index 06170cc58ab6..cee7e2b702ea 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1405,6 +1405,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1385,6 +1385,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, if (token == endtoken) return; diff --git a/vte291.spec b/vte291.spec index 5f8e3f1..c32ccc2 100644 --- a/vte291.spec +++ b/vte291.spec @@ -4,11 +4,13 @@ %global glib2_version 2.52.0 %global gnutls_version 3.2.7 %global gtk3_version 3.20.0 +%global icu_uc_version 4.8 +%global libsystemd_version 220 %global pango_version 1.22.0 %global pcre2_version 10.21 Name: vte291 -Version: 0.59.0 +Version: 0.59.91 Release: 1%{?dist} Summary: Terminal emulator library @@ -32,16 +34,21 @@ BuildRequires: gperf BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(icu-uc) >= %{icu_uc_version} BuildRequires: pkgconfig(libpcre2-8) >= %{pcre2_version} +BuildRequires: pkgconfig(libsystemd) >= %{libsystemd_version} BuildRequires: pkgconfig(pango) >= %{pango_version} +BuildRequires: systemd-rpm-macros BuildRequires: vala Requires: fribidi >= %{fribidi_version} Requires: glib2 >= %{glib2_version} Requires: gnutls%{?_isa} >= %{gnutls_version} Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: libicu%{?_isa} >= %{icu_uc_version} Requires: pango >= %{pango_version} Requires: pcre2%{?_isa} >= %{pcre2_version} +Requires: systemd >= %{libsystemd_version} Requires: vte-profile Conflicts: gnome-terminal < 3.20.1-2 @@ -95,6 +102,8 @@ emulator library. %doc NEWS %{_libdir}/libvte-%{apiver}.so.0* %{_libdir}/girepository-1.0/ +%{_libexecdir}/vte-urlencode-cwd +%{_userunitdir}/vte-spawn-.scope.d %files devel %{_bindir}/vte-%{apiver} @@ -106,9 +115,14 @@ emulator library. %{_datadir}/vala/ %files -n vte-profile +%{_sysconfdir}/profile.d/vte.csh %{_sysconfdir}/profile.d/vte.sh %changelog +* Thu Feb 20 2020 Debarshi Ray - 0.59.91-1 +- Update to 0.59.91 +- Rebase downstream patches + * Wed Feb 19 2020 Debarshi Ray - 0.59.0-1 - Update to 0.59.0 - Rebase downstream patches From e3250069b7c81ac5a649e41f220502fde3e97c6d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 2 Mar 2020 13:57:28 +0100 Subject: [PATCH 04/13] Update to 0.59.92 --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 92 ++++++++++++------------ vte291.spec | 5 +- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index c26bd6d..bc2a27a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /vte-0.58.3.tar.xz /vte-0.59.0.tar.xz /vte-0.59.91.tar.xz +/vte-0.59.92.tar.xz diff --git a/sources b/sources index d1db3d7..23b88fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.59.91.tar.xz) = 29d4ec3afeb117427880fa377d92f5b185ccdeac58d4bbd9af3042bd30cb021fcd65e12dc7ae0e0febaff2863a2f3b17f5112144e063fb233789c097e5644d4e +SHA512 (vte-0.59.92.tar.xz) = e9df213be334e4328765ac426a9adb69252f751c930bf74a78475ed6859521e4540a35d6bc0203d81905e85d269faff08812a6bbbd9d6f9c836ccd04f082bad1 diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 3e425e2..2978ea3 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From e7e3b8b73367060135627028e6d148c5ba601cb7 Mon Sep 17 00:00:00 2001 +From 0bdf015c691dc093abb6fabe15af1017c2e7dd49 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/10] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index c1c85f7a1f69..2e16d0cdee3e 100644 +index 0977ff6c3c19..838cb6523c5c 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10239,6 +10239,15 @@ Terminal::emit_pending_signals() +@@ -10238,6 +10238,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -72,7 +72,7 @@ index 31012518362e..6ad0987d22ca 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 33534b4c758e..c012bf6c54d7 100644 +index 8edb9d9bec08..11875dfee613 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -738,6 +738,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -149,7 +149,7 @@ index 93e905270c29..ae4f705ea80d 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 f05b67e0252b..13cae0934b22 100644 +index 2d00ceec5509..2b69ca2c14f0 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param) @@ -209,7 +209,7 @@ index f05b67e0252b..13cae0934b22 100644 2.24.1 -From b3c6f5757073e04cf0604ba348fd69f8d0ef05de Mon Sep 17 00:00:00 2001 +From b3852a8ddf9e58fe5de0a8efd5ad7ab1785c284a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -245,7 +245,7 @@ index 8b3153da0f1a..d6769de82766 100644 2.24.1 -From afde67f33dca5651cfb31612f130caac712b9fd4 Mon Sep 17 00:00:00 2001 +From 0cf97482e460ad2f687413306704bad40f826d43 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/10] Test the notification-received signal @@ -281,10 +281,10 @@ index fc26c2b0dfc3..634b8ddeeb91 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 6257c2f1c0e8..842b0408836f 100644 +index 0c7eed5d18f1..6086c0a65db2 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1636,6 +1636,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -1639,6 +1639,14 @@ window_window_title_changed_cb(VteTerminal* terminal, vte_terminal_get_window_title(window->terminal)); } @@ -299,7 +299,7 @@ index 6257c2f1c0e8..842b0408836f 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1864,6 +1872,8 @@ vteapp_window_constructed(GObject *object) +@@ -1871,6 +1879,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -312,7 +312,7 @@ index 6257c2f1c0e8..842b0408836f 100644 2.24.1 -From 763bab8df736d7f8b812a4004f4ba2401227ce05 Mon Sep 17 00:00:00 2001 +From b3873aa4ed2dc7b33f4dd746bc5ce84662703908 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/10] Add a property to configure the scroll speed @@ -343,10 +343,10 @@ index 20067c88bae3..2cc8d70ca4f9 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index 2e16d0cdee3e..ee71d6b0f1c5 100644 +index 838cb6523c5c..8123db6b2c65 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9443,6 +9443,7 @@ void +@@ -9442,6 +9442,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,7 +354,7 @@ index 2e16d0cdee3e..ee71d6b0f1c5 100644 gdouble v; gint cnt, i; int button; -@@ -9499,7 +9500,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9498,7 +9499,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } @@ -369,7 +369,7 @@ index 2e16d0cdee3e..ee71d6b0f1c5 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9796,6 +9803,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9795,6 +9802,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -402,7 +402,7 @@ index 6ad0987d22ca..94febee1d494 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index c012bf6c54d7..cbfc44670e2e 100644 +index 11875dfee613..c6051aa7ae7f 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -528,6 +528,9 @@ vte_terminal_get_property (GObject *object, @@ -447,7 +447,7 @@ index c012bf6c54d7..cbfc44670e2e 100644 /** * VteTerminal:scrollback-lines: * -@@ -4420,6 +4441,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4428,6 +4449,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -514,7 +514,7 @@ index ae4f705ea80d..9c0b8b454468 100644 2.24.1 -From 479cff28fe58bad250b07c8cecf2cf741ed3e1ae Mon Sep 17 00:00:00 2001 +From 8525c3b3986791f60bf42c880db1762dafe794c9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/10] Test the scroll-speed property @@ -555,10 +555,10 @@ index 634b8ddeeb91..c984b868246d 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 842b0408836f..f40495f77ecf 100644 +index 6086c0a65db2..0c7a70bf6da5 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -97,6 +97,7 @@ public: +@@ -98,6 +98,7 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; @@ -566,7 +566,7 @@ index 842b0408836f..f40495f77ecf 100644 VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -415,6 +416,8 @@ public: +@@ -418,6 +419,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 }, @@ -575,7 +575,7 @@ index 842b0408836f..f40495f77ecf 100644 { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, "Specify the number of scrollback-lines (-1 for infinite)", nullptr }, { "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent, -@@ -1905,6 +1908,7 @@ vteapp_window_constructed(GObject *object) +@@ -1912,6 +1915,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); @@ -587,7 +587,7 @@ index 842b0408836f..f40495f77ecf 100644 2.24.1 -From 5a08736420dea1ed7e784f19cf93ae19944b0aa2 Mon Sep 17 00:00:00 2001 +From 2f1b77d36bdfa55bf16e8c02d3beef3b39e9a941 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -620,10 +620,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index ee71d6b0f1c5..6c95909b2e79 100644 +index 8123db6b2c65..f6a3989cbd79 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10265,6 +10265,13 @@ Terminal::emit_pending_signals() +@@ -10264,6 +10264,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -667,7 +667,7 @@ index 94febee1d494..2d757afbdcc0 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index cbfc44670e2e..83c8ebc37a1b 100644 +index c6051aa7ae7f..888da0c188d8 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -728,7 +728,7 @@ index 9c0b8b454468..dd98905860f4 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 13cae0934b22..cc31e9c06364 100644 +index 2b69ca2c14f0..d8866cbeb225 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -746,7 +746,7 @@ index 13cae0934b22..cc31e9c06364 100644 2.24.1 -From e6709af27700bb9fca3d856ae7ebb4a1e2095a04 Mon Sep 17 00:00:00 2001 +From e526a2f09a2336aa6c37c7deb6dc21cae065384c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -783,10 +783,10 @@ index c984b868246d..83af686be106 100644 class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index f40495f77ecf..ce480ed70aae 100644 +index 0c7a70bf6da5..2dece3ddb724 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1650,6 +1650,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -799,7 +799,7 @@ index f40495f77ecf..ce480ed70aae 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -1876,6 +1882,7 @@ vteapp_window_constructed(GObject *object) +@@ -1883,6 +1889,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); @@ -811,7 +811,7 @@ index f40495f77ecf..ce480ed70aae 100644 2.24.1 -From 61810a3bfb4b059bb5d9c13896c82625d09d147c Mon Sep 17 00:00:00 2001 +From c2a395714922a8eafb82908330e3e689677627e0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -840,10 +840,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 6c95909b2e79..3d6f856fb31c 100644 +index f6a3989cbd79..4d51005fb6c4 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10272,6 +10272,13 @@ Terminal::emit_pending_signals() +@@ -10271,6 +10271,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -888,7 +888,7 @@ index 2d757afbdcc0..a75ae7ee2640 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 83c8ebc37a1b..af4056299ae3 100644 +index 888da0c188d8..47b7df4febf2 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -948,7 +948,7 @@ index dd98905860f4..6b1feb377df7 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index cc31e9c06364..06170cc58ab6 100644 +index d8866cbeb225..f6669f853204 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -966,7 +966,7 @@ index cc31e9c06364..06170cc58ab6 100644 2.24.1 -From 89bb0922590820b86ced74be1181104dadca19a7 Mon Sep 17 00:00:00 2001 +From 0eeb69db7fa1834f4a199c10b3d677e4d0723b44 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -1003,10 +1003,10 @@ index 83af686be106..300384f5c74b 100644 { print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index ce480ed70aae..9583b1a83481 100644 +index 2dece3ddb724..960aadc3cdc8 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -1647,6 +1647,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -1650,6 +1650,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1019,7 +1019,7 @@ index ce480ed70aae..9583b1a83481 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -1882,6 +1888,7 @@ vteapp_window_constructed(GObject *object) +@@ -1889,6 +1895,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); @@ -1031,7 +1031,7 @@ index ce480ed70aae..9583b1a83481 100644 2.24.1 -From 2edbaae5c6169164ae6f5a427433fb208d725874 Mon Sep 17 00:00:00 2001 +From b925363b7286ab2b0cd4260f807681151ab44004 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the @@ -1065,10 +1065,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index 3d6f856fb31c..9d1c9711838d 100644 +index 4d51005fb6c4..f83ef111b9d9 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10293,6 +10293,15 @@ Terminal::emit_pending_signals() +@@ -10292,6 +10292,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1100,7 +1100,7 @@ index a75ae7ee2640..53de9c737000 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index af4056299ae3..de5f96ff25c2 100644 +index 47b7df4febf2..2e4bd1a692dc 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -483,6 +483,12 @@ vte_terminal_get_property (GObject *object, @@ -1144,7 +1144,7 @@ index af4056299ae3..de5f96ff25c2 100644 /** * VteTerminal:current-directory-uri: * -@@ -3797,6 +3824,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) +@@ -3805,6 +3832,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) return IMPL(terminal)->m_column_count; } @@ -1244,7 +1244,7 @@ index 6b1feb377df7..2329d7fd4c13 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 06170cc58ab6..cee7e2b702ea 100644 +index f6669f853204..2b9dd9df820a 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1385,6 +1385,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, diff --git a/vte291.spec b/vte291.spec index c32ccc2..5cbbf7d 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,7 +10,7 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.59.91 +Version: 0.59.92 Release: 1%{?dist} Summary: Terminal emulator library @@ -119,6 +119,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Mar 02 2020 Debarshi Ray - 0.59.92-1 +- Update to 0.59.92 + * Thu Feb 20 2020 Debarshi Ray - 0.59.91-1 - Update to 0.59.91 - Rebase downstream patches From e676ccec838c6dbbcb510479aded4ff8d262e363 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 2 Mar 2020 14:57:26 +0100 Subject: [PATCH 05/13] Replace C1 controls with C0 to emit OSC 777 from PS0 C1 controls are supported by fewer terminals, and using them here causes a problem in Alacritty (and presumably quite a few others) if it's launched from a VTE-based terminal. See: https://github.com/jwilm/alacritty/issues/3105. Support for C1 controls might also get removed from VTE itself. See: https://gitlab.gnome.org/GNOME/vte/issues/209. Note that there was a typo in the commit message of the patch that introduced support for preeexec notifications from an interactive shell. While it was correct in saying that it's using C1 controls, because C0 was causing spurious characters to show up, the C0 example was wrongly using C1 controls. https://bugzilla.redhat.com/show_bug.cgi?id=1783802 --- vte291-cntnr-precmd-preexec-scroll.patch | 20 ++++++++------------ vte291.spec | 5 ++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 2978ea3..ffa3bee 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -587,7 +587,7 @@ index 6086c0a65db2..0c7a70bf6da5 100644 2.24.1 -From 2f1b77d36bdfa55bf16e8c02d3beef3b39e9a941 Mon Sep 17 00:00:00 2001 +From 03909347c77ca2e36a3aa599a3130f9e4f03336d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -603,10 +603,6 @@ Examples of such hooks are Bash's PS0 and Zsh's preexec. The OSC 777 escape sequence is taken from Enlightenment's Terminology: https://phab.enlightenment.org/T1765 -Currently, using C0 controls to emit OSC 777 from PS0 (ie., -PS0=$(printf "\u009D777;preexec\u009C")) causes spurious characters to -show up. C1 controls don't seem to suffer from this problem. - https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- @@ -638,7 +634,7 @@ index 8123db6b2c65..f6a3989cbd79 100644 if (m_window_title != m_window_title_pending) { m_window_title.swap(m_window_title_pending); diff --git a/src/vte.sh.in b/src/vte.sh.in -index d6769de82766..e4ff39e9d405 100644 +index d6769de82766..c7a3b07f9ea4 100644 --- a/src/vte.sh.in +++ b/src/vte.sh.in @@ -38,7 +38,7 @@ __vte_prompt_command() { @@ -646,7 +642,7 @@ index d6769de82766..e4ff39e9d405 100644 case "$TERM" in xterm*|vte*) - [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" -+ [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\u009D777;preexec\u009C") ++ [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\033]777;preexec\033\\") [ -n "$ZSH_VERSION" ] && precmd_functions+=(__vte_osc7) ;; esac @@ -746,7 +742,7 @@ index 2b69ca2c14f0..d8866cbeb225 100644 2.24.1 -From e526a2f09a2336aa6c37c7deb6dc21cae065384c Mon Sep 17 00:00:00 2001 +From 2dbec5425751745e9d7042293a3fbefa07cc3a1c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -811,7 +807,7 @@ index 0c7a70bf6da5..2dece3ddb724 100644 2.24.1 -From c2a395714922a8eafb82908330e3e689677627e0 Mon Sep 17 00:00:00 2001 +From 2838c5729961f4aca45a4ad0d55dd8845a30bb7a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -858,7 +854,7 @@ index f6a3989cbd79..4d51005fb6c4 100644 if (m_window_title != m_window_title_pending) { m_window_title.swap(m_window_title_pending); diff --git a/src/vte.sh.in b/src/vte.sh.in -index e4ff39e9d405..d0b88d658607 100644 +index c7a3b07f9ea4..4cff7dd1fb71 100644 --- a/src/vte.sh.in +++ b/src/vte.sh.in @@ -32,7 +32,7 @@ __vte_prompt_command() { @@ -966,7 +962,7 @@ index d8866cbeb225..f6669f853204 100644 2.24.1 -From 0eeb69db7fa1834f4a199c10b3d677e4d0723b44 Mon Sep 17 00:00:00 2001 +From a7d3d63f068ac0dc12069b24697cd706838e3109 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -1031,7 +1027,7 @@ index 2dece3ddb724..960aadc3cdc8 100644 2.24.1 -From b925363b7286ab2b0cd4260f807681151ab44004 Mon Sep 17 00:00:00 2001 +From 90c2ae926f1eb2c3066c6e56679767bd5fa03bc1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the diff --git a/vte291.spec b/vte291.spec index 5cbbf7d..ab90214 100644 --- a/vte291.spec +++ b/vte291.spec @@ -11,7 +11,7 @@ Name: vte291 Version: 0.59.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -119,6 +119,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Mar 02 2020 Debarshi Ray - 0.59.92-2 +- Replace C1 controls with C0 to emit OSC 777 from PS0 (RH #1783802) + * Mon Mar 02 2020 Debarshi Ray - 0.59.92-1 - Update to 0.59.92 From c2f2db14c1a858d79c69f344650c38987a675d09 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 6 Mar 2020 14:43:28 +0100 Subject: [PATCH 06/13] Update to 0.60.0 --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 20 ++++++++++---------- vte291.spec | 9 ++++++--- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index bc2a27a..9bf3471 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /vte-0.59.0.tar.xz /vte-0.59.91.tar.xz /vte-0.59.92.tar.xz +/vte-0.60.0.tar.xz diff --git a/sources b/sources index 23b88fc..6dae662 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.59.92.tar.xz) = e9df213be334e4328765ac426a9adb69252f751c930bf74a78475ed6859521e4540a35d6bc0203d81905e85d269faff08812a6bbbd9d6f9c836ccd04f082bad1 +SHA512 (vte-0.60.0.tar.xz) = 8c1a80ba90fa1c1f4b5ec1a1d3793af79c04fbbad4acecba094db79771555b1689017864bd81bee4366f9ef363f629f20731bac998d994b9bfa37ee59e9e58b0 diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index ffa3bee..144c8a9 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From 0bdf015c691dc093abb6fabe15af1017c2e7dd49 Mon Sep 17 00:00:00 2001 +From c8ba0093065c94914b89a3f9fb9e4376ad58b7f2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/10] Add sequences and signals for desktop notification @@ -209,7 +209,7 @@ index 2d00ceec5509..2b69ca2c14f0 100644 2.24.1 -From b3852a8ddf9e58fe5de0a8efd5ad7ab1785c284a Mon Sep 17 00:00:00 2001 +From c7e4f1adf7865025daa196ccb6b4344d6a79db55 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -245,7 +245,7 @@ index 8b3153da0f1a..d6769de82766 100644 2.24.1 -From 0cf97482e460ad2f687413306704bad40f826d43 Mon Sep 17 00:00:00 2001 +From 25d0ab5656a5daeac72514c9f1c92ece170e1b19 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/10] Test the notification-received signal @@ -312,7 +312,7 @@ index 0c7eed5d18f1..6086c0a65db2 100644 2.24.1 -From b3873aa4ed2dc7b33f4dd746bc5ce84662703908 Mon Sep 17 00:00:00 2001 +From 9c4c531996654981621bfcd781402e9c9ababc5f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/10] Add a property to configure the scroll speed @@ -514,7 +514,7 @@ index ae4f705ea80d..9c0b8b454468 100644 2.24.1 -From 8525c3b3986791f60bf42c880db1762dafe794c9 Mon Sep 17 00:00:00 2001 +From c7f5fe00027643b36beb0c2908bd63cfa03a3266 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/10] Test the scroll-speed property @@ -587,7 +587,7 @@ index 6086c0a65db2..0c7a70bf6da5 100644 2.24.1 -From 03909347c77ca2e36a3aa599a3130f9e4f03336d Mon Sep 17 00:00:00 2001 +From 58a73ba12f34b285c4170eabf38d2b6dd0fc6fe3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/10] Support preexec notifications from an interactive shell @@ -742,7 +742,7 @@ index 2b69ca2c14f0..d8866cbeb225 100644 2.24.1 -From 2dbec5425751745e9d7042293a3fbefa07cc3a1c Mon Sep 17 00:00:00 2001 +From 96eae43fc1a6a767744c261ad7184ebf03d70a6d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/10] Test the shell-preexec signal @@ -807,7 +807,7 @@ index 0c7a70bf6da5..2dece3ddb724 100644 2.24.1 -From 2838c5729961f4aca45a4ad0d55dd8845a30bb7a Mon Sep 17 00:00:00 2001 +From 700985c7f169165329f44274636c048151c80d92 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/10] Support precmd notifications from an interactive shell @@ -962,7 +962,7 @@ index d8866cbeb225..f6669f853204 100644 2.24.1 -From a7d3d63f068ac0dc12069b24697cd706838e3109 Mon Sep 17 00:00:00 2001 +From 2f4739dc840d8acddf15d7fa60594e04c24a17b2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/10] Test the shell-precmd signal @@ -1027,7 +1027,7 @@ index 2dece3ddb724..960aadc3cdc8 100644 2.24.1 -From 90c2ae926f1eb2c3066c6e56679767bd5fa03bc1 Mon Sep 17 00:00:00 2001 +From 89b06b1062b1af6fa43d6ea34d8da57f8038abcc Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/10] Support tracking the active container inside the diff --git a/vte291.spec b/vte291.spec index ab90214..e8125b8 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,13 +10,13 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.59.92 -Release: 2%{?dist} +Version: 0.60.0 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/vte/0.59/vte-%{version}.tar.xz +Source0: http://download.gnome.org/sources/vte/0.60/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 @@ -119,6 +119,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Fri Mar 06 2020 Debarshi Ray - 0.60.0-1 +- Update to 0.60.0 + * Mon Mar 02 2020 Debarshi Ray - 0.59.92-2 - Replace C1 controls with C0 to emit OSC 777 from PS0 (RH #1783802) From 86244a9599b35e8029fc5c3bcf79b54fdf29f11a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 21 Mar 2020 18:24:36 +0100 Subject: [PATCH 07/13] Move vte-urlencode-cwd to vte-profile subpackage https://bugzilla.redhat.com/show_bug.cgi?id=1815769 --- vte291.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vte291.spec b/vte291.spec index e8125b8..34eb3d1 100644 --- a/vte291.spec +++ b/vte291.spec @@ -11,7 +11,7 @@ Name: vte291 Version: 0.60.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -102,7 +102,6 @@ emulator library. %doc NEWS %{_libdir}/libvte-%{apiver}.so.0* %{_libdir}/girepository-1.0/ -%{_libexecdir}/vte-urlencode-cwd %{_userunitdir}/vte-spawn-.scope.d %files devel @@ -115,10 +114,14 @@ emulator library. %{_datadir}/vala/ %files -n vte-profile +%{_libexecdir}/vte-urlencode-cwd %{_sysconfdir}/profile.d/vte.csh %{_sysconfdir}/profile.d/vte.sh %changelog +* Sat Mar 21 2020 Kalev Lember - 0.60.0-2 +- Move vte-urlencode-cwd to vte-profile subpackage (#1815769) + * Fri Mar 06 2020 Debarshi Ray - 0.60.0-1 - Update to 0.60.0 From 579d3d543f0cb94ece69d5bf1bd43d8e0469e4ae Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 31 Mar 2020 18:51:56 +0200 Subject: [PATCH 08/13] Update to 0.60.1 --- .gitignore | 1 + sources | 2 +- vte291.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9bf3471..759efe7 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /vte-0.59.91.tar.xz /vte-0.59.92.tar.xz /vte-0.60.0.tar.xz +/vte-0.60.1.tar.xz diff --git a/sources b/sources index 6dae662..2cc5db2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.60.0.tar.xz) = 8c1a80ba90fa1c1f4b5ec1a1d3793af79c04fbbad4acecba094db79771555b1689017864bd81bee4366f9ef363f629f20731bac998d994b9bfa37ee59e9e58b0 +SHA512 (vte-0.60.1.tar.xz) = 123a8fcc14f4dba450411f95f43eb60108fee95c328d0e7331c9366d96ba2caa548dece3e95a8b779dda19d322d6879d02abc6ac68e36450e4e72f17a0963c30 diff --git a/vte291.spec b/vte291.spec index 34eb3d1..0e64e91 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,8 +10,8 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.60.0 -Release: 2%{?dist} +Version: 0.60.1 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -119,6 +119,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Tue Mar 31 2020 Kalev Lember - 0.60.1-1 +- Update to 0.60.1 + * Sat Mar 21 2020 Kalev Lember - 0.60.0-2 - Move vte-urlencode-cwd to vte-profile subpackage (#1815769) From 313629ab2269ab51c3afa86c5917940ffd97125e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 31 Mar 2020 21:01:49 +0200 Subject: [PATCH 09/13] Improve legibility when using colours from the system theme https://gitlab.gnome.org/GNOME/gtk/-/issues/2524 https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1535 https://gitlab.gnome.org/GNOME/vte/-/issues/226 --- vte291-cntnr-precmd-preexec-scroll.patch | 227 +++++++++++++++++++---- vte291.spec | 6 +- 2 files changed, 193 insertions(+), 40 deletions(-) diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 144c8a9..5548b6c 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,7 +1,7 @@ -From c8ba0093065c94914b89a3f9fb9e4376ad58b7f2 Mon Sep 17 00:00:00 2001 +From 100b3f8acecf8c68201d6bbb7fc05e9475d8d401 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 -Subject: [PATCH 01/10] Add sequences and signals for desktop notification +Subject: [PATCH 01/12] Add sequences and signals for desktop notification Add sequences OSC 777 ; notify ; SUMMARY ; BODY BEL @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 0977ff6c3c19..838cb6523c5c 100644 +index cba606e853a4..ae49a07d7376 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10238,6 +10238,15 @@ Terminal::emit_pending_signals() +@@ -10239,6 +10239,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -72,7 +72,7 @@ index 31012518362e..6ad0987d22ca 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 8edb9d9bec08..11875dfee613 100644 +index 5808a210d3d4..005423567073 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -738,6 +738,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -209,10 +209,10 @@ index 2d00ceec5509..2b69ca2c14f0 100644 2.24.1 -From c7e4f1adf7865025daa196ccb6b4344d6a79db55 Mon Sep 17 00:00:00 2001 +From 2a509fab63f42995d4b0f77bac4a9d79e508880e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 -Subject: [PATCH 02/10] vte.sh: Emit OSC 777 from PROMPT_COMMAND +Subject: [PATCH 02/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 @@ -245,10 +245,10 @@ index 8b3153da0f1a..d6769de82766 100644 2.24.1 -From 25d0ab5656a5daeac72514c9f1c92ece170e1b19 Mon Sep 17 00:00:00 2001 +From 268e1f1f5e71822b9e43ae4bfeea43710de32152 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 -Subject: [PATCH 03/10] Test the notification-received signal +Subject: [PATCH 03/12] Test the notification-received signal --- bindings/vala/app.vala | 7 +++++++ @@ -312,10 +312,10 @@ index 0c7eed5d18f1..6086c0a65db2 100644 2.24.1 -From 9c4c531996654981621bfcd781402e9c9ababc5f Mon Sep 17 00:00:00 2001 +From 4756e38cc2678467d08245c192fd86b3b01049da Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 -Subject: [PATCH 04/10] Add a property to configure the scroll speed +Subject: [PATCH 04/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. @@ -343,10 +343,10 @@ index 20067c88bae3..2cc8d70ca4f9 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index 838cb6523c5c..8123db6b2c65 100644 +index ae49a07d7376..8fad2b477950 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9442,6 +9442,7 @@ void +@@ -9443,6 +9443,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,7 +354,7 @@ index 838cb6523c5c..8123db6b2c65 100644 gdouble v; gint cnt, i; int button; -@@ -9498,7 +9499,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9499,7 +9500,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } @@ -369,7 +369,7 @@ index 838cb6523c5c..8123db6b2c65 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9795,6 +9802,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9796,6 +9803,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -402,7 +402,7 @@ index 6ad0987d22ca..94febee1d494 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 11875dfee613..c6051aa7ae7f 100644 +index 005423567073..ecd004a814e7 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -528,6 +528,9 @@ vte_terminal_get_property (GObject *object, @@ -447,7 +447,7 @@ index 11875dfee613..c6051aa7ae7f 100644 /** * VteTerminal:scrollback-lines: * -@@ -4428,6 +4449,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) +@@ -4434,6 +4455,30 @@ vte_terminal_get_row_count(VteTerminal *terminal) return IMPL(terminal)->m_row_count; } @@ -514,10 +514,10 @@ index ae4f705ea80d..9c0b8b454468 100644 2.24.1 -From c7f5fe00027643b36beb0c2908bd63cfa03a3266 Mon Sep 17 00:00:00 2001 +From 4a319241ad18071b85acea28f929b332d00e24da Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 -Subject: [PATCH 05/10] Test the scroll-speed property +Subject: [PATCH 05/12] Test the scroll-speed property https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- @@ -587,10 +587,10 @@ index 6086c0a65db2..0c7a70bf6da5 100644 2.24.1 -From 58a73ba12f34b285c4170eabf38d2b6dd0fc6fe3 Mon Sep 17 00:00:00 2001 +From 1df88d4cb8ebdbcac0ad55c43ed17e91b7396ea6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 -Subject: [PATCH 06/10] Support preexec notifications from an interactive shell +Subject: [PATCH 06/12] Support preexec notifications from an interactive shell Add sequences OSC 777 ; preexec BEL @@ -616,10 +616,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 8123db6b2c65..f6a3989cbd79 100644 +index 8fad2b477950..b103f3cee0ce 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10264,6 +10264,13 @@ Terminal::emit_pending_signals() +@@ -10265,6 +10265,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -663,7 +663,7 @@ index 94febee1d494..2d757afbdcc0 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index c6051aa7ae7f..888da0c188d8 100644 +index ecd004a814e7..1b3e2690164f 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -742,10 +742,10 @@ index 2b69ca2c14f0..d8866cbeb225 100644 2.24.1 -From 96eae43fc1a6a767744c261ad7184ebf03d70a6d Mon Sep 17 00:00:00 2001 +From f2581b1532eebc4bcfc2337eb367abfd5599dd0c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 -Subject: [PATCH 07/10] Test the shell-preexec signal +Subject: [PATCH 07/12] Test the shell-preexec signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 @@ -807,10 +807,10 @@ index 0c7a70bf6da5..2dece3ddb724 100644 2.24.1 -From 700985c7f169165329f44274636c048151c80d92 Mon Sep 17 00:00:00 2001 +From cee3f876af49aa199955e557001a57b317f93634 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 -Subject: [PATCH 08/10] Support precmd notifications from an interactive shell +Subject: [PATCH 08/12] Support precmd notifications from an interactive shell Add sequences OSC 777 ; precmd BEL @@ -836,10 +836,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index f6a3989cbd79..4d51005fb6c4 100644 +index b103f3cee0ce..1bda2bfbca39 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10271,6 +10271,13 @@ Terminal::emit_pending_signals() +@@ -10272,6 +10272,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -884,7 +884,7 @@ index 2d757afbdcc0..a75ae7ee2640 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 888da0c188d8..47b7df4febf2 100644 +index 1b3e2690164f..0d61f90cda76 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -962,10 +962,10 @@ index d8866cbeb225..f6669f853204 100644 2.24.1 -From 2f4739dc840d8acddf15d7fa60594e04c24a17b2 Mon Sep 17 00:00:00 2001 +From 827f0406565cad98f835909451a854c7f8f3ead1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 -Subject: [PATCH 09/10] Test the shell-precmd signal +Subject: [PATCH 09/12] Test the shell-precmd signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 @@ -1027,10 +1027,10 @@ index 2dece3ddb724..960aadc3cdc8 100644 2.24.1 -From 89b06b1062b1af6fa43d6ea34d8da57f8038abcc Mon Sep 17 00:00:00 2001 +From 55c7d02eaad2bc37bc18c46152825fb2959f2db0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 -Subject: [PATCH 10/10] Support tracking the active container inside the +Subject: [PATCH 10/12] Support tracking the active container inside the terminal Add sequences @@ -1061,10 +1061,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index 4d51005fb6c4..f83ef111b9d9 100644 +index 1bda2bfbca39..aeca73d55934 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10292,6 +10292,15 @@ Terminal::emit_pending_signals() +@@ -10293,6 +10293,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1096,7 +1096,7 @@ index a75ae7ee2640..53de9c737000 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 47b7df4febf2..2e4bd1a692dc 100644 +index 0d61f90cda76..15a7f1ab1ce0 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -483,6 +483,12 @@ vte_terminal_get_property (GObject *object, @@ -1140,7 +1140,7 @@ index 47b7df4febf2..2e4bd1a692dc 100644 /** * VteTerminal:current-directory-uri: * -@@ -3805,6 +3832,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) +@@ -3811,6 +3838,44 @@ vte_terminal_get_column_count(VteTerminal *terminal) return IMPL(terminal)->m_column_count; } @@ -1284,3 +1284,152 @@ index f6669f853204..2b9dd9df820a 100644 -- 2.24.1 + +From e2c44d1e7cf544f26dddfe7ea21452eb53800b83 Mon Sep 17 00:00:00 2001 +From: Jakub Steiner +Date: Thu, 2 Apr 2020 18:20:44 +0200 +Subject: [PATCH 11/12] widget: Improve legibility when using colours from the + system theme + +https://gitlab.gnome.org/GNOME/vte/-/issues/225 +--- + src/vtegtk.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 15a7f1ab1ce0..5999272c0648 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -1922,7 +1922,7 @@ vte_terminal_class_init(VteTerminalClass *klass) + "VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n" + "padding: 1px 1px 1px 1px;\n" + "background-color: @theme_base_color;\n" +- "color: @theme_fg_color;\n" ++ "color: @theme_text_color;\n" + "}\n", + -1, NULL); + +-- +2.24.1 + + +From 68d735ef2649df34f4a283d70555a88f04231ecc Mon Sep 17 00:00:00 2001 +From: Jakub Steiner +Date: Tue, 31 Mar 2020 20:55:23 +0200 +Subject: [PATCH 12/12] widget: Improve legibility by tweaking the system + theme's base colour + +Some changes by Debarshi Ray. + +https://gitlab.gnome.org/GNOME/vte/-/issues/226 +--- + src/vtegtk.cc | 67 ++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 58 insertions(+), 9 deletions(-) + +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 5999272c0648..a54c85b42e9d 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -73,7 +73,8 @@ + #define VTE_TERMINAL_CSS_NAME "vte-terminal" + + struct _VteTerminalClassPrivate { +- GtkStyleProvider *style_provider; ++ GtkStyleProvider *style_provider_dark; ++ GtkStyleProvider *style_provider_light; + }; + + #ifdef VTE_DEBUG +@@ -127,6 +128,41 @@ valid_color(GdkRGBA const* color) + color->alpha >= 0. && color->alpha <= 1.; + } + ++static void ++vte_terminal_theme_update (VteTerminal *terminal) ++{ ++ GtkSettings *settings; ++ GtkStyleContext *context; ++ gboolean application_prefer_dark_theme; ++ ++ settings = gtk_settings_get_default (); ++ g_object_get (settings, "gtk-application-prefer-dark-theme", &application_prefer_dark_theme, nullptr); ++ ++ context = gtk_widget_get_style_context (&terminal->widget); ++ ++ if (application_prefer_dark_theme) { ++ gtk_style_context_remove_provider (context, ++ VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider_light); ++ ++ gtk_style_context_add_provider (context, ++ VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider_dark, ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ } else { ++ gtk_style_context_remove_provider (context, ++ VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider_dark); ++ ++ gtk_style_context_add_provider (context, ++ VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider_light, ++ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ } ++} ++ ++static void ++vte_terminal_theme_changed (VteTerminal *terminal) ++{ ++ vte_terminal_theme_update (terminal); ++} ++ + static void + vte_terminal_set_hadjustment(VteTerminal *terminal, + GtkAdjustment *adjustment) +@@ -392,14 +428,18 @@ static void + vte_terminal_init(VteTerminal *terminal) + { + void *place; +- GtkStyleContext *context; ++ GtkSettings *settings; + + _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_init()\n"); + +- context = gtk_widget_get_style_context(&terminal->widget); +- gtk_style_context_add_provider (context, +- VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider, +- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ vte_terminal_theme_update (terminal); ++ ++ settings = gtk_settings_get_default (); ++ g_signal_connect_object (settings, ++ "notify::gtk-application-prefer-dark-theme", ++ G_CALLBACK (vte_terminal_theme_changed), ++ terminal, ++ G_CONNECT_SWAPPED); + + /* Initialize private data. NOTE: place is zeroed */ + place = vte_terminal_get_instance_private(terminal); +@@ -1917,11 +1957,20 @@ vte_terminal_class_init(VteTerminalClass *klass) + + klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_TERMINAL, VteTerminalClassPrivate); + +- klass->priv->style_provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); +- gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider), ++ klass->priv->style_provider_dark = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); ++ gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider_dark), ++ "VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n" ++ "padding: 1px 1px 1px 1px;\n" ++ "background-color: shade(@theme_base_color, 0.67);\n" ++ "color: @theme_text_color;\n" ++ "}\n", ++ -1, NULL); ++ ++ klass->priv->style_provider_light = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); ++ gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider_light), + "VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n" + "padding: 1px 1px 1px 1px;\n" +- "background-color: @theme_base_color;\n" ++ "background-color: shade(@theme_base_color, 1.1);\n" + "color: @theme_text_color;\n" + "}\n", + -1, NULL); +-- +2.24.1 + diff --git a/vte291.spec b/vte291.spec index 0e64e91..f01101a 100644 --- a/vte291.spec +++ b/vte291.spec @@ -11,7 +11,7 @@ Name: vte291 Version: 0.60.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -20,6 +20,7 @@ Source0: http://download.gnome.org/sources/vte/0.60/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380 +# https://gitlab.gnome.org/GNOME/vte/-/issues/226 Patch100: vte291-cntnr-precmd-preexec-scroll.patch BuildRequires: gcc-c++ @@ -119,6 +120,9 @@ emulator library. %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Apr 06 2020 Debarshi Ray - 0.60.1-2 +- Improve legibility when using colours from the system theme + * Tue Mar 31 2020 Kalev Lember - 0.60.1-1 - Update to 0.60.1 From 8da41fea607b130e24c580150d93597a9dc18d6f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 6 Apr 2020 23:50:21 +0200 Subject: [PATCH 10/13] Fix flatpak module build --- vte291.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vte291.spec b/vte291.spec index f01101a..aa8ec0a 100644 --- a/vte291.spec +++ b/vte291.spec @@ -84,6 +84,10 @@ emulator library. %prep %setup -q -n vte-%{version} %patch100 -p1 -b .cntnr-precmd-preexec-scroll +%if 0%{?flatpak} +# Install user units where systemd macros expect them +sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build +%endif %build # Avoid overriding vte's own -fno-exceptions From 4aaef0090439481d577a5a208e1b26ee6ae5d3d1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 27 Apr 2020 10:52:16 +0200 Subject: [PATCH 11/13] Update to 0.60.2 --- .gitignore | 1 + sources | 2 +- vte291.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 759efe7..b990801 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /vte-0.59.92.tar.xz /vte-0.60.0.tar.xz /vte-0.60.1.tar.xz +/vte-0.60.2.tar.xz diff --git a/sources b/sources index 2cc5db2..5550e9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.60.1.tar.xz) = 123a8fcc14f4dba450411f95f43eb60108fee95c328d0e7331c9366d96ba2caa548dece3e95a8b779dda19d322d6879d02abc6ac68e36450e4e72f17a0963c30 +SHA512 (vte-0.60.2.tar.xz) = 801ac727cab33d2c3f4ba4d86bf7f19a82628acd2739196f24c85d038ba6bcc6a67239aac09141b8e0119a67f199ff8a8c653641a8e9aea1e8ab68bfd16017db diff --git a/vte291.spec b/vte291.spec index aa8ec0a..bad199f 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,8 +10,8 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.60.1 -Release: 2%{?dist} +Version: 0.60.2 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -124,6 +124,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Apr 27 2020 Kalev Lember - 0.60.2-1 +- Update to 0.60.2 + * Mon Apr 06 2020 Debarshi Ray - 0.60.1-2 - Improve legibility when using colours from the system theme From 37daa17020acf10fcee705d738095a0f070e7210 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 1 Jun 2020 20:31:07 +0200 Subject: [PATCH 12/13] Update to 0.60.3 --- .gitignore | 1 + sources | 2 +- vte291.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b990801..40fdae6 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /vte-0.60.0.tar.xz /vte-0.60.1.tar.xz /vte-0.60.2.tar.xz +/vte-0.60.3.tar.xz diff --git a/sources b/sources index 5550e9a..a2dc3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.60.2.tar.xz) = 801ac727cab33d2c3f4ba4d86bf7f19a82628acd2739196f24c85d038ba6bcc6a67239aac09141b8e0119a67f199ff8a8c653641a8e9aea1e8ab68bfd16017db +SHA512 (vte-0.60.3.tar.xz) = 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 diff --git a/vte291.spec b/vte291.spec index bad199f..9b2a08c 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,7 +10,7 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.60.2 +Version: 0.60.3 Release: 1%{?dist} Summary: Terminal emulator library @@ -124,6 +124,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Jun 01 2020 Kalev Lember - 0.60.3-1 +- Update to 0.60.3 + * Mon Apr 27 2020 Kalev Lember - 0.60.2-1 - Update to 0.60.2 From ffd1b3661dc5000dab502308f6739a78b2d5670d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 7 May 2021 20:23:30 +0200 Subject: [PATCH 13/13] Update to 0.60.4 --- .gitignore | 1 + sources | 2 +- vte291-cntnr-precmd-preexec-scroll.patch | 120 +++++++++++------------ vte291.spec | 5 +- 4 files changed, 66 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index 40fdae6..a95d518 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /vte-0.60.1.tar.xz /vte-0.60.2.tar.xz /vte-0.60.3.tar.xz +/vte-0.60.4.tar.xz diff --git a/sources b/sources index a2dc3c9..9ce84dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vte-0.60.3.tar.xz) = 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 +SHA512 (vte-0.60.4.tar.xz) = d6e63740a1d7b93934fcc4e88412869e34489ffccb25d67dd860ac19165e5df7a26a577d4e01c18df06c794bb2de9d7af7c5d8fa09ec0e6b72a65567c5f0cd1d diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index 5548b6c..f387070 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From 100b3f8acecf8c68201d6bbb7fc05e9475d8d401 Mon Sep 17 00:00:00 2001 +From a36779fe5cf5d91978c6d832c9f24c57a8ffd556 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/12] Add sequences and signals for desktop notification @@ -36,10 +36,10 @@ index 241128c3ccfe..4412cf3d5f5c 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index cba606e853a4..ae49a07d7376 100644 +index 4a457af94e89..f0d167bcc654 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10239,6 +10239,15 @@ Terminal::emit_pending_signals() +@@ -10247,6 +10247,15 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); @@ -72,7 +72,7 @@ index 31012518362e..6ad0987d22ca 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 5808a210d3d4..005423567073 100644 +index aaf831a7f544..8c184da649cc 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -738,6 +738,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -123,10 +123,10 @@ index ae9fb08c310a..baf681e45b2c 100644 LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 93e905270c29..ae4f705ea80d 100644 +index b37272ad09eb..166bd627f202 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -709,6 +709,11 @@ public: +@@ -721,6 +721,11 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -138,7 +138,7 @@ index 93e905270c29..ae4f705ea80d 100644 std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -1426,6 +1431,9 @@ public: +@@ -1438,6 +1443,9 @@ public: int osc) noexcept; /* OSC handlers */ @@ -149,7 +149,7 @@ index 93e905270c29..ae4f705ea80d 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 2d00ceec5509..2b69ca2c14f0 100644 +index 3004c0569657..4f1d8049726c 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param) @@ -206,10 +206,10 @@ index 2d00ceec5509..2b69ca2c14f0 100644 default: break; -- -2.24.1 +2.30.2 -From 2a509fab63f42995d4b0f77bac4a9d79e508880e Mon Sep 17 00:00:00 2001 +From cc68c0c87c4ba4ca19de08f35e9b5e990fb3ae83 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/12] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -242,10 +242,10 @@ index 8b3153da0f1a..d6769de82766 100644 } -- -2.24.1 +2.30.2 -From 268e1f1f5e71822b9e43ae4bfeea43710de32152 Mon Sep 17 00:00:00 2001 +From 19e24c06762c4e61249436f796b01c557084d269 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/12] Test the notification-received signal @@ -309,10 +309,10 @@ index 0c7eed5d18f1..6086c0a65db2 100644 if (options.no_double_buffer) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS; -- -2.24.1 +2.30.2 -From 4756e38cc2678467d08245c192fd86b3b01049da Mon Sep 17 00:00:00 2001 +From 664a2611da04a7be61d0d4d7aef7f5d4cf09744c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/12] Add a property to configure the scroll speed @@ -343,10 +343,10 @@ index 20067c88bae3..2cc8d70ca4f9 100644 vte_terminal_get_scrollback_lines vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index ae49a07d7376..8fad2b477950 100644 +index f0d167bcc654..813634fc5119 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9443,6 +9443,7 @@ void +@@ -9449,6 +9449,7 @@ void Terminal::widget_scroll(GdkEventScroll *event) { gdouble delta_x, delta_y; @@ -354,7 +354,7 @@ index ae49a07d7376..8fad2b477950 100644 gdouble v; gint cnt, i; int button; -@@ -9499,7 +9500,13 @@ Terminal::widget_scroll(GdkEventScroll *event) +@@ -9505,7 +9506,13 @@ Terminal::widget_scroll(GdkEventScroll *event) return; } @@ -369,7 +369,7 @@ index ae49a07d7376..8fad2b477950 100644 _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9796,6 +9803,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9802,6 +9809,16 @@ Terminal::decscusr_cursor_shape() const noexcept } } @@ -402,7 +402,7 @@ index 6ad0987d22ca..94febee1d494 100644 _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 005423567073..ecd004a814e7 100644 +index 8c184da649cc..25a2fc8a2358 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -528,6 +528,9 @@ vte_terminal_get_property (GObject *object, @@ -491,10 +491,10 @@ index baf681e45b2c..a9c256635948 100644 PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index ae4f705ea80d..9c0b8b454468 100644 +index 166bd627f202..b4a97c05dba9 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -487,6 +487,7 @@ public: +@@ -499,6 +499,7 @@ public: /* Scrolling options. */ bool m_scroll_on_output{false}; bool m_scroll_on_keystroke{true}; @@ -502,7 +502,7 @@ index ae4f705ea80d..9c0b8b454468 100644 vte::grid::row_t m_scrollback_lines{0}; /* Restricted scrolling */ -@@ -1304,6 +1305,7 @@ public: +@@ -1316,6 +1317,7 @@ public: bool set_input_enabled(bool enabled); bool set_mouse_autohide(bool autohide); bool set_rewrap_on_resize(bool rewrap); @@ -511,10 +511,10 @@ index ae4f705ea80d..9c0b8b454468 100644 bool set_scroll_on_keystroke(bool scroll); bool set_scroll_on_output(bool scroll); -- -2.24.1 +2.30.2 -From 4a319241ad18071b85acea28f929b332d00e24da Mon Sep 17 00:00:00 2001 +From 7aa92908e1d1d072a7b197f3f392a9ac9d2055a6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/12] Test the scroll-speed property @@ -584,10 +584,10 @@ index 6086c0a65db2..0c7a70bf6da5 100644 vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode); -- -2.24.1 +2.30.2 -From 1df88d4cb8ebdbcac0ad55c43ed17e91b7396ea6 Mon Sep 17 00:00:00 2001 +From df00884e5108d8518da113aa7a849b6820437205 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/12] Support preexec notifications from an interactive shell @@ -616,10 +616,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 8fad2b477950..b103f3cee0ce 100644 +index 813634fc5119..d902627b101e 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10265,6 +10265,13 @@ Terminal::emit_pending_signals() +@@ -10273,6 +10273,13 @@ Terminal::emit_pending_signals() m_notification_received = false; } @@ -663,7 +663,7 @@ index 94febee1d494..2d757afbdcc0 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index ecd004a814e7..1b3e2690164f 100644 +index 25a2fc8a2358..840f6dd54c53 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -711,10 +711,10 @@ index a9c256635948..79c528ea8243 100644 SIGNAL_TEXT_INSERTED, SIGNAL_TEXT_MODIFIED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 9c0b8b454468..dd98905860f4 100644 +index b4a97c05dba9..8f90d0c44e41 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -715,6 +715,8 @@ public: +@@ -727,6 +727,8 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -724,7 +724,7 @@ index 9c0b8b454468..dd98905860f4 100644 std::string m_current_directory_uri{}; std::string m_current_file_uri{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index 2b69ca2c14f0..d8866cbeb225 100644 +index 4f1d8049726c..f6e32800dd6f 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -739,10 +739,10 @@ index 2b69ca2c14f0..d8866cbeb225 100644 bool -- -2.24.1 +2.30.2 -From f2581b1532eebc4bcfc2337eb367abfd5599dd0c Mon Sep 17 00:00:00 2001 +From 3b594b057f6a8fe530aeb0cc515ac17f8d6d5f20 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/12] Test the shell-preexec signal @@ -804,10 +804,10 @@ index 0c7a70bf6da5..2dece3ddb724 100644 /* Settings */ if (options.no_double_buffer) { -- -2.24.1 +2.30.2 -From cee3f876af49aa199955e557001a57b317f93634 Mon Sep 17 00:00:00 2001 +From 1e48536994e2cec378fed060a389c13ed3aa32fa Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/12] Support precmd notifications from an interactive shell @@ -836,10 +836,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index b103f3cee0ce..1bda2bfbca39 100644 +index d902627b101e..b914f79ff363 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10272,6 +10272,13 @@ Terminal::emit_pending_signals() +@@ -10280,6 +10280,13 @@ Terminal::emit_pending_signals() m_shell_preexec = FALSE; } @@ -884,7 +884,7 @@ index 2d757afbdcc0..a75ae7ee2640 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 1b3e2690164f..0d61f90cda76 100644 +index 840f6dd54c53..3059bdeddc09 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -745,6 +745,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -932,10 +932,10 @@ index 79c528ea8243..534298ada75c 100644 SIGNAL_TEXT_DELETED, SIGNAL_TEXT_INSERTED, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index dd98905860f4..6b1feb377df7 100644 +index 8f90d0c44e41..174b28070db2 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -715,6 +715,7 @@ public: +@@ -727,6 +727,7 @@ public: std::string m_notification_summary; std::string m_notification_body; @@ -944,7 +944,7 @@ index dd98905860f4..6b1feb377df7 100644 std::string m_window_title{}; diff --git a/src/vteseq.cc b/src/vteseq.cc -index d8866cbeb225..f6669f853204 100644 +index f6e32800dd6f..981bf0bba306 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -959,10 +959,10 @@ index d8866cbeb225..f6669f853204 100644 } } -- -2.24.1 +2.30.2 -From 827f0406565cad98f835909451a854c7f8f3ead1 Mon Sep 17 00:00:00 2001 +From c8b80018249aa23576f9fbb75b78205841c47f12 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/12] Test the shell-precmd signal @@ -1024,10 +1024,10 @@ index 2dece3ddb724..960aadc3cdc8 100644 /* Settings */ -- -2.24.1 +2.30.2 -From 55c7d02eaad2bc37bc18c46152825fb2959f2db0 Mon Sep 17 00:00:00 2001 +From dc936676792d001ab8070b3274bcf792592d73e5 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/12] Support tracking the active container inside the @@ -1061,10 +1061,10 @@ agreed upon across multiple different terminal emulators [1]. 6 files changed, 127 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index 1bda2bfbca39..aeca73d55934 100644 +index b914f79ff363..e65e33f31ceb 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10293,6 +10293,15 @@ Terminal::emit_pending_signals() +@@ -10301,6 +10301,15 @@ Terminal::emit_pending_signals() m_window_title_changed = false; } @@ -1096,7 +1096,7 @@ index a75ae7ee2640..53de9c737000 100644 _VTE_PUBLIC const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 0d61f90cda76..15a7f1ab1ce0 100644 +index 3059bdeddc09..53bc922fc6ed 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -483,6 +483,12 @@ vte_terminal_get_property (GObject *object, @@ -1199,7 +1199,7 @@ index 534298ada75c..66d2f1425fad 100644 PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 6b1feb377df7..2329d7fd4c13 100644 +index 174b28070db2..3a773fccf206 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh @@ -61,6 +61,7 @@ @@ -1210,7 +1210,7 @@ index 6b1feb377df7..2329d7fd4c13 100644 #include #include #include -@@ -98,6 +99,18 @@ typedef enum _VteCharacterReplacement { +@@ -110,6 +111,18 @@ typedef enum _VteCharacterReplacement { VTE_CHARACTER_REPLACEMENT_LINE_DRAWING } VteCharacterReplacement; @@ -1229,7 +1229,7 @@ index 6b1feb377df7..2329d7fd4c13 100644 typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -710,6 +723,9 @@ public: +@@ -722,6 +735,9 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -1240,7 +1240,7 @@ index 6b1feb377df7..2329d7fd4c13 100644 bool m_notification_received{false}; std::string m_notification_summary; diff --git a/src/vteseq.cc b/src/vteseq.cc -index f6669f853204..2b9dd9df820a 100644 +index 981bf0bba306..22f250a51499 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -1385,6 +1385,37 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, @@ -1282,10 +1282,10 @@ index f6669f853204..2b9dd9df820a 100644 ++token; -- -2.24.1 +2.30.2 -From e2c44d1e7cf544f26dddfe7ea21452eb53800b83 Mon Sep 17 00:00:00 2001 +From 3ef6f4e22870c5a572ada4ec0d462805b9a28a63 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 2 Apr 2020 18:20:44 +0200 Subject: [PATCH 11/12] widget: Improve legibility when using colours from the @@ -1297,7 +1297,7 @@ https://gitlab.gnome.org/GNOME/vte/-/issues/225 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 15a7f1ab1ce0..5999272c0648 100644 +index 53bc922fc6ed..50b2c53644f2 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -1922,7 +1922,7 @@ vte_terminal_class_init(VteTerminalClass *klass) @@ -1310,10 +1310,10 @@ index 15a7f1ab1ce0..5999272c0648 100644 -1, NULL); -- -2.24.1 +2.30.2 -From 68d735ef2649df34f4a283d70555a88f04231ecc Mon Sep 17 00:00:00 2001 +From debefa23ffec26b86d82a0f7080755c78f47c39f Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Tue, 31 Mar 2020 20:55:23 +0200 Subject: [PATCH 12/12] widget: Improve legibility by tweaking the system @@ -1327,7 +1327,7 @@ https://gitlab.gnome.org/GNOME/vte/-/issues/226 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 5999272c0648..a54c85b42e9d 100644 +index 50b2c53644f2..f70e75f8b183 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc @@ -73,7 +73,8 @@ @@ -1431,5 +1431,5 @@ index 5999272c0648..a54c85b42e9d 100644 "}\n", -1, NULL); -- -2.24.1 +2.30.2 diff --git a/vte291.spec b/vte291.spec index 9b2a08c..cd430d3 100644 --- a/vte291.spec +++ b/vte291.spec @@ -10,7 +10,7 @@ %global pcre2_version 10.21 Name: vte291 -Version: 0.60.3 +Version: 0.60.4 Release: 1%{?dist} Summary: Terminal emulator library @@ -124,6 +124,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_sysconfdir}/profile.d/vte.sh %changelog +* Fri May 07 2021 Debarshi Ray - 0.60.4-1 +- Update to 0.60.4 + * Mon Jun 01 2020 Kalev Lember - 0.60.3-1 - Update to 0.60.3