diff --git a/vte-0.68.0.tar.xz b/vte-0.68.0.tar.xz deleted file mode 100644 index d6711a84fe57396975c26bbbd3ad07f1aec9696a..0000000000000000000000000000000000000000 Binary files a/vte-0.68.0.tar.xz and /dev/null differ diff --git a/vte-0.70.2.tar.xz b/vte-0.70.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..99e1bd50d23792c8b9d96f7f9f5d1b6cebcec501 Binary files /dev/null and b/vte-0.70.2.tar.xz differ diff --git a/vte291-cntnr-precmd-preexec-scroll.patch b/vte291-cntnr-precmd-preexec-scroll.patch index bb93ced7786709525b9aa1d2cdead73d7d2d65ed..dbc727f73f2a52356de9b10b887dd563ed3e6ad2 100644 --- a/vte291-cntnr-precmd-preexec-scroll.patch +++ b/vte291-cntnr-precmd-preexec-scroll.patch @@ -1,4 +1,4 @@ -From c809170f42582f3f02fbcc10e5157ebae9efd0ce Mon Sep 17 00:00:00 2001 +From 3354db2ca10487dd6ced2c54130b12e3a7bc53f8 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 01/11] Add sequences and signals for desktop notification @@ -18,13 +18,13 @@ https://phab.enlightenment.org/T1765 https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- src/marshal.list | 1 + - src/vte.cc | 8 ++++++++ + src/vte.cc | 10 ++++++++++ src/vte/vteterminal.h | 4 +++- - src/vtegtk.cc | 21 +++++++++++++++++++++ - src/vtegtk.hh | 1 + - src/vteinternal.hh | 8 ++++++++ - src/vteseq.cc | 32 +++++++++++++++++++++++++++++++- - 7 files changed, 73 insertions(+), 2 deletions(-) + src/vtegtk.cc | 25 +++++++++++++++++++++++++ + src/vtegtk.hh | 3 +++ + src/vteinternal.hh | 14 ++++++++++++++ + src/vteseq.cc | 37 +++++++++++++++++++++++++++++++++++++ + 7 files changed, 93 insertions(+), 1 deletion(-) diff --git a/src/marshal.list b/src/marshal.list index 241128c3..4412cf3d 100644 @@ -36,13 +36,14 @@ index 241128c3..4412cf3d 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 8b75883f..05cc5589 100644 +index a8671845..77533d82 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10032,6 +10032,14 @@ Terminal::emit_pending_signals() +@@ -10164,6 +10164,16 @@ Terminal::emit_pending_signals() emit_adjustment_changed(); ++#if _VTE_GTK == 3 + if (m_pending_changes & vte::to_integral(PendingChanges::NOTIFICATION)) { + _vte_debug_print (VTE_DEBUG_SIGNALS, + "Emitting `notification-received'.\n"); @@ -50,21 +51,21 @@ index 8b75883f..05cc5589 100644 + m_notification_summary.c_str(), + m_notification_body.c_str()); + } ++#endif + if (m_pending_changes & vte::to_integral(PendingChanges::TITLE)) { 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 41f153d0..1e9a737a 100644 +index 78176f97..ac762498 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -108,10 +108,12 @@ struct _VteTerminalClass { - +@@ -109,9 +109,11 @@ struct _VteTerminalClass { void (*bell)(VteTerminal* terminal); + #if _VTE_GTK == 3 + void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body); + - #if _VTE_GTK == 3 /* Compatibility padding due to fedora patches intruding on our ABI */ /*< private >*/ - gpointer _extra_padding[3]; @@ -73,21 +74,24 @@ index 41f153d0..1e9a737a 100644 /* Add new vfuncs here, and subtract from the padding below. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 05b82294..a09a2f75 100644 +index 3945ba67..570f8e69 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1242,6 +1242,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1251,6 +1251,9 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; ++#if _VTE_GTK == 3 + klass->notification_received = NULL; ++#endif klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -1325,6 +1326,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1334,6 +1337,28 @@ vte_terminal_class_init(VteTerminalClass *klass) G_OBJECT_CLASS_TYPE(klass), g_cclosure_marshal_VOID__INTv); ++#if _VTE_GTK == 3 + /** + * VteTerminal::notification-received: + * @vteterminal: the object which received the signal @@ -107,63 +111,73 @@ index 05b82294..a09a2f75 100644 + _vte_marshal_VOID__STRING_STRING, + G_TYPE_NONE, + 2, G_TYPE_STRING, G_TYPE_STRING); ++#endif + /** * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 6b7a1ea2..8ba10395 100644 +index 6b7a1ea2..d5379b16 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -52,6 +52,7 @@ enum { +@@ -52,6 +52,9 @@ enum { SIGNAL_RESIZE_WINDOW, SIGNAL_RESTORE_WINDOW, SIGNAL_SELECTION_CHANGED, ++#if _VTE_GTK == 3 + SIGNAL_NOTIFICATION_RECEIVED, ++#endif SIGNAL_WINDOW_TITLE_CHANGED, LAST_SIGNAL }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index eb95ad68..69a32276 100644 +index 0d454649..8dba726c 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -660,6 +660,10 @@ public: +@@ -662,6 +662,12 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; ++#if _VTE_GTK == 3 + /* desktop notification */ + std::string m_notification_summary; + std::string m_notification_body; ++#endif + std::string m_window_title{}; std::string m_current_directory_uri{}; std::string m_current_file_uri{}; -@@ -673,6 +677,7 @@ public: +@@ -675,6 +681,9 @@ public: TITLE = 1u << 0, CWD = 1u << 1, CWF = 1u << 2, ++#if _VTE_GTK == 3 + NOTIFICATION = 1u << 3, ++#endif }; unsigned m_pending_changes{0}; -@@ -1488,6 +1493,9 @@ public: +@@ -1506,6 +1515,11 @@ public: int osc) noexcept; /* OSC handlers */ ++#if _VTE_GTK == 3 + void handle_urxvt_extension(vte::parser::Sequence const& seq, + vte::parser::StringTokeniser::const_iterator& token, + vte::parser::StringTokeniser::const_iterator const& endtoken) noexcept; ++#endif void set_color(vte::parser::Sequence const& seq, vte::parser::StringTokeniser::const_iterator& token, vte::parser::StringTokeniser::const_iterator const& endtoken, diff --git a/src/vteseq.cc b/src/vteseq.cc -index 874d2405..537e8e13 100644 +index 874d2405..dda487c4 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1376,6 +1376,33 @@ Terminal::delete_lines(vte::grid::row_t param) +@@ -1376,6 +1376,35 @@ Terminal::delete_lines(vte::grid::row_t param) m_text_deleted_flag = TRUE; } ++#if _VTE_GTK == 3 +void +Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, + vte::parser::StringTokeniser::const_iterator& token, @@ -190,34 +204,39 @@ index 874d2405..537e8e13 100644 + return; + } +} ++#endif + bool Terminal::get_osc_color_index(int osc, int value, -@@ -6541,6 +6568,10 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6541,6 +6570,12 @@ Terminal::OSC(vte::parser::Sequence const& seq) reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE); break; ++#if _VTE_GTK == 3 + case VTE_OSC_URXVT_EXTENSION: + handle_urxvt_extension(seq, it, cend); + break; ++#endif + case VTE_OSC_XTERM_SET_ICON_TITLE: case VTE_OSC_XTERM_SET_XPROPERTY: case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG: -@@ -6582,7 +6613,6 @@ Terminal::OSC(vte::parser::Sequence const& seq) +@@ -6582,7 +6617,9 @@ 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: -- case VTE_OSC_URXVT_EXTENSION: ++#if _VTE_GTK != 3 + case VTE_OSC_URXVT_EXTENSION: ++#endif case VTE_OSC_YF_RQGWR: default: break; -- -2.35.1 +2.37.3 -From 05a642746f1c3985ea204571e0179a1147dda1a9 Mon Sep 17 00:00:00 2001 +From ca0549eafe1fd03d11a632d07c0fab7fd4b333ac Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -250,49 +269,23 @@ index 242d6c42..50242223 100644 } -- -2.35.1 +2.37.3 -From d0cca4421d0108b0f9e23ea03ea5e99f745646a6 Mon Sep 17 00:00:00 2001 +From b281275ed320f9a2f82d6e436a397ad005dafce0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 03/11] Test the notification-received signal --- - bindings/vala/app.vala | 7 +++++++ - src/app/app.cc | 10 ++++++++++ - 2 files changed, 17 insertions(+) + src/app/app.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 4bcb5804..06546440 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow - if (Options.object_notifications) - terminal.notify.connect(notify_cb); - -+ terminal.notification_received.connect(notification_received_cb); -+ - /* Settings */ - if (Options.no_double_buffer) - terminal.set_double_buffered(false); -@@ -780,6 +782,11 @@ class Window : Gtk.ApplicationWindow - set_title(terminal.get_window_title()); - } - -+ private void notification_received_cb(Vte.Terminal terminal, string summary, string? body) -+ { -+ print ("[%s]: %s\n", summary, body); -+ } -+ - } /* class Window */ - - class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index 3b7835aa..fc8220a5 100644 +index a69d9327..88fe5f2f 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2209,6 +2209,14 @@ window_window_title_changed_cb(VteTerminal* terminal, +@@ -2286,6 +2286,14 @@ window_window_title_changed_cb(VteTerminal* terminal, gtk_window_set_title(GTK_WINDOW(window), title && title[0] ? title : "Terminal"); } @@ -307,7 +300,7 @@ index 3b7835aa..fc8220a5 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2505,6 +2513,8 @@ vteapp_window_constructed(GObject *object) +@@ -2582,6 +2590,8 @@ vteapp_window_constructed(GObject *object) if (options.object_notifications) g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window); @@ -317,10 +310,10 @@ index 3b7835aa..fc8220a5 100644 #if VTE_GTK == 3 if (options.no_double_buffer) { -- -2.35.1 +2.37.3 -From e87bc628fdecf7480c12b861ba3fb98b03abe4d9 Mon Sep 17 00:00:00 2001 +From 2832ac1e0bf8eb3e0147b0803637765a4b5ac832 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:53:54 +0200 Subject: [PATCH 04/11] Add a property to configure the scroll speed @@ -330,43 +323,32 @@ moving the buffer by a function of the number of visible rows. https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- - doc/reference/vte-sections.txt.in | 1 + - src/vte.cc | 19 +++++++++++- - src/vte/vteterminal.h | 4 +++ - src/vtegtk.cc | 51 +++++++++++++++++++++++++++++++ - src/vtegtk.hh | 1 + - src/vteinternal.hh | 2 ++ - 6 files changed, 77 insertions(+), 1 deletion(-) + src/vte.cc | 25 ++++++++++++++++++ + src/vte/vteterminal.h | 6 +++++ + src/vtegtk.cc | 59 +++++++++++++++++++++++++++++++++++++++++++ + src/vtegtk.hh | 3 +++ + src/vteinternal.hh | 6 +++++ + 5 files changed, 99 insertions(+) -diff --git a/doc/reference/vte-sections.txt.in b/doc/reference/vte-sections.txt.in -index 283dd056..64907389 100644 ---- a/doc/reference/vte-sections.txt.in -+++ b/doc/reference/vte-sections.txt.in -@@ -58,6 +58,7 @@ vte_terminal_get_cursor_blink_mode - vte_terminal_set_cursor_blink_mode - vte_terminal_get_text_blink_mode - vte_terminal_set_text_blink_mode -+vte_terminal_set_scroll_speed - vte_terminal_set_scrollback_lines - vte_terminal_get_scrollback_lines - vte_terminal_set_font diff --git a/src/vte.cc b/src/vte.cc -index 05cc5589..a4e6069d 100644 +index 77533d82..e2723342 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -9239,6 +9239,7 @@ vte_cairo_get_clip_region(cairo_t *cr) +@@ -9364,6 +9364,9 @@ vte_cairo_get_clip_region(cairo_t *cr) bool Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) { ++#if _VTE_GTK == 3 + gdouble scroll_speed; ++#endif gdouble v; gint cnt, i; int button; -@@ -9273,7 +9274,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) +@@ -9398,7 +9401,17 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event) return true; } -- v = MAX (1., ceil (m_row_count /* page increment */ / 10.)); ++#if _VTE_GTK == 3 + if (m_scroll_speed == 0) { + scroll_speed = ceil (m_row_count /* page increment */ / 10.); + } else { @@ -374,13 +356,17 @@ index 05cc5589..a4e6069d 100644 + } + + v = MAX (1., scroll_speed); ++#else + v = MAX (1., ceil (m_row_count /* page increment */ / 10.)); ++#endif _vte_debug_print(VTE_DEBUG_EVENTS, "Scroll speed is %d lines per non-smooth scroll unit\n", (int) v); -@@ -9583,6 +9590,16 @@ Terminal::decscusr_cursor_shape() const noexcept +@@ -9708,6 +9721,18 @@ Terminal::decscusr_cursor_shape() const noexcept } } ++#if _VTE_GTK == 3 +bool +Terminal::set_scroll_speed(unsigned int scroll_speed) +{ @@ -390,53 +376,61 @@ index 05cc5589..a4e6069d 100644 + m_scroll_speed = scroll_speed; + return true; +} ++#endif + bool Terminal::set_scrollback_lines(long lines) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 1e9a737a..b63967a3 100644 +index ac762498..972c4a0c 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -330,6 +330,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, +@@ -330,6 +330,12 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, _VTE_PUBLIC VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++#if _VTE_GTK == 3 +_VTE_PUBLIC +void vte_terminal_set_scroll_speed(VteTerminal *terminal, + guint scroll_speed) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++#endif + /* Set the number of scrollback lines, above or at an internal minimum. */ _VTE_PUBLIC void vte_terminal_set_scrollback_lines(VteTerminal *terminal, diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index a09a2f75..ab1de923 100644 +index 570f8e69..a9f58696 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -993,6 +993,9 @@ try +@@ -1002,6 +1002,11 @@ try case PROP_REWRAP_ON_RESIZE: g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal)); break; ++#if _VTE_GTK == 3 + case PROP_SCROLL_SPEED: + g_value_set_uint (value, impl->m_scroll_speed); + break; ++#endif case PROP_SCROLLBACK_LINES: g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal)); break; -@@ -1114,6 +1117,9 @@ try +@@ -1123,6 +1128,11 @@ try case PROP_REWRAP_ON_RESIZE: vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value)); break; ++#if _VTE_GTK == 3 + case PROP_SCROLL_SPEED: + vte_terminal_set_scroll_speed (terminal, g_value_get_uint (value)); + break; ++#endif case PROP_SCROLLBACK_LINES: vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value)); break; -@@ -2210,6 +2216,21 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -2223,6 +2233,23 @@ vte_terminal_class_init(VteTerminalClass *klass) TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); ++#if _VTE_GTK == 3 + /** + * VteTerminal:scroll-speed: + * @@ -451,14 +445,16 @@ index a09a2f75..ab1de923 100644 + 0, G_MAXUINT, + 0, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); ++#endif + /** * VteTerminal:scrollback-lines: * -@@ -5726,6 +5747,36 @@ catch (...) +@@ -5958,6 +5985,38 @@ catch (...) return -1; } ++#if _VTE_GTK == 3 +/** + * vte_terminal_set_scroll_speed: + * @terminal: a #VteTerminal @@ -488,120 +484,103 @@ index a09a2f75..ab1de923 100644 +{ + vte::log_exception(); +} ++#endif + /** * vte_terminal_set_scrollback_lines: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 8ba10395..f6cd891b 100644 +index d5379b16..3f1ae86d 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -86,6 +86,7 @@ enum { +@@ -88,6 +88,9 @@ enum { PROP_MOUSE_POINTER_AUTOHIDE, PROP_PTY, PROP_REWRAP_ON_RESIZE, ++#if _VTE_GTK == 3 + PROP_SCROLL_SPEED, ++#endif PROP_SCROLLBACK_LINES, PROP_SCROLL_ON_KEYSTROKE, PROP_SCROLL_ON_OUTPUT, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 69a32276..d3e25179 100644 +index 8dba726c..4629c95f 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -426,6 +426,7 @@ public: +@@ -428,6 +428,9 @@ public: bool m_fallback_scrolling{true}; bool m_scroll_on_output{false}; bool m_scroll_on_keystroke{true}; ++#if _VTE_GTK == 3 + guint m_scroll_speed; ++#endif vte::grid::row_t m_scrollback_lines{0}; inline auto scroll_limit_lower() const noexcept -@@ -1363,6 +1364,7 @@ public: +@@ -1385,6 +1388,9 @@ public: bool set_input_enabled(bool enabled); bool set_mouse_autohide(bool autohide); bool set_rewrap_on_resize(bool rewrap); ++#if _VTE_GTK == 3 + bool set_scroll_speed(unsigned int scroll_speed); ++#endif bool set_scrollback_lines(long lines); bool set_fallback_scrolling(bool set); auto fallback_scrolling() const noexcept { return m_fallback_scrolling; } -- -2.35.1 +2.37.3 -From f8a8d2adf1000720f269adb80473e8971bc51135 Mon Sep 17 00:00:00 2001 +From 10f3d37fdc465152b805e54d3217a61d69e4c255 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 13 May 2016 17:54:57 +0200 Subject: [PATCH 05/11] Test the scroll-speed property https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- - bindings/vala/app.vala | 4 ++++ - src/app/app.cc | 4 ++++ - 2 files changed, 8 insertions(+) + src/app/app.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 06546440..552a702d 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow - terminal.set_rewrap_on_resize(!Options.no_rewrap); - terminal.set_scroll_on_output(false); - terminal.set_scroll_on_keystroke(true); -+ terminal.set_scroll_speed(Options.scroll_speed); - terminal.set_scrollback_lines(Options.scrollback_lines); - - /* Style */ -@@ -857,6 +858,7 @@ class App : Gtk.Application - public static bool object_notifications = false; - public static string? output_filename = null; - public static bool reverse = false; -+ public static uint scroll_speed = 0; - public static int scrollback_lines = 512; - public static int transparency_percent = 0; - public static bool version = false; -@@ -1050,6 +1052,8 @@ class App : Gtk.Application - "Save terminal contents to file at exit", null }, - { "reverse", 0, 0, OptionArg.NONE, ref reverse, - "Reverse foreground/background colors", null }, -+ { "scroll-speed", 0, 0, OptionArg.INT, ref scroll_speed, -+ "Specify the scroll speed", null }, - { "scrollback-lines", 'n', 0, OptionArg.INT, ref scrollback_lines, - "Specify the number of scrollback-lines", null }, - { "transparent", 'T', 0, OptionArg.INT, ref transparency_percent, diff --git a/src/app/app.cc b/src/app/app.cc -index fc8220a5..c6f5cc0b 100644 +index 88fe5f2f..49a1689d 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -118,6 +118,7 @@ public: +@@ -118,6 +118,9 @@ public: int verbosity{0}; double cell_height_scale{1.0}; double cell_width_scale{1.0}; ++#if _VTE_GTK == 3 + unsigned int scroll_speed{0}; ++#endif VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM}; VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK}; VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS}; -@@ -620,6 +621,8 @@ public: +@@ -700,6 +703,10 @@ 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 }, ++#if _VTE_GTK == 3 + { "scroll-speed", 0, 0, G_OPTION_ARG_INT, &scroll_speed, + "Specify the scroll speed", nullptr }, ++#endif { "scroll-unit-is-pixels", 0, 0, G_OPTION_ARG_NONE, &scroll_unit_is_pixels, "Use pixels as scroll unit", nullptr }, { "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines, -@@ -2549,6 +2552,7 @@ vteapp_window_constructed(GObject *object) +@@ -2626,6 +2633,9 @@ 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); ++#if _VTE_GTK == 3 + vte_terminal_set_scroll_speed(window->terminal, options.scroll_speed); ++#endif vte_terminal_set_scroll_unit_is_pixels(window->terminal, options.scroll_unit_is_pixels); vte_terminal_set_scrollback_lines(window->terminal, options.scrollback_lines); vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode); -- -2.35.1 +2.37.3 -From 60d5670e793d2aa2ccda489e4e468bbc9c120908 Mon Sep 17 00:00:00 2001 +From d2f139cc2f440a390bec6438a4292b50213f5818 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 06/11] Support preexec notifications from an interactive shell @@ -630,22 +609,22 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index a4e6069d..6d8ab2bb 100644 +index e2723342..766b7624 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10057,6 +10057,12 @@ Terminal::emit_pending_signals() +@@ -10197,6 +10197,12 @@ Terminal::emit_pending_signals() + m_notification_summary.c_str(), m_notification_body.c_str()); } - ++ + if (m_pending_changes & vte::to_integral(PendingChanges::SHELL_PREEXEC)) { + _vte_debug_print (VTE_DEBUG_SIGNALS, + "Emitting `shell-preexec'.\n"); + g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0); + } -+ + #endif + if (m_pending_changes & vte::to_integral(PendingChanges::TITLE)) { - 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 50242223..01b44e23 100644 --- a/src/vte.sh.in @@ -663,16 +642,15 @@ index 50242223..01b44e23 100644 elif [[ -n "${ZSH_VERSION:-}" ]]; then diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index b63967a3..062b6694 100644 +index 972c4a0c..8bdd3ccf 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -109,11 +109,12 @@ struct _VteTerminalClass { - void (*bell)(VteTerminal* terminal); +@@ -110,10 +110,11 @@ struct _VteTerminalClass { + #if _VTE_GTK == 3 void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body); + void (*shell_preexec)(VteTerminal* terminal); - #if _VTE_GTK == 3 /* Compatibility padding due to fedora patches intruding on our ABI */ /*< private >*/ - gpointer _extra_padding[2]; @@ -681,21 +659,22 @@ index b63967a3..062b6694 100644 /* Add new vfuncs here, and subtract from the padding below. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index ab1de923..a4d51bfb 100644 +index a9f58696..797865db 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) - klass->encoding_changed = NULL; +@@ -1263,6 +1263,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->char_size_changed = NULL; + #if _VTE_GTK == 3 klass->notification_received = NULL; + klass->shell_preexec = NULL; + #endif klass->window_title_changed = NULL; klass->icon_title_changed = NULL; - klass->selection_changed = NULL; -@@ -1352,6 +1353,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1367,6 +1368,23 @@ vte_terminal_class_init(VteTerminalClass *klass) + _vte_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); - ++ + /** + * VteTerminal::shell-preexec: + * @vteterminal: the object which received the signal @@ -712,39 +691,38 @@ index ab1de923..a4d51bfb 100644 + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); -+ + #endif + /** - * VteTerminal::window-title-changed: - * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index f6cd891b..bf85bdf4 100644 +index 3f1ae86d..0c86fb6e 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -52,6 +52,7 @@ enum { - SIGNAL_RESIZE_WINDOW, +@@ -53,6 +53,7 @@ enum { SIGNAL_RESTORE_WINDOW, SIGNAL_SELECTION_CHANGED, + #if _VTE_GTK == 3 + SIGNAL_SHELL_PREEXEC, SIGNAL_NOTIFICATION_RECEIVED, + #endif SIGNAL_WINDOW_TITLE_CHANGED, - LAST_SIGNAL diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index d3e25179..b4f1b4c9 100644 +index 4629c95f..dfa3c0b9 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -679,6 +679,7 @@ public: - CWD = 1u << 1, +@@ -686,6 +686,7 @@ public: CWF = 1u << 2, + #if _VTE_GTK == 3 NOTIFICATION = 1u << 3, + SHELL_PREEXEC = 1u << 4, + #endif }; unsigned m_pending_changes{0}; - diff --git a/src/vteseq.cc b/src/vteseq.cc -index 537e8e13..dbc6276f 100644 +index dda487c4..f2c86b2c 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1401,6 +1401,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; } @@ -753,13 +731,13 @@ index 537e8e13..dbc6276f 100644 + m_pending_changes |= vte::to_integral(PendingChanges::SHELL_PREEXEC); + } } + #endif - bool -- -2.35.1 +2.37.3 -From 9fe74c4f17f1fb708a90f22a64fd2b5f4aa794a9 Mon Sep 17 00:00:00 2001 +From 05425620f9e65704eec774cd567e15f5e385f89d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 20 Apr 2018 18:21:53 +0200 Subject: [PATCH 07/11] Test the shell-preexec signal @@ -767,39 +745,14 @@ Subject: [PATCH 07/11] Test the shell-preexec signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- - bindings/vala/app.vala | 6 ++++++ - src/app/app.cc | 7 +++++++ - 2 files changed, 13 insertions(+) + src/app/app.cc | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index 552a702d..cc30f9ad 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow - terminal.notify.connect(notify_cb); - - terminal.notification_received.connect(notification_received_cb); -+ terminal.shell_preexec.connect(shell_preexec_cb); - - /* Settings */ - if (Options.no_double_buffer) -@@ -788,6 +789,11 @@ class Window : Gtk.ApplicationWindow - print ("[%s]: %s\n", summary, body); - } - -+ private void shell_preexec_cb(Vte.Terminal terminal) -+ { -+ print("[shell] executing command\n"); -+ } -+ - } /* class Window */ - - class App : Gtk.Application diff --git a/src/app/app.cc b/src/app/app.cc -index c6f5cc0b..33a9481e 100644 +index 49a1689d..90b2dfe5 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2301,6 +2301,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -812,7 +765,7 @@ index c6f5cc0b..33a9481e 100644 static void window_lower_window_cb(VteTerminal* terminal, VteappWindow* window) -@@ -2517,6 +2523,7 @@ vteapp_window_constructed(GObject *object) +@@ -2598,6 +2604,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); @@ -821,10 +774,10 @@ index c6f5cc0b..33a9481e 100644 /* Settings */ #if VTE_GTK == 3 -- -2.35.1 +2.37.3 -From ed2a83fbf034f79f7c08e8d5e4eeaaea2599e484 Mon Sep 17 00:00:00 2001 +From 57dd88ebfe1b3df1bafe7fd904dd0df7c1094f59 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:20:30 +0200 Subject: [PATCH 08/11] Support precmd notifications from an interactive shell @@ -845,30 +798,30 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- src/vte.cc | 6 ++++++ src/vte.sh.in | 2 +- - src/vte/vteterminal.h | 7 +------ + src/vte/vteterminal.h | 5 +---- src/vtegtk.cc | 18 ++++++++++++++++++ src/vtegtk.hh | 1 + src/vteinternal.hh | 1 + src/vteseq.cc | 4 +++- - 7 files changed, 31 insertions(+), 8 deletions(-) + 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index 6d8ab2bb..e8a344ee 100644 +index 766b7624..6cef7b17 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10063,6 +10063,12 @@ Terminal::emit_pending_signals() +@@ -10203,6 +10203,12 @@ Terminal::emit_pending_signals() + "Emitting `shell-preexec'.\n"); g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0); } - ++ + if (m_pending_changes & vte::to_integral(PendingChanges::SHELL_PRECMD)) { + _vte_debug_print (VTE_DEBUG_SIGNALS, + "Emitting `shell-precmd'.\n"); + g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PRECMD], 0); + } -+ + #endif + if (m_pending_changes & vte::to_integral(PendingChanges::TITLE)) { - 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 01b44e23..877fe93d 100644 --- a/src/vte.sh.in @@ -883,38 +836,35 @@ index 01b44e23..877fe93d 100644 } diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index 062b6694..ed08880d 100644 +index 8bdd3ccf..31bb3b75 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -109,14 +109,9 @@ struct _VteTerminalClass { - void (*bell)(VteTerminal* terminal); +@@ -110,11 +110,8 @@ struct _VteTerminalClass { + #if _VTE_GTK == 3 void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body); + void (*shell_precmd)(VteTerminal* terminal); void (*shell_preexec)(VteTerminal* terminal); - --#if _VTE_GTK == 3 +- - /* Compatibility padding due to fedora patches intruding on our ABI */ - /*< private >*/ - gpointer _extra_padding[1]; --#endif /* _VTE_GTK == 3 */ -- - /* Add new vfuncs here, and subtract from the padding below. */ + #endif /* _VTE_GTK == 3 */ - /* Padding for future expansion. */ + /* Add new vfuncs here, and subtract from the padding below. */ diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index a4d51bfb..7020c2af 100644 +index 797865db..bd3a8798 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass) - klass->encoding_changed = NULL; +@@ -1263,6 +1263,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->char_size_changed = NULL; + #if _VTE_GTK == 3 klass->notification_received = NULL; + klass->shell_precmd = NULL; klass->shell_preexec = NULL; + #endif klass->window_title_changed = NULL; - klass->icon_title_changed = NULL; -@@ -1353,6 +1354,23 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -1369,6 +1370,23 @@ vte_terminal_class_init(VteTerminalClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); @@ -939,34 +889,34 @@ index a4d51bfb..7020c2af 100644 * VteTerminal::shell-preexec: * @vteterminal: the object which received the signal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index bf85bdf4..cee56b65 100644 +index 0c86fb6e..e871b946 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -52,6 +52,7 @@ enum { - SIGNAL_RESIZE_WINDOW, +@@ -53,6 +53,7 @@ enum { SIGNAL_RESTORE_WINDOW, SIGNAL_SELECTION_CHANGED, + #if _VTE_GTK == 3 + SIGNAL_SHELL_PRECMD, SIGNAL_SHELL_PREEXEC, SIGNAL_NOTIFICATION_RECEIVED, - SIGNAL_WINDOW_TITLE_CHANGED, + #endif diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index b4f1b4c9..eabc0062 100644 +index dfa3c0b9..b8e30d15 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -680,6 +680,7 @@ public: - CWF = 1u << 2, +@@ -687,6 +687,7 @@ public: + #if _VTE_GTK == 3 NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, + SHELL_PRECMD = 1u << 5, + #endif }; unsigned m_pending_changes{0}; - diff --git a/src/vteseq.cc b/src/vteseq.cc -index dbc6276f..4de2a6f1 100644 +index f2c86b2c..bae18595 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -1402,7 +1402,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, +@@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, return; } @@ -978,10 +928,10 @@ index dbc6276f..4de2a6f1 100644 } } -- -2.35.1 +2.37.3 -From 2f3ea5834f7ae8c946724c3aef05964383088ec0 Mon Sep 17 00:00:00 2001 +From 089580a09de21160f871875fe960e895bc5b5bc2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 2 May 2018 17:30:48 +0200 Subject: [PATCH 09/11] Test the shell-precmd signal @@ -989,39 +939,14 @@ Subject: [PATCH 09/11] Test the shell-precmd signal https://bugzilla.gnome.org/show_bug.cgi?id=711059 https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- - bindings/vala/app.vala | 6 ++++++ - src/app/app.cc | 7 +++++++ - 2 files changed, 13 insertions(+) + src/app/app.cc | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala -index cc30f9ad..ecc4b769 100644 ---- a/bindings/vala/app.vala -+++ b/bindings/vala/app.vala -@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow - terminal.notify.connect(notify_cb); - - terminal.notification_received.connect(notification_received_cb); -+ terminal.shell_precmd.connect(shell_precmd_cb); - terminal.shell_preexec.connect(shell_preexec_cb); - - /* Settings */ -@@ -789,6 +790,11 @@ class Window : Gtk.ApplicationWindow - print ("[%s]: %s\n", summary, body); - } - -+ private void shell_precmd_cb(Vte.Terminal terminal) -+ { -+ print("[shell] showing command prompt\n"); -+ } -+ - private void shell_preexec_cb(Vte.Terminal terminal) - { - print("[shell] executing command\n"); diff --git a/src/app/app.cc b/src/app/app.cc -index 33a9481e..d30f8bd7 100644 +index 90b2dfe5..5c4946c9 100644 --- a/src/app/app.cc +++ b/src/app/app.cc -@@ -2220,6 +2220,12 @@ notification_received_cb(VteTerminal *terminal, +@@ -2301,6 +2301,12 @@ notification_received_cb(VteTerminal *terminal, g_print("[%s]: %s\n", summary, body); } @@ -1034,7 +959,7 @@ index 33a9481e..d30f8bd7 100644 static void shell_preexec_cb(VteTerminal *terminal) { -@@ -2523,6 +2529,7 @@ vteapp_window_constructed(GObject *object) +@@ -2604,6 +2610,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); @@ -1043,10 +968,10 @@ index 33a9481e..d30f8bd7 100644 /* Settings */ -- -2.35.1 +2.37.3 -From 08d50a8599dad3ac60f54cb0aeeadb3ca26c214d Mon Sep 17 00:00:00 2001 +From 2e940b5a720dea9a06fd47862381f27f765f76dd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 10 Jun 2019 20:30:18 +0200 Subject: [PATCH 10/11] Support tracking the active container inside the @@ -1080,21 +1005,22 @@ agreed upon across multiple different terminal emulators [1]. [1] https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 --- src/vte.cc | 8 ++++ - src/vte/vteterminal.h | 4 ++ - src/vtegtk.cc | 77 ++++++++++++++++++++++++++++++++++++++ - src/vtegtk.hh | 2 + - src/vteinternal.hh | 16 ++++++++ - src/vteseq.cc | 86 +++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 193 insertions(+) + src/vte/vteterminal.h | 6 +++ + src/vtegtk.cc | 83 +++++++++++++++++++++++++++++++++++++++ + src/vtegtk.hh | 4 ++ + src/vteinternal.hh | 20 ++++++++++ + src/vteseq.cc | 90 +++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 211 insertions(+) diff --git a/src/vte.cc b/src/vte.cc -index e8a344ee..a3ca5108 100644 +index 6cef7b17..21823424 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals() - m_window_title_pending.clear(); - } - +@@ -10209,6 +10209,14 @@ Terminal::emit_pending_signals() + "Emitting `shell-precmd'.\n"); + g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PRECMD], 0); + } ++ + if (m_pending_changes & vte::to_integral(PendingChanges::CONTAINERS)) { + _vte_debug_print(VTE_DEBUG_SIGNALS, + "Notifying `current-container-name' and `current-container-runtime'.\n"); @@ -1102,46 +1028,50 @@ index e8a344ee..a3ca5108 100644 + g_object_notify_by_pspec(freezer.get(), pspecs[PROP_CURRENT_CONTAINER_NAME]); + g_object_notify_by_pspec(freezer.get(), pspecs[PROP_CURRENT_CONTAINER_RUNTIME]); + } -+ - if (m_pending_changes & vte::to_integral(PendingChanges::CWD)) { - if (m_current_directory_uri != m_current_directory_uri_pending) { - m_current_directory_uri.swap(m_current_directory_uri_pending); + #endif + + if (m_pending_changes & vte::to_integral(PendingChanges::TITLE)) { diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index ed08880d..d25eb93a 100644 +index 31bb3b75..12ecf181 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -511,6 +511,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT +@@ -551,6 +551,12 @@ _VTE_PUBLIC + glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); _VTE_PUBLIC const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); - _VTE_PUBLIC ++#if _VTE_GTK == 3 ++_VTE_PUBLIC +const char *vte_terminal_get_current_container_name(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); +_VTE_PUBLIC +const char *vte_terminal_get_current_container_runtime(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); -+_VTE_PUBLIC ++#endif + _VTE_PUBLIC const char *vte_terminal_get_current_directory_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); _VTE_PUBLIC - const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index 7020c2af..2ee5b029 100644 +index bd3a8798..0457b2b9 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -942,6 +942,12 @@ try +@@ -951,6 +951,14 @@ try case PROP_CURSOR_BLINK_MODE: g_value_set_enum (value, vte_terminal_get_cursor_blink_mode (terminal)); break; ++#if _VTE_GTK == 3 + case PROP_CURRENT_CONTAINER_NAME: + g_value_set_string (value, vte_terminal_get_current_container_name (terminal)); + break; + case PROP_CURRENT_CONTAINER_RUNTIME: + g_value_set_string (value, vte_terminal_get_current_container_runtime (terminal)); + break; ++#endif case PROP_CURRENT_DIRECTORY_URI: g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal)); break; -@@ -2357,6 +2363,27 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -2376,6 +2384,29 @@ vte_terminal_class_init(VteTerminalClass *klass) NULL, (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); ++#if _VTE_GTK == 3 + /** + * VteTerminal:current-container-name: + * @@ -1162,14 +1092,16 @@ index 7020c2af..2ee5b029 100644 + g_param_spec_string ("current-container-runtime", NULL, NULL, + NULL, + (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); ++#endif + /** * VteTerminal:current-directory-uri: * -@@ -4929,6 +4956,56 @@ catch (...) +@@ -5129,6 +5160,58 @@ catch (...) return -1; } ++#if _VTE_GTK == 3 +/** + * vte_terminal_get_current_container_name: + * @terminal: a #VteTerminal @@ -1219,39 +1151,45 @@ index 7020c2af..2ee5b029 100644 + vte::log_exception(); + return NULL; +} ++#endif + /** * vte_terminal_get_current_directory_uri: * @terminal: a #VteTerminal diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index cee56b65..e41f2f3a 100644 +index e871b946..0a31d205 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -72,6 +72,8 @@ enum { +@@ -74,6 +74,10 @@ enum { PROP_CJK_AMBIGUOUS_WIDTH, PROP_CURSOR_BLINK_MODE, PROP_CURSOR_SHAPE, ++#if _VTE_GTK == 3 + PROP_CURRENT_CONTAINER_NAME, + PROP_CURRENT_CONTAINER_RUNTIME, ++#endif PROP_CURRENT_DIRECTORY_URI, PROP_CURRENT_FILE_URI, PROP_DELETE_BINDING, diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index eabc0062..dcb6a6fc 100644 +index b8e30d15..0c52442b 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -59,6 +59,7 @@ +@@ -59,6 +59,9 @@ #include #include #include ++#if _VTE_GTK == 3 +#include ++#endif #include #include #include -@@ -110,6 +111,18 @@ typedef enum _VteCharacterReplacement { +@@ -110,6 +113,20 @@ typedef enum _VteCharacterReplacement { VTE_CHARACTER_REPLACEMENT_LINE_DRAWING } VteCharacterReplacement; ++#if _VTE_GTK == 3 +struct VteContainer { +public: + VteContainer(const std::string &name, const std::string &runtime) : @@ -1263,50 +1201,57 @@ index eabc0062..dcb6a6fc 100644 + std::string m_name; + std::string m_runtime; +}; ++#endif + typedef struct _VtePaletteColor { struct { vte::color::rgb color; -@@ -661,6 +674,8 @@ public: - gboolean m_cursor_moved_pending; +@@ -666,6 +683,8 @@ public: gboolean m_contents_changed_pending; + #if _VTE_GTK == 3 + std::stack m_containers; + /* desktop notification */ std::string m_notification_summary; std::string m_notification_body; -@@ -681,6 +696,7 @@ public: +@@ -688,6 +707,7 @@ public: NOTIFICATION = 1u << 3, SHELL_PREEXEC = 1u << 4, SHELL_PRECMD = 1u << 5, + CONTAINERS = 1u << 6, + #endif }; unsigned m_pending_changes{0}; - diff --git a/src/vteseq.cc b/src/vteseq.cc -index 4de2a6f1..18c0d89c 100644 +index bae18595..8a7f5b34 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc -@@ -19,10 +19,14 @@ +@@ -19,6 +19,7 @@ #include "config.h" -+#include + #include #include #include - #include +@@ -39,6 +40,11 @@ + #define ST_C0 _VTE_CAP_ST + + #include ++#if _VTE_GTK == 3 ++#include +#include +#include - #ifdef HAVE_SYS_SYSLIMITS_H - #include - #endif -@@ -1384,6 +1388,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, ++#endif + + using namespace std::literals; + +@@ -1385,6 +1391,90 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq, if (token == endtoken) return; ++#if _VTE_GTK == 3 + if (*token == "container") { + ++token; + @@ -1388,15 +1333,16 @@ index 4de2a6f1..18c0d89c 100644 + + return; + } ++#endif + if (*token == "notify") { ++token; -- -2.35.1 +2.37.3 -From 62df90e5147c8be4e12bcf5ce99679c1fb2390d0 Mon Sep 17 00:00:00 2001 +From f15bfe821e0deefcf62d649c27e73b802f5338f0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 16 Feb 2021 16:30:44 +0100 Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region @@ -1412,10 +1358,10 @@ This reverts commit 73713ec0644e232fb740170e399282be778d97f9. 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vte.cc b/src/vte.cc -index a3ca5108..1834b090 100644 +index 21823424..20767b61 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -6497,10 +6497,7 @@ Terminal::maybe_end_selection() +@@ -6525,10 +6525,7 @@ Terminal::maybe_end_selection() /* * Terminal::select_all: * @@ -1427,7 +1373,7 @@ index a3ca5108..1834b090 100644 */ void Terminal::select_all() -@@ -6509,8 +6506,8 @@ Terminal::select_all() +@@ -6537,8 +6534,8 @@ Terminal::select_all() m_selecting_had_delta = TRUE; @@ -1439,5 +1385,5 @@ index a3ca5108..1834b090 100644 _vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n"); -- -2.35.1 +2.37.3 diff --git a/vte291.spec b/vte291.spec index 255adeebde46657d8d8dbe73fa2b00bb757b4b62..164d36fbf57d9b1d4ec8317c426d4026ab7f55c3 100644 --- a/vte291.spec +++ b/vte291.spec @@ -4,27 +4,29 @@ %global glib2_version 2.52.0 %global gnutls_version 3.2.7 %global gtk3_version 3.24.22 +%global gtk4_version 4.0.1 %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.68.0 +Version: 0.70.2 Release: 1 Summary: Virtual terminal widget License: LGPLv3+ and MIT URL: https://wiki.gnome.org/Apps/Terminal/VTE -Source0: https://download.gnome.org/sources/vte/0.68/vte-%{version}.tar.xz +Source0: https://download.gnome.org/sources/vte/0.70/vte-%{version}.tar.xz Patch0: vte291-cntnr-precmd-preexec-scroll.patch -BuildRequires: gcc-c++ gettext gobject-introspection-devel gperf vala systemd gtk-doc meson +BuildRequires: gcc-c++ gettext gi-docgen gobject-introspection-devel gperf meson systemd vala BuildRequires: pkgconfig(fribidi) >= %{fribidi_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnutls) >= %{gnutls_version} BuildRequires: pkgconfig(gobject-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} BuildRequires: pkgconfig(icu-uc) >= %{icu_uc_version} BuildRequires: pkgconfig(libpcre2-8) >= %{pcre2_version} BuildRequires: pkgconfig(libsystemd) >= %{libsystemd_version} @@ -44,6 +46,8 @@ Requires: vte-profile Conflicts: gnome-terminal < 3.20.1-2 vte3 < 0.36.1-3 Provides: vte-profile = %{version}-%{release} Obsoletes: vte-profile < %{version}-%{release} +Provides: vte291-gtk4%{?_isa} = %{version}-%{release} +Provides: vte291-gtk4 = %{version}-%{release} %description VTE provides a virtual terminal widget for GTK applications.VTE @@ -54,6 +58,8 @@ console/terminal in games, editors, IDEs, etc. Summary: Development files for %{name} License: GPLv3+ and LGPLv3+ Requires: %{name} = %{version}-%{release} +Provides: vte291-gtk4-devel%{?_isa} = %{version}-%{release} +Provides: vte291-gtk4-devel = %{version}-%{release} %description devel The package contains libraries and header files for developing applications that use vte291. @@ -68,7 +74,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %endif %build -%meson --buildtype=plain -Ddocs=true +%meson --buildtype=plain -Ddocs=true -Dgtk3=true -Dgtk4=true %meson_build %install @@ -80,6 +86,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %license COPYING.LGPL3 %license COPYING.XTERM %{_libdir}/libvte-%{apiver}.so.0* +%{_libdir}/libvte-%{apiver}-gtk4.so.0* %{_libdir}/girepository-1.0/ %{_libexecdir}/vte-urlencode-cwd %{_sysconfdir}/profile.d/vte.csh @@ -87,19 +94,28 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build %{_userunitdir}/vte-spawn-.scope.d %files devel +%license COPYING.GPL3 %{_bindir}/vte-%{apiver} +%{_bindir}/vte-%{apiver}-gtk4 %{_includedir}/vte-%{apiver}/ +%{_includedir}/vte-%{apiver}-gtk4/ %{_libdir}/libvte-%{apiver}.so +%{_libdir}/libvte-%{apiver}-gtk4.so %{_libdir}/pkgconfig/vte-%{apiver}.pc +%{_libdir}/pkgconfig/vte-%{apiver}-gtk4.pc %{_datadir}/gir-1.0/ %{_datadir}/glade/ %{_datadir}/vala/ %files help %doc README.md -%doc %{_datadir}/gtk-doc/ +%doc %{_datadir}/doc/vte-2.91/ +%doc %{_datadir}/doc/vte-2.91-gtk4/ %changelog +* Mon Jan 02 2023 lin zhang - 0.70.2-1 +- Upgrade to 0.70.2 + * Wed Apr 20 2022 dillon chen - 0.68.0-1 - Update to 0.68.0