rpms/vte291
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.66.0

Browse Source
This commit is contained in:
David King 2021-09-28 14:24:46 +01:00
parent 06ce361761
commit daec9cae9f
5 changed files with 213 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -76,3 +76,5 @@
/vte-0.64.0.tar.xz
/vte-0.64.1.tar.xz
/vte-0.64.2.tar.xz
/vte-0.65.91.tar.bz2
/vte-0.66.0.tar.bz2

2
sources
View File

@ -1 +1 @@
SHA512 (vte-0.64.2.tar.xz) = 67facea1f2507183aa5fd51215a404d6e754be5694e49c8511d7dd841192178a583e9416b2611dc6b5f635555ac2fb9f48a8a6e68e6e4673c4d93422b7555061
SHA512 (vte-0.66.0.tar.bz2) = 8868b27cb91d57ba00c3c5261a42054abb352663cb183053917c543c90a8940bfc289ac751858218673b4eecfb6e9706e397a065045646ffeda69e0f3e4f839a

29
vte-0.66.0-prompt-command.patch Normal file
View File

@ -0,0 +1,29 @@
From 1fe2f3e9e11d1b8b0e45698a268b77e8f52e25db Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Sat, 25 Sep 2021 10:50:29 +0200
Subject: [PATCH] vte.sh: Fix the check for PROMPT_COMMAND when it is unset
declare "helpfully" outputs on stdout for existing variables, but on stderr
for nonexistent ones.
Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/37
---
src/vte.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/vte.sh.in b/src/vte.sh.in
index 1aa40ba4..242d6c42 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -48,7 +48,7 @@ if [[ -n "${BASH_VERSION:-}" ]]; then
# On older bash, we can only overwrite the whole PROMPT_COMMAND, so must
# use the __vte_prompt_command function which also sets the title.
- if [[ "$(declare -p PROMPT_COMMAND)" =~ "declare -a" ]]; then
+ if [[ "$(declare -p PROMPT_COMMAND 2>&1)" =~ "declare -a" ]]; then
PROMPT_COMMAND+=(__vte_osc7)
else
PROMPT_COMMAND="__vte_prompt_command"
--
2.32.0

327
vte291-cntnr-precmd-preexec-scroll.patch
View File

@ -1,4 +1,4 @@
From b0b746ddf50375173d0b98baf12740dc910745d2 Mon Sep 17 00:00:00 2001
From faa4340a6dc1df505d331eda732c094645bd3863 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 7 Jan 2015 16:01:00 +0100
Subject: [PATCH 01/11] Add sequences and signals for desktop notification
@ -27,7 +27,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
7 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/src/marshal.list b/src/marshal.list
index 241128c3ccfe..4412cf3d5f5c 100644
index 241128c3..4412cf3d 100644
--- a/src/marshal.list
+++ b/src/marshal.list
@@ -1,3 +1,4 @@
@ -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 4ea466bd9360..033abcfe83cb 100644
index ec330490..f39578ac 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10100,6 +10100,14 @@ Terminal::emit_pending_signals()
@@ -10082,6 +10082,14 @@ Terminal::emit_pending_signals()
emit_adjustment_changed();
@ -55,10 +55,10 @@ index 4ea466bd9360..033abcfe83cb 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 e705ece69ad6..668a7dbeae96 100644
index 05f6674f..0b9b8dc4 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -102,8 +102,10 @@ struct _VteTerminalClass {
@@ -109,8 +109,10 @@ struct _VteTerminalClass {
void (*bell)(VteTerminal* terminal);
@ -68,13 +68,13 @@ index e705ece69ad6..668a7dbeae96 100644
- gpointer padding[16];
+ gpointer padding[15];
// FIXMEgtk4 use class private data instead
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index c68a0f1ac388..e3274ff3df90 100644
index 000be62d..04eceea1 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -983,6 +983,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1242,6 +1242,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->child_exited = NULL;
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
@ -82,7 +82,7 @@ index c68a0f1ac388..e3274ff3df90 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -1064,6 +1065,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1325,6 +1326,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_OBJECT_CLASS_TYPE(klass),
g_cclosure_marshal_VOID__INTv);
@ -110,22 +110,22 @@ index c68a0f1ac388..e3274ff3df90 100644
* VteTerminal::window-title-changed:
* @vteterminal: the object which received the signal
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 1cb8cb49967b..389b86d2e557 100644
index 6b7a1ea2..8ba10395 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -56,6 +56,7 @@ enum {
SIGNAL_TEXT_INSERTED,
SIGNAL_TEXT_MODIFIED,
SIGNAL_TEXT_SCROLLED,
@@ -52,6 +52,7 @@ enum {
SIGNAL_RESIZE_WINDOW,
SIGNAL_RESTORE_WINDOW,
SIGNAL_SELECTION_CHANGED,
+ SIGNAL_NOTIFICATION_RECEIVED,
SIGNAL_WINDOW_TITLE_CHANGED,
LAST_SIGNAL
};
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 7a257afed861..38aaf421ec30 100644
index 77843507..b4dfb2a4 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -621,6 +621,10 @@ public:
@@ -663,6 +663,10 @@ public:
gboolean m_cursor_moved_pending;
gboolean m_contents_changed_pending;
@ -136,7 +136,7 @@ index 7a257afed861..38aaf421ec30 100644
std::string m_window_title{};
std::string m_current_directory_uri{};
std::string m_current_file_uri{};
@@ -634,6 +638,7 @@ public:
@@ -676,6 +680,7 @@ public:
TITLE = 1u << 0,
CWD = 1u << 1,
CWF = 1u << 2,
@ -144,7 +144,7 @@ index 7a257afed861..38aaf421ec30 100644
};
unsigned m_pending_changes{0};
@@ -1358,6 +1363,9 @@ public:
@@ -1488,6 +1493,9 @@ public:
int osc) noexcept;
/* OSC handlers */
@ -155,10 +155,10 @@ index 7a257afed861..38aaf421ec30 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 bde2fa7ba0ab..7ab65b6d204a 100644
index 0a45c9b4..1a6bdc11 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1377,6 +1377,33 @@ Terminal::delete_lines(vte::grid::row_t param)
@@ -1376,6 +1376,33 @@ Terminal::delete_lines(vte::grid::row_t param)
m_text_deleted_flag = TRUE;
}
@ -192,7 +192,7 @@ index bde2fa7ba0ab..7ab65b6d204a 100644
bool
Terminal::get_osc_color_index(int osc,
int value,
@@ -6519,6 +6546,10 @@ Terminal::OSC(vte::parser::Sequence const& seq)
@@ -6535,6 +6562,10 @@ Terminal::OSC(vte::parser::Sequence const& seq)
reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE);
break;
@ -203,7 +203,7 @@ index bde2fa7ba0ab..7ab65b6d204a 100644
case VTE_OSC_XTERM_SET_ICON_TITLE:
case VTE_OSC_XTERM_SET_XPROPERTY:
case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG:
@@ -6559,7 +6590,6 @@ Terminal::OSC(vte::parser::Sequence const& seq)
@@ -6576,7 +6607,6 @@ Terminal::OSC(vte::parser::Sequence const& seq)
case VTE_OSC_URXVT_SET_FONT_BOLD_ITALIC:
case VTE_OSC_URXVT_VIEW_UP:
case VTE_OSC_URXVT_VIEW_DOWN:
@ -212,10 +212,10 @@ index bde2fa7ba0ab..7ab65b6d204a 100644
default:
break;
--
2.31.1
2.32.0
From f1ba75377276560079af1d8f615380abd5fc9438 Mon Sep 17 00:00:00 2001
From 08aaeb7060411e91f142f928950d01af121e823a Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 29 Jan 2015 13:09:17 +0100
Subject: [PATCH 02/11] vte.sh: Emit OSC 777 from PROMPT_COMMAND
@ -230,10 +230,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/vte.sh.in b/src/vte.sh.in
index 3ac99d7ec04f..2c6f668142c3 100644
index 242d6c42..50242223 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -27,10 +27,12 @@ __vte_osc7 () {
@@ -33,10 +33,12 @@ __vte_osc7 () {
}
__vte_prompt_command() {
@ -248,10 +248,10 @@ index 3ac99d7ec04f..2c6f668142c3 100644
}
--
2.31.1
2.32.0
From 5c825104d44100b72d98cf02ea0751065576af4e Mon Sep 17 00:00:00 2001
From 1f3aa3194edb4d98ff83836e2f9151960314c040 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 22 Jan 2015 16:37:10 +0100
Subject: [PATCH 03/11] Test the notification-received signal
@ -262,7 +262,7 @@ Subject: [PATCH 03/11] Test the notification-received signal
2 files changed, 17 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 8ab27e5aaf9a..025f971b2eb0 100644
index 8ab27e5a..025f971b 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -309,6 +309,8 @@ class Window : Gtk.ApplicationWindow
@ -287,11 +287,11 @@ index 8ab27e5aaf9a..025f971b2eb0 100644
class App : Gtk.Application
diff --git a/src/app/app.cc b/src/app/app.cc
index 37d51c6b8963..73810251a4d0 100644
index 86135abe..e5f67cd9 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -1877,6 +1877,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
vte_terminal_get_window_title(window->terminal));
@@ -2208,6 +2208,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
#endif
}
+static void
@ -305,20 +305,20 @@ index 37d51c6b8963..73810251a4d0 100644
static void
window_lower_window_cb(VteTerminal* terminal,
VteappWindow* window)
@@ -2115,6 +2123,8 @@ vteapp_window_constructed(GObject *object)
@@ -2503,6 +2511,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 VTE_GTK == 3
if (options.no_double_buffer) {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
--
2.31.1
2.32.0
From aa647920fe6dc8ee0f4d23d8d90bafc649d01efe Mon Sep 17 00:00:00 2001
From 67f64a50e3671e50e6cf82f7f69ed1543253a019 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:53:54 +0200
Subject: [PATCH 04/11] Add a property to configure the scroll speed
@ -328,19 +328,19 @@ 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 | 1 +
src/vte.cc | 19 ++++++++++++-
src/vte/vteterminal.h | 4 +++
src/vtegtk.cc | 51 ++++++++++++++++++++++++++++++++++
src/vtegtk.hh | 1 +
src/vteinternal.hh | 2 ++
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(-)
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index c69181da7c78..dba88c156fe8 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -54,6 +54,7 @@ vte_terminal_get_cursor_blink_mode
diff --git a/doc/reference/vte-sections.txt.in b/doc/reference/vte-sections.txt.in
index 1180f972..f097d4b9 100644
--- a/doc/reference/vte-sections.txt.in
+++ b/doc/reference/vte-sections.txt.in
@@ -56,6 +56,7 @@ vte_terminal_get_cursor_blink_mode
vte_terminal_set_cursor_blink_mode
vte_terminal_get_text_blink_mode
vte_terminal_set_text_blink_mode
@ -349,10 +349,10 @@ index c69181da7c78..dba88c156fe8 100644
vte_terminal_get_scrollback_lines
vte_terminal_set_font
diff --git a/src/vte.cc b/src/vte.cc
index 033abcfe83cb..02fe5cbf2df7 100644
index f39578ac..f027ce3b 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9293,6 +9293,7 @@ vte_cairo_get_clip_region (cairo_t *cr)
@@ -9289,6 +9289,7 @@ vte_cairo_get_clip_region(cairo_t *cr)
bool
Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
{
@ -360,13 +360,13 @@ index 033abcfe83cb..02fe5cbf2df7 100644
gdouble v;
gint cnt, i;
int button;
@@ -9327,7 +9328,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
@@ -9323,7 +9324,13 @@ Terminal::widget_mouse_scroll(vte::platform::ScrollEvent const& event)
return true;
}
- v = MAX (1., ceil (gtk_adjustment_get_page_increment (m_vadjustment.get()) / 10.));
- v = MAX (1., ceil (m_row_count /* page increment */ / 10.));
+ if (m_scroll_speed == 0) {
+ scroll_speed = ceil (gtk_adjustment_get_page_increment (m_vadjustment.get()) / 10.);
+ scroll_speed = ceil (m_row_count /* page increment */ / 10.);
+ } else {
+ scroll_speed = m_scroll_speed;
+ }
@ -375,7 +375,7 @@ index 033abcfe83cb..02fe5cbf2df7 100644
_vte_debug_print(VTE_DEBUG_EVENTS,
"Scroll speed is %d lines per non-smooth scroll unit\n",
(int) v);
@@ -9641,6 +9648,16 @@ Terminal::decscusr_cursor_shape() const noexcept
@@ -9633,6 +9640,16 @@ Terminal::decscusr_cursor_shape() const noexcept
}
}
@ -393,10 +393,10 @@ index 033abcfe83cb..02fe5cbf2df7 100644
Terminal::set_scrollback_lines(long lines)
{
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 668a7dbeae96..0143f0b9dd4d 100644
index 0b9b8dc4..20c930f7 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -310,6 +310,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
@@ -324,6 +324,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
_VTE_PUBLIC
VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
@ -408,10 +408,10 @@ index 668a7dbeae96..0143f0b9dd4d 100644
_VTE_PUBLIC
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index e3274ff3df90..b4bcd3d9a1d5 100644
index 04eceea1..7e405a39 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -758,6 +758,9 @@ try
@@ -993,6 +993,9 @@ try
case PROP_REWRAP_ON_RESIZE:
g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal));
break;
@ -421,7 +421,7 @@ index e3274ff3df90..b4bcd3d9a1d5 100644
case PROP_SCROLLBACK_LINES:
g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal));
break;
@@ -876,6 +879,9 @@ try
@@ -1114,6 +1117,9 @@ try
case PROP_REWRAP_ON_RESIZE:
vte_terminal_set_rewrap_on_resize (terminal, g_value_get_boolean (value));
break;
@ -431,7 +431,7 @@ index e3274ff3df90..b4bcd3d9a1d5 100644
case PROP_SCROLLBACK_LINES:
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
break;
@@ -1966,6 +1972,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -2210,6 +2216,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
TRUE,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
@ -453,7 +453,7 @@ index e3274ff3df90..b4bcd3d9a1d5 100644
/**
* VteTerminal:scrollback-lines:
*
@@ -5367,6 +5388,36 @@ catch (...)
@@ -5666,6 +5687,36 @@ catch (...)
return -1;
}
@ -491,10 +491,10 @@ index e3274ff3df90..b4bcd3d9a1d5 100644
* vte_terminal_set_scrollback_lines:
* @terminal: a #VteTerminal
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 389b86d2e557..24063c3060da 100644
index 8ba10395..f6cd891b 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -90,6 +90,7 @@ enum {
@@ -86,6 +86,7 @@ enum {
PROP_MOUSE_POINTER_AUTOHIDE,
PROP_PTY,
PROP_REWRAP_ON_RESIZE,
@ -503,18 +503,18 @@ index 389b86d2e557..24063c3060da 100644
PROP_SCROLL_ON_KEYSTROKE,
PROP_SCROLL_ON_OUTPUT,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 38aaf421ec30..fd1a8b9008cf 100644
index b4dfb2a4..2da56ebd 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -399,6 +399,7 @@ public:
@@ -429,6 +429,7 @@ public:
bool m_fallback_scrolling{true};
bool m_scroll_on_output{false};
bool m_scroll_on_keystroke{true};
+ guint m_scroll_speed;
vte::grid::row_t m_scrollback_lines{0};
/* Restricted scrolling */
@@ -1232,6 +1233,7 @@ public:
inline auto scroll_limit_lower() const noexcept
@@ -1363,6 +1364,7 @@ public:
bool set_input_enabled(bool enabled);
bool set_mouse_autohide(bool autohide);
bool set_rewrap_on_resize(bool rewrap);
@ -523,10 +523,10 @@ index 38aaf421ec30..fd1a8b9008cf 100644
bool set_fallback_scrolling(bool set);
auto fallback_scrolling() const noexcept { return m_fallback_scrolling; }
--
2.31.1
2.32.0
From f080a7417f8f657778916219ad06ab184c53ff9a Mon Sep 17 00:00:00 2001
From 7c7ab09278605488a2710eac246842d646e0cfc7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 13 May 2016 17:54:57 +0200
Subject: [PATCH 05/11] Test the scroll-speed property
@ -538,7 +538,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380
2 files changed, 8 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 025f971b2eb0..51b5d6410503 100644
index 025f971b..51b5d641 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -335,6 +335,7 @@ class Window : Gtk.ApplicationWindow
@ -567,10 +567,10 @@ index 025f971b2eb0..51b5d6410503 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 73810251a4d0..90421730a66a 100644
index e5f67cd9..e812416c 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -116,6 +116,7 @@ public:
@@ -115,6 +115,7 @@ public:
int verbosity{0};
double cell_height_scale{1.0};
double cell_width_scale{1.0};
@ -578,28 +578,28 @@ index 73810251a4d0..90421730a66a 100644
VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM};
VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK};
VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS};
@@ -590,6 +591,8 @@ public:
@@ -617,6 +618,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 },
{ "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,
"Specify the number of scrollback-lines (-1 for infinite)", nullptr },
{ "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent,
@@ -2157,6 +2160,7 @@ vteapp_window_constructed(GObject *object)
@@ -2547,6 +2550,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);
+ vte_terminal_set_scroll_speed(window->terminal, options.scroll_speed);
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.31.1
2.32.0
From b77827bf39fcf7b27f548a5472802371196801d3 Mon Sep 17 00:00:00 2001
From fb7db8f86848dc7ad6ea585d3211e935603d1aa9 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 7 Jan 2015 16:01:00 +0100
Subject: [PATCH 06/11] Support preexec notifications from an interactive shell
@ -619,19 +619,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
https://bugzilla.gnome.org/show_bug.cgi?id=711060
---
src/vte.cc | 6 ++++++
src/vte.sh.in | 2 +-
src/vte.sh.in | 4 ++--
src/vte/vteterminal.h | 3 ++-
src/vtegtk.cc | 18 ++++++++++++++++++
src/vtegtk.hh | 1 +
src/vteinternal.hh | 1 +
src/vteseq.cc | 4 ++++
7 files changed, 33 insertions(+), 2 deletions(-)
7 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index 02fe5cbf2df7..38a64d17a0bf 100644
index f027ce3b..36cf379f 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10125,6 +10125,12 @@ Terminal::emit_pending_signals()
@@ -10107,6 +10107,12 @@ Terminal::emit_pending_signals()
m_notification_body.c_str());
}
@ -645,23 +645,26 @@ index 02fe5cbf2df7..38a64d17a0bf 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 2c6f668142c3..fc33a63f1f84 100644
index 50242223..01b44e23 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -38,7 +38,7 @@ __vte_prompt_command() {
@@ -51,9 +51,9 @@ if [[ -n "${BASH_VERSION:-}" ]]; then
# use the __vte_prompt_command function which also sets the title.
case "$TERM" in
xterm*|vte*)
- [ -n "${BASH_VERSION:-}" ] && PROMPT_COMMAND="__vte_prompt_command"
+ [ -n "${BASH_VERSION:-}" ] && PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\033]777;preexec\033\\")
[ -n "${ZSH_VERSION:-}" ] && precmd_functions+=(__vte_osc7)
;;
esac
if [[ "$(declare -p PROMPT_COMMAND 2>&1)" =~ "declare -a" ]]; then
- PROMPT_COMMAND+=(__vte_osc7)
+ PROMPT_COMMAND+=(__vte_osc7) && PS0=$(printf "\033]777;preexec\033\\")
else
- PROMPT_COMMAND="__vte_prompt_command"
+ PROMPT_COMMAND="__vte_prompt_command" && PS0=$(printf "\033]777;preexec\033\\")
fi
elif [[ -n "${ZSH_VERSION:-}" ]]; then
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 0143f0b9dd4d..2d1017f4a216 100644
index 20c930f7..2b277e05 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -103,9 +103,10 @@ struct _VteTerminalClass {
@@ -110,9 +110,10 @@ struct _VteTerminalClass {
void (*bell)(VteTerminal* terminal);
void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
@ -671,13 +674,13 @@ index 0143f0b9dd4d..2d1017f4a216 100644
- gpointer padding[15];
+ gpointer padding[14];
// FIXMEgtk4 use class private data instead
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index b4bcd3d9a1d5..ce95126b37b8 100644
index 7e405a39..22b6412b 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
klass->notification_received = NULL;
@ -685,7 +688,7 @@ index b4bcd3d9a1d5..ce95126b37b8 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -1091,6 +1092,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1352,6 +1353,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_STRING);
@ -710,7 +713,7 @@ index b4bcd3d9a1d5..ce95126b37b8 100644
* VteTerminal::window-title-changed:
* @vteterminal: the object which received the signal
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 24063c3060da..e90e183e7c2d 100644
index f6cd891b..bf85bdf4 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -52,6 +52,7 @@ enum {
@ -718,14 +721,14 @@ index 24063c3060da..e90e183e7c2d 100644
SIGNAL_RESTORE_WINDOW,
SIGNAL_SELECTION_CHANGED,
+ SIGNAL_SHELL_PREEXEC,
SIGNAL_TEXT_DELETED,
SIGNAL_TEXT_INSERTED,
SIGNAL_TEXT_MODIFIED,
SIGNAL_NOTIFICATION_RECEIVED,
SIGNAL_WINDOW_TITLE_CHANGED,
LAST_SIGNAL
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index fd1a8b9008cf..bb98f8bc0903 100644
index 2da56ebd..041a9a81 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -640,6 +640,7 @@ public:
@@ -682,6 +682,7 @@ public:
CWD = 1u << 1,
CWF = 1u << 2,
NOTIFICATION = 1u << 3,
@ -734,10 +737,10 @@ index fd1a8b9008cf..bb98f8bc0903 100644
unsigned m_pending_changes{0};
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 7ab65b6d204a..51ca37bdc748 100644
index 1a6bdc11..84341cda 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1402,6 +1402,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
@@ -1401,6 +1401,10 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
m_notification_body = *token;
return;
}
@ -749,10 +752,10 @@ index 7ab65b6d204a..51ca37bdc748 100644
bool
--
2.31.1
2.32.0
From d2e780db838ead280cf5657c49b0d63dd0683f5f Mon Sep 17 00:00:00 2001
From 4a699bf2ff119c9267faeac81b4db9421b782837 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 20 Apr 2018 18:21:53 +0200
Subject: [PATCH 07/11] Test the shell-preexec signal
@ -765,7 +768,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
2 files changed, 13 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 51b5d6410503..3975b9886d77 100644
index 51b5d641..3975b988 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow
@ -789,10 +792,10 @@ index 51b5d6410503..3975b9886d77 100644
class App : Gtk.Application
diff --git a/src/app/app.cc b/src/app/app.cc
index 90421730a66a..3caec42e5877 100644
index e812416c..498db5a4 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -1888,6 +1888,12 @@ notification_received_cb(VteTerminal *terminal,
@@ -2219,6 +2219,12 @@ notification_received_cb(VteTerminal *terminal,
g_print("[%s]: %s\n", summary, body);
}
@ -805,19 +808,19 @@ index 90421730a66a..3caec42e5877 100644
static void
window_lower_window_cb(VteTerminal* terminal,
VteappWindow* window)
@@ -2127,6 +2133,7 @@ vteapp_window_constructed(GObject *object)
@@ -2515,6 +2521,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 VTE_GTK == 3
--
2.31.1
2.32.0
From 949d4552c4ab66e02ba03024091f21bd35c199d8 Mon Sep 17 00:00:00 2001
From 84f18bd4d3f1a2fcbc68041bcbcfdcf43a34d76a Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 2 May 2018 17:20:30 +0200
Subject: [PATCH 08/11] Support precmd notifications from an interactive shell
@ -846,10 +849,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
7 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index 38a64d17a0bf..6b3e1336ca15 100644
index 36cf379f..172174e0 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10131,6 +10131,12 @@ Terminal::emit_pending_signals()
@@ -10113,6 +10113,12 @@ Terminal::emit_pending_signals()
g_signal_emit(freezer.get(), signals[SIGNAL_SHELL_PREEXEC], 0);
}
@ -863,10 +866,10 @@ index 38a64d17a0bf..6b3e1336ca15 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 fc33a63f1f84..359afbc4645c 100644
index 01b44e23..877fe93d 100644
--- a/src/vte.sh.in
+++ b/src/vte.sh.in
@@ -32,7 +32,7 @@ __vte_prompt_command() {
@@ -38,7 +38,7 @@ __vte_prompt_command() {
local pwd='~'
[ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/}
pwd="${pwd//[[:cntrl:]]}"
@ -876,10 +879,10 @@ index fc33a63f1f84..359afbc4645c 100644
}
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 2d1017f4a216..5e413393f7ec 100644
index 2b277e05..1e926166 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -103,10 +103,11 @@ struct _VteTerminalClass {
@@ -110,10 +110,11 @@ struct _VteTerminalClass {
void (*bell)(VteTerminal* terminal);
void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
@ -890,13 +893,13 @@ index 2d1017f4a216..5e413393f7ec 100644
- gpointer padding[14];
+ gpointer padding[13];
// FIXMEgtk4 use class private data instead
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index ce95126b37b8..a84f17e21f65 100644
index 22b6412b..4cc1b939 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -990,6 +990,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1249,6 +1249,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
klass->notification_received = NULL;
@ -904,7 +907,7 @@ index ce95126b37b8..a84f17e21f65 100644
klass->shell_preexec = NULL;
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
@@ -1092,6 +1093,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1353,6 +1354,23 @@ vte_terminal_class_init(VteTerminalClass *klass)
G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_STRING);
@ -929,7 +932,7 @@ index ce95126b37b8..a84f17e21f65 100644
* VteTerminal::shell-preexec:
* @vteterminal: the object which received the signal
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index e90e183e7c2d..93a6dde3e19a 100644
index bf85bdf4..cee56b65 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -52,6 +52,7 @@ enum {
@ -938,13 +941,13 @@ index e90e183e7c2d..93a6dde3e19a 100644
SIGNAL_SELECTION_CHANGED,
+ SIGNAL_SHELL_PRECMD,
SIGNAL_SHELL_PREEXEC,
SIGNAL_TEXT_DELETED,
SIGNAL_TEXT_INSERTED,
SIGNAL_NOTIFICATION_RECEIVED,
SIGNAL_WINDOW_TITLE_CHANGED,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index bb98f8bc0903..25253c0af95b 100644
index 041a9a81..5c1a5e50 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -641,6 +641,7 @@ public:
@@ -683,6 +683,7 @@ public:
CWF = 1u << 2,
NOTIFICATION = 1u << 3,
SHELL_PREEXEC = 1u << 4,
@ -953,10 +956,10 @@ index bb98f8bc0903..25253c0af95b 100644
unsigned m_pending_changes{0};
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 51ca37bdc748..10b494bddb47 100644
index 84341cda..35eff3dd 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1403,7 +1403,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
@@ -1402,7 +1402,9 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
return;
}
@ -968,10 +971,10 @@ index 51ca37bdc748..10b494bddb47 100644
}
}
--
2.31.1
2.32.0
From 28518832a97fc3ff2760de36cc13586c12555b62 Mon Sep 17 00:00:00 2001
From b8c3a454e8a3dec36f1eaab960dfebca8d7100a6 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 2 May 2018 17:30:48 +0200
Subject: [PATCH 09/11] Test the shell-precmd signal
@ -984,7 +987,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060
2 files changed, 13 insertions(+)
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
index 3975b9886d77..ff5fb5df052e 100644
index 3975b988..ff5fb5df 100644
--- a/bindings/vala/app.vala
+++ b/bindings/vala/app.vala
@@ -310,6 +310,7 @@ class Window : Gtk.ApplicationWindow
@ -1008,10 +1011,10 @@ index 3975b9886d77..ff5fb5df052e 100644
{
print("[shell] executing command\n");
diff --git a/src/app/app.cc b/src/app/app.cc
index 3caec42e5877..0ae59d2526cb 100644
index 498db5a4..8cf66f88 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -1888,6 +1888,12 @@ notification_received_cb(VteTerminal *terminal,
@@ -2219,6 +2219,12 @@ notification_received_cb(VteTerminal *terminal,
g_print("[%s]: %s\n", summary, body);
}
@ -1024,7 +1027,7 @@ index 3caec42e5877..0ae59d2526cb 100644
static void
shell_preexec_cb(VteTerminal *terminal)
{
@@ -2133,6 +2139,7 @@ vteapp_window_constructed(GObject *object)
@@ -2521,6 +2527,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);
@ -1033,10 +1036,10 @@ index 3caec42e5877..0ae59d2526cb 100644
/* Settings */
--
2.31.1
2.32.0
From e1c687e0651c06b72c7197e9f8f4a91122e8451c Mon Sep 17 00:00:00 2001
From 4490f0a4648d6ed359447b2f817aa47b475e093f Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 10 Jun 2019 20:30:18 +0200
Subject: [PATCH 10/11] Support tracking the active container inside the
@ -1078,10 +1081,10 @@ agreed upon across multiple different terminal emulators [1].
6 files changed, 193 insertions(+)
diff --git a/src/vte.cc b/src/vte.cc
index 6b3e1336ca15..abd6b449ae48 100644
index 172174e0..d32e8eb7 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10150,6 +10150,14 @@ Terminal::emit_pending_signals()
@@ -10132,6 +10132,14 @@ Terminal::emit_pending_signals()
m_window_title_pending.clear();
}
@ -1097,10 +1100,10 @@ index 6b3e1336ca15..abd6b449ae48 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 5e413393f7ec..32b2f32eef9d 100644
index 1e926166..f81133e4 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -488,6 +488,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT
@@ -511,6 +511,10 @@ glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VT
_VTE_PUBLIC
const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
_VTE_PUBLIC
@ -1112,10 +1115,10 @@ index 5e413393f7ec..32b2f32eef9d 100644
_VTE_PUBLIC
const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index a84f17e21f65..aa3f04c6a02a 100644
index 4cc1b939..4544d9a0 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -707,6 +707,12 @@ try
@@ -942,6 +942,12 @@ try
case PROP_CURSOR_BLINK_MODE:
g_value_set_enum (value, vte_terminal_get_cursor_blink_mode (terminal));
break;
@ -1128,7 +1131,7 @@ index a84f17e21f65..aa3f04c6a02a 100644
case PROP_CURRENT_DIRECTORY_URI:
g_value_set_string (value, vte_terminal_get_current_directory_uri (terminal));
break;
@@ -2099,6 +2105,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -2357,6 +2363,27 @@ vte_terminal_class_init(VteTerminalClass *klass)
NULL,
(GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
@ -1156,7 +1159,7 @@ index a84f17e21f65..aa3f04c6a02a 100644
/**
* VteTerminal:current-directory-uri:
*
@@ -4574,6 +4601,56 @@ catch (...)
@@ -4869,6 +4896,56 @@ catch (...)
return -1;
}
@ -1214,10 +1217,10 @@ index a84f17e21f65..aa3f04c6a02a 100644
* vte_terminal_get_current_directory_uri:
* @terminal: a #VteTerminal
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 93a6dde3e19a..651961436225 100644
index cee56b65..e41f2f3a 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -76,6 +76,8 @@ enum {
@@ -72,6 +72,8 @@ enum {
PROP_CJK_AMBIGUOUS_WIDTH,
PROP_CURSOR_BLINK_MODE,
PROP_CURSOR_SHAPE,
@ -1227,7 +1230,7 @@ index 93a6dde3e19a..651961436225 100644
PROP_CURRENT_FILE_URI,
PROP_DELETE_BINDING,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 25253c0af95b..570c70b0c9e7 100644
index 5c1a5e50..f3821475 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -59,6 +59,7 @@
@ -1238,7 +1241,7 @@ index 25253c0af95b..570c70b0c9e7 100644
#include <string>
#include <variant>
#include <vector>
@@ -97,6 +98,18 @@ typedef enum _VteCharacterReplacement {
@@ -110,6 +111,18 @@ typedef enum _VteCharacterReplacement {
VTE_CHARACTER_REPLACEMENT_LINE_DRAWING
} VteCharacterReplacement;
@ -1257,7 +1260,7 @@ index 25253c0af95b..570c70b0c9e7 100644
typedef struct _VtePaletteColor {
struct {
vte::color::rgb color;
@@ -622,6 +635,8 @@ public:
@@ -664,6 +677,8 @@ public:
gboolean m_cursor_moved_pending;
gboolean m_contents_changed_pending;
@ -1266,7 +1269,7 @@ index 25253c0af95b..570c70b0c9e7 100644
/* desktop notification */
std::string m_notification_summary;
std::string m_notification_body;
@@ -642,6 +657,7 @@ public:
@@ -684,6 +699,7 @@ public:
NOTIFICATION = 1u << 3,
SHELL_PREEXEC = 1u << 4,
SHELL_PRECMD = 1u << 5,
@ -1275,7 +1278,7 @@ index 25253c0af95b..570c70b0c9e7 100644
unsigned m_pending_changes{0};
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 10b494bddb47..2a2ba4b47441 100644
index 35eff3dd..d0f206be 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -19,10 +19,14 @@
@ -1293,7 +1296,7 @@ index 10b494bddb47..2a2ba4b47441 100644
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
@@ -1385,6 +1389,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
@@ -1384,6 +1388,88 @@ Terminal::handle_urxvt_extension(vte::parser::Sequence const& seq,
if (token == endtoken)
return;
@ -1383,10 +1386,10 @@ index 10b494bddb47..2a2ba4b47441 100644
++token;
--
2.31.1
2.32.0
From 4a949461c975c2d062703e161f337d84f13a60d7 Mon Sep 17 00:00:00 2001
From 7a296e18eb249bf872f3a50f0ab47a4d91324a44 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 16 Feb 2021 16:30:44 +0100
Subject: [PATCH 11/11] Revert "widget: Limit select-all to the writable region
@ -1402,10 +1405,10 @@ This reverts commit 73713ec0644e232fb740170e399282be778d97f9.
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index abd6b449ae48..99ad5973c363 100644
index d32e8eb7..aa246e5e 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -6595,10 +6595,7 @@ Terminal::maybe_end_selection()
@@ -6555,10 +6555,7 @@ Terminal::maybe_end_selection()
/*
* Terminal::select_all:
*
@ -1417,7 +1420,7 @@ index abd6b449ae48..99ad5973c363 100644
*/
void
Terminal::select_all()
@@ -6607,8 +6604,8 @@ Terminal::select_all()
@@ -6567,8 +6564,8 @@ Terminal::select_all()
m_selecting_had_delta = TRUE;
@ -1429,5 +1432,5 @@ index abd6b449ae48..99ad5973c363 100644
_vte_debug_print(VTE_DEBUG_SELECTION, "Selecting *all* text.\n");
--
2.31.1
2.32.0

27
vte291.spec
View File

@ -10,37 +10,39 @@
%global pcre2_version 10.21
Name: vte291
Version: 0.64.2
Release: 3%{?dist}
Version: 0.66.0
Release: 1%{?dist}
Summary: Terminal emulator library
# libvte-2.91.so is generated from LGPLv2+ and MIT sources
License: LGPLv3+ and MIT
URL: https://wiki.gnome.org/Apps/Terminal/VTE
Source0: https://download.gnome.org/sources/vte/0.64/vte-%{version}.tar.xz
Source0: https://gitlab.gnome.org/GNOME/vte/-/archive/%{version}/vte-%{version}.tar.bz2
Patch0: vte-0.66.0-prompt-command.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
# https://pagure.io/fedora-workstation/issue/216
Patch100: vte291-cntnr-precmd-preexec-scroll.patch
BuildRequires: gcc-c++
BuildRequires: gettext
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: gobject-introspection-devel
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: pkgconfig(zlib)
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: gobject-introspection-devel
BuildRequires: gperf
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: systemd-rpm-macros
BuildRequires: vala
@ -89,8 +91,7 @@ The vte-profile package contains a profile.d script for the VTE terminal
emulator library.
%prep
%setup -q -n vte-%{version}
%patch100 -p1 -b .cntnr-precmd-preexec-scroll
%autosetup -p1 -n vte-%{version}
%if 0%{?flatpak}
# Install user units where systemd macros expect them
sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
@ -108,6 +109,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%files -f vte-%{apiver}.lang
%license COPYING.LGPL3
%license COPYING.XTERM
%doc README.md
%{_libdir}/libvte-%{apiver}.so.0*
%{_libdir}/girepository-1.0/
%{_userunitdir}/vte-spawn-.scope.d
@ -130,6 +132,9 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
%{_sysconfdir}/profile.d/vte.sh
%changelog
* Tue Sep 28 2021 David King <amigadave@amigadave.com> - 0.66.0-1
- Update to 0.66.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.64.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild