Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b1f01d1606 | ||
|
|
df225cd5ec | ||
|
|
5eb6faf478 | ||
|
1712ac4544 | ||
|
|
b9f188ca9e |
4 changed files with 127 additions and 43 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -33,3 +33,7 @@
|
|||
/vte-0.48.2.tar.xz
|
||||
/vte-0.48.3.tar.xz
|
||||
/vte-0.50.0.tar.xz
|
||||
/vte-0.50.1.tar.xz
|
||||
/vte-0.50.2.tar.xz
|
||||
/vte-0.50.3.tar.xz
|
||||
/vte-0.50.4.tar.xz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vte-0.50.0.tar.xz) = ac05622ecf92115cf6aef1ef7805b0ef19856d65d2dfc9792b149443aeee4c9bbfb871c600c9be8b0f4baac4a143e70412208d0a510cb53f13b2caf2caa33587
|
||||
SHA512 (vte-0.50.4.tar.xz) = 99264a31ca45655888f54ded5525bd0cc42949095a9dcdc84c5cce5f7cdf94af801c48112837b73ef91c15754d3773002b131410509a1feb9e6eaec12190c228
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 5d8ab67c3590c93869e38a20587da8cc3e766a7f Mon Sep 17 00:00:00 2001
|
||||
From dba0e89e39aa86be61b09225cb39e0a8aeebb196 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 7 Jan 2015 16:01:00 +0100
|
||||
Subject: [PATCH 1/5] Add sequences and signals for desktop notification
|
||||
|
|
@ -62,10 +62,10 @@ index 1e4d0c1b6476..3385b4759713 100644
|
|||
VOID:STRING,UINT
|
||||
VOID:UINT,UINT
|
||||
diff --git a/src/vte.cc b/src/vte.cc
|
||||
index 89a3771f2152..e1b83596800a 100644
|
||||
index 6f28670c037b..8df17c4bc531 100644
|
||||
--- a/src/vte.cc
|
||||
+++ b/src/vte.cc
|
||||
@@ -8533,6 +8533,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
|
||||
@@ -8553,6 +8553,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
|
||||
|
||||
remove_update_timeout(this);
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ index 89a3771f2152..e1b83596800a 100644
|
|||
/* discard title updates */
|
||||
g_free(m_window_title);
|
||||
g_free(m_window_title_changed);
|
||||
@@ -10615,6 +10618,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
@@ -10634,6 +10637,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
|
||||
emit_adjustment_changed();
|
||||
|
||||
|
|
@ -89,8 +89,8 @@ index 89a3771f2152..e1b83596800a 100644
|
|||
+ }
|
||||
+
|
||||
if (m_window_title_changed) {
|
||||
really_changed = (g_strcmp0(m_window_title, m_window_title_changed) != 0);
|
||||
g_free (m_window_title);
|
||||
m_window_title = m_window_title_changed;
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index cfd5a911adbe..b3c6978f65d6 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
|
|
@ -108,10 +108,10 @@ index cfd5a911adbe..b3c6978f65d6 100644
|
|||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 68a1dce766b6..49e977088a53 100644
|
||||
index 18a4b1ba16e9..4ccc4ff9c0ef 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -668,6 +668,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -679,6 +679,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
klass->child_exited = NULL;
|
||||
klass->encoding_changed = NULL;
|
||||
klass->char_size_changed = NULL;
|
||||
|
|
@ -119,7 +119,7 @@ index 68a1dce766b6..49e977088a53 100644
|
|||
klass->window_title_changed = NULL;
|
||||
klass->icon_title_changed = NULL;
|
||||
klass->selection_changed = NULL;
|
||||
@@ -743,6 +744,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -754,6 +755,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
G_TYPE_NONE,
|
||||
1, G_TYPE_INT);
|
||||
|
||||
|
|
@ -159,10 +159,10 @@ index d1ade949b8ff..07c714e66093 100644
|
|||
LAST_SIGNAL
|
||||
};
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index 677e61a7dc34..bb0cc56784f6 100644
|
||||
index 0cd686b6adc2..f7faa7a52328 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -495,6 +495,11 @@ public:
|
||||
@@ -496,6 +496,11 @@ public:
|
||||
gboolean m_cursor_moved_pending;
|
||||
gboolean m_contents_changed_pending;
|
||||
|
||||
|
|
@ -175,19 +175,21 @@ index 677e61a7dc34..bb0cc56784f6 100644
|
|||
char* m_window_title;
|
||||
char* m_window_title_changed;
|
||||
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
|
||||
index eec89aeecd74..df5a4e0103c3 100644
|
||||
index 7cd1de50f8f0..e2cb3c90c86e 100644
|
||||
--- a/src/vteseq-n.gperf
|
||||
+++ b/src/vteseq-n.gperf
|
||||
@@ -173,3 +173,4 @@ struct vteseq_n_struct {
|
||||
@@ -171,5 +171,6 @@ struct vteseq_n_struct {
|
||||
"set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
|
||||
"set-current-hyperlink", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_hyperlink)
|
||||
"urxvt-777", VTE_SEQUENCE_HANDLER(vte_sequence_handler_urxvt_777)
|
||||
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
|
||||
"iterm2-133", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_133)
|
||||
"iterm2-1337", VTE_SEQUENCE_HANDLER(vte_sequence_handler_iterm2_1337)
|
||||
+"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification)
|
||||
diff --git a/src/vteseq.cc b/src/vteseq.cc
|
||||
index 1391e153efdf..368caaf4ed13 100644
|
||||
index 7b5b49b094f0..07154f2172c9 100644
|
||||
--- a/src/vteseq.cc
|
||||
+++ b/src/vteseq.cc
|
||||
@@ -2335,6 +2335,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
|
||||
@@ -2353,6 +2353,96 @@ vte_sequence_handler_return_terminal_id (VteTerminalPrivate *that, GValueArray *
|
||||
vte_sequence_handler_send_primary_device_attributes (that, params);
|
||||
}
|
||||
|
||||
|
|
@ -285,10 +287,10 @@ index 1391e153efdf..368caaf4ed13 100644
|
|||
static void
|
||||
vte_sequence_handler_send_secondary_device_attributes (VteTerminalPrivate *that, GValueArray *params)
|
||||
--
|
||||
2.14.1
|
||||
2.14.3
|
||||
|
||||
|
||||
From 9cb28e964762b3b10d04648a9ffb7503c922189f Mon Sep 17 00:00:00 2001
|
||||
From b0b2fe7a11c0375a24a78b4352c78c6d9ec581c0 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Thu, 29 Jan 2015 13:09:17 +0100
|
||||
Subject: [PATCH 2/5] vte.sh: Emit OSC 777 from PROMPT_COMMAND
|
||||
|
|
@ -316,17 +318,18 @@ index 2d211caa2f17..1c0543bd9d26 100644
|
|||
|
||||
case "$TERM" in
|
||||
--
|
||||
2.14.1
|
||||
2.14.3
|
||||
|
||||
|
||||
From bb5d1fc59a9a12a9c24347196a691a89b2c1d2cb Mon Sep 17 00:00:00 2001
|
||||
From 76f035762fe6a2cebcb25d7bee4799264c5232f4 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Thu, 22 Jan 2015 16:37:10 +0100
|
||||
Subject: [PATCH 3/5] vteapp: Add a test for the notification-received signal
|
||||
Subject: [PATCH 3/5] Test the notification-received signal
|
||||
|
||||
---
|
||||
bindings/vala/app.vala | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
bindings/vala/app.vala | 7 +++++++
|
||||
src/vteapp.c | 10 ++++++++++
|
||||
2 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
|
||||
index 8663d63c5445..4c5d9a2b3bad 100644
|
||||
|
|
@ -353,11 +356,39 @@ index 8663d63c5445..4c5d9a2b3bad 100644
|
|||
} /* class Window */
|
||||
|
||||
class App : Gtk.Application
|
||||
diff --git a/src/vteapp.c b/src/vteapp.c
|
||||
index 865df644e70e..be3bab870659 100644
|
||||
--- a/src/vteapp.c
|
||||
+++ b/src/vteapp.c
|
||||
@@ -48,6 +48,13 @@ static const char *builtin_dingus[] = {
|
||||
|
||||
static gboolean use_gregex = FALSE;
|
||||
|
||||
+static void
|
||||
+notification_received (GtkWidget *widget, const gchar *summary, const gchar *body)
|
||||
+{
|
||||
+ g_assert(VTE_TERMINAL(widget));
|
||||
+ g_print("[%s]: %s\n", summary, body);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
window_title_changed(GtkWidget *widget, gpointer win)
|
||||
{
|
||||
@@ -966,6 +973,9 @@ main(int argc, char **argv)
|
||||
G_CALLBACK(icon_title_changed), window);
|
||||
}
|
||||
|
||||
+ g_signal_connect(widget, "notification-received",
|
||||
+ G_CALLBACK(notification_received), NULL);
|
||||
+
|
||||
/* Connect to the "button-press" event. */
|
||||
g_signal_connect(widget, "button-press-event",
|
||||
G_CALLBACK(button_pressed), widget);
|
||||
--
|
||||
2.14.1
|
||||
2.14.3
|
||||
|
||||
|
||||
From c3ac25e0bdc2b15ef6b8ec07190d2d179ff2c9f4 Mon Sep 17 00:00:00 2001
|
||||
From 89c7aca4a043ab9c47d787513b072649186a568a Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 13 May 2016 17:53:54 +0200
|
||||
Subject: [PATCH 4/5] Add a property to configure the scroll speed
|
||||
|
|
@ -388,10 +419,10 @@ index 9b34536c7bf9..b67f3957b888 100644
|
|||
vte_terminal_set_font
|
||||
vte_terminal_get_font
|
||||
diff --git a/src/vte.cc b/src/vte.cc
|
||||
index e1b83596800a..8ed58df6ab4b 100644
|
||||
index 8df17c4bc531..ef3afc427cb9 100644
|
||||
--- a/src/vte.cc
|
||||
+++ b/src/vte.cc
|
||||
@@ -9883,6 +9883,7 @@ void
|
||||
@@ -9900,6 +9900,7 @@ void
|
||||
VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
{
|
||||
gdouble delta_x, delta_y;
|
||||
|
|
@ -399,7 +430,7 @@ index e1b83596800a..8ed58df6ab4b 100644
|
|||
gdouble v;
|
||||
gint cnt, i;
|
||||
int button;
|
||||
@@ -9936,7 +9937,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
@@ -9953,7 +9954,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -414,7 +445,7 @@ index e1b83596800a..8ed58df6ab4b 100644
|
|||
_vte_debug_print(VTE_DEBUG_EVENTS,
|
||||
"Scroll speed is %d lines per non-smooth scroll unit\n",
|
||||
(int) v);
|
||||
@@ -10173,6 +10180,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
|
||||
@@ -10190,6 +10197,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -447,10 +478,10 @@ index b3c6978f65d6..befde68c4bc5 100644
|
|||
_VTE_PUBLIC
|
||||
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 49e977088a53..025542475fad 100644
|
||||
index 4ccc4ff9c0ef..2b98eb8a34d2 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -471,6 +471,9 @@ vte_terminal_get_property (GObject *object,
|
||||
@@ -481,6 +481,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;
|
||||
|
|
@ -460,7 +491,7 @@ index 49e977088a53..025542475fad 100644
|
|||
case PROP_SCROLLBACK_LINES:
|
||||
g_value_set_uint (value, impl->m_scrollback_lines);
|
||||
break;
|
||||
@@ -560,6 +563,9 @@ vte_terminal_set_property (GObject *object,
|
||||
@@ -570,6 +573,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;
|
||||
|
|
@ -470,7 +501,7 @@ index 49e977088a53..025542475fad 100644
|
|||
case PROP_SCROLLBACK_LINES:
|
||||
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
|
||||
break;
|
||||
@@ -1455,6 +1461,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -1466,6 +1472,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
TRUE,
|
||||
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
|
||||
|
||||
|
|
@ -492,7 +523,7 @@ index 49e977088a53..025542475fad 100644
|
|||
/**
|
||||
* VteTerminal:scrollback-lines:
|
||||
*
|
||||
@@ -3798,6 +3819,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
|
||||
@@ -3809,6 +3830,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
|
||||
return IMPL(terminal)->m_row_count;
|
||||
}
|
||||
|
||||
|
|
@ -536,10 +567,10 @@ index 07c714e66093..5a6c9382eeac 100644
|
|||
PROP_SCROLL_ON_KEYSTROKE,
|
||||
PROP_SCROLL_ON_OUTPUT,
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index bb0cc56784f6..13b566839718 100644
|
||||
index f7faa7a52328..137987ac64ca 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -384,6 +384,7 @@ public:
|
||||
@@ -385,6 +385,7 @@ public:
|
||||
gboolean m_scroll_on_output;
|
||||
gboolean m_scroll_on_keystroke;
|
||||
gboolean m_alternate_screen_scroll;
|
||||
|
|
@ -547,7 +578,7 @@ index bb0cc56784f6..13b566839718 100644
|
|||
vte::grid::row_t m_scrollback_lines;
|
||||
|
||||
/* Restricted scrolling */
|
||||
@@ -1110,6 +1111,7 @@ public:
|
||||
@@ -1112,6 +1113,7 @@ public:
|
||||
bool set_mouse_autohide(bool autohide);
|
||||
bool set_pty(VtePty *pty);
|
||||
bool set_rewrap_on_resize(bool rewrap);
|
||||
|
|
@ -556,18 +587,19 @@ index bb0cc56784f6..13b566839718 100644
|
|||
bool set_scroll_on_keystroke(bool scroll);
|
||||
bool set_scroll_on_output(bool scroll);
|
||||
--
|
||||
2.14.1
|
||||
2.14.3
|
||||
|
||||
|
||||
From c4cd4468ffbc7c470945826eca1bdc2a57ffa221 Mon Sep 17 00:00:00 2001
|
||||
From eb3c5639a5a4405ad8fa7868dbb1b3ad60dd7fe8 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 13 May 2016 17:54:57 +0200
|
||||
Subject: [PATCH 5/5] vteapp: Add a test for the scroll-speed property
|
||||
Subject: [PATCH 5/5] Test the scroll-speed property
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1103380
|
||||
---
|
||||
bindings/vala/app.vala | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
src/vteapp.c | 7 +++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
|
||||
index 4c5d9a2b3bad..3b7310679239 100644
|
||||
|
|
@ -598,6 +630,38 @@ index 4c5d9a2b3bad..3b7310679239 100644
|
|||
{ "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/vteapp.c b/src/vteapp.c
|
||||
index be3bab870659..2a0a573286e1 100644
|
||||
--- a/src/vteapp.c
|
||||
+++ b/src/vteapp.c
|
||||
@@ -641,6 +641,7 @@ main(int argc, char **argv)
|
||||
hyperlink = TRUE;
|
||||
char *geometry = NULL;
|
||||
gint lines = -1;
|
||||
+ gint scroll_speed = 0;
|
||||
const char *message = "Launching interactive shell...\r\n";
|
||||
const char *font = NULL;
|
||||
const char *command = NULL;
|
||||
@@ -749,6 +750,11 @@ main(int argc, char **argv)
|
||||
G_OPTION_ARG_NONE, &keep,
|
||||
"Live on after the window closes", NULL
|
||||
},
|
||||
+ {
|
||||
+ "scroll-speed", 0, 0,
|
||||
+ G_OPTION_ARG_INT, &scroll_speed,
|
||||
+ "Specify the scroll speed", NULL
|
||||
+ },
|
||||
{
|
||||
"scrollback-lines", 'n', 0,
|
||||
G_OPTION_ARG_INT, &lines,
|
||||
@@ -1017,6 +1023,7 @@ main(int argc, char **argv)
|
||||
vte_terminal_set_cursor_blink_mode(terminal, cursor_blink_mode);
|
||||
vte_terminal_set_scroll_on_output(terminal, FALSE);
|
||||
vte_terminal_set_scroll_on_keystroke(terminal, TRUE);
|
||||
+ vte_terminal_set_scroll_speed(terminal, (guint) scroll_speed);
|
||||
vte_terminal_set_scrollback_lines(terminal, lines);
|
||||
vte_terminal_set_mouse_autohide(terminal, TRUE);
|
||||
|
||||
--
|
||||
2.14.1
|
||||
2.14.3
|
||||
|
||||
|
|
|
|||
18
vte291.spec
18
vte291.spec
|
|
@ -1,7 +1,7 @@
|
|||
%global apiver 2.91
|
||||
|
||||
Name: vte291
|
||||
Version: 0.50.0
|
||||
Version: 0.50.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Terminal emulator library
|
||||
|
||||
|
|
@ -100,6 +100,22 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||
%{_sysconfdir}/profile.d/vte.sh
|
||||
|
||||
%changelog
|
||||
* Mon May 21 2018 Kalev Lember <klember@redhat.com> - 0.50.4-1
|
||||
- Update to 0.50.4
|
||||
|
||||
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 0.50.3-1
|
||||
- Update to 0.50.3
|
||||
|
||||
* Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 0.50.2-2
|
||||
- Rebuild
|
||||
|
||||
* Wed Nov 01 2017 Debarshi Ray <rishi@fedoraproject.org> - 0.50.2-1
|
||||
- Update to 0.50.2
|
||||
|
||||
* Thu Oct 05 2017 Debarshi Ray <rishi@fedoraproject.org> - 0.50.1-1
|
||||
- Update to 0.50.1
|
||||
- Rebase downstream patches
|
||||
|
||||
* Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 0.50.0-1
|
||||
- Update to 0.50.0
|
||||
- Rebase downstream patches
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue