Update to 0.53.0
This commit is contained in:
parent
31a8d1b3ad
commit
12738e99de
@ -1,4 +1,4 @@
|
||||
From 8fe3bb76b90d0ba8a216f4f0c24af5c4f894c5e6 Mon Sep 17 00:00:00 2001
|
||||
From def49e6968af9779c31bb363ee67b57dd4d23bc6 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
|
||||
@ -17,39 +17,15 @@ https://phab.enlightenment.org/T1765
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=711059
|
||||
---
|
||||
src/caps-list.hh | 4 +++
|
||||
src/marshal.list | 1 +
|
||||
src/vte.cc | 12 +++++++
|
||||
src/vte/vteterminal.h | 4 ++-
|
||||
src/vtegtk.cc | 21 ++++++++++++
|
||||
src/vte.cc | 9 +++++++++
|
||||
src/vte/vteterminal.h | 4 +++-
|
||||
src/vtegtk.cc | 21 +++++++++++++++++++++
|
||||
src/vtegtk.hh | 1 +
|
||||
src/vteinternal.hh | 5 +++
|
||||
src/vteseq-list.hh | 1 +
|
||||
src/vteseq.cc | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
9 files changed, 140 insertions(+), 1 deletion(-)
|
||||
src/vteinternal.hh | 8 ++++++++
|
||||
src/vteseq.cc | 33 ++++++++++++++++++++++++++++++++-
|
||||
7 files changed, 75 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/caps-list.hh b/src/caps-list.hh
|
||||
index 0528d7bcbcc2..8cc58b896f2b 100644
|
||||
--- a/src/caps-list.hh
|
||||
+++ b/src/caps-list.hh
|
||||
@@ -248,6 +248,8 @@ static const vte_matcher_entry_t entries[] = {
|
||||
ENTRY(OSC "119" BEL, reset_highlight_foreground_color),
|
||||
ENTRY(OSC "133;%s" BEL, iterm2_133),
|
||||
ENTRY(OSC "777;%s" BEL, urxvt_777),
|
||||
+ ENTRY(OSC "777;%s;%s;%s" BEL, send_notification),
|
||||
+ ENTRY(OSC "777;%s;%s" BEL, send_notification),
|
||||
ENTRY(OSC "1337;%s" BEL, iterm2_1337),
|
||||
|
||||
/* Set text parameters, ST_terminated versions. */
|
||||
@@ -287,6 +289,8 @@ static const vte_matcher_entry_t entries[] = {
|
||||
ENTRY(OSC "119" ST, reset_highlight_foreground_color),
|
||||
ENTRY(OSC "133;%s" ST, iterm2_133),
|
||||
ENTRY(OSC "777;%s" ST, urxvt_777),
|
||||
+ ENTRY(OSC "777;%s;%s;%s" ST, send_notification),
|
||||
+ ENTRY(OSC "777;%s;%s" ST, send_notification),
|
||||
ENTRY(OSC "1337;%s" ST, iterm2_1337),
|
||||
|
||||
/* These may be bogus, I can't find docs for them anywhere (#104154). */
|
||||
diff --git a/src/marshal.list b/src/marshal.list
|
||||
index 1e4d0c1b6476..3385b4759713 100644
|
||||
--- a/src/marshal.list
|
||||
@ -62,20 +38,10 @@ index 1e4d0c1b6476..3385b4759713 100644
|
||||
VOID:STRING,UINT
|
||||
VOID:UINT,UINT
|
||||
diff --git a/src/vte.cc b/src/vte.cc
|
||||
index bc7ff146f59b..40b9785de5fb 100644
|
||||
index 732959d1e085..c7c7e98c2c43 100644
|
||||
--- a/src/vte.cc
|
||||
+++ b/src/vte.cc
|
||||
@@ -8664,6 +8664,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
|
||||
|
||||
remove_update_timeout(this);
|
||||
|
||||
+ g_free (m_notification_summary);
|
||||
+ g_free (m_notification_body);
|
||||
+
|
||||
/* discard title updates */
|
||||
g_free(m_window_title);
|
||||
g_free(m_window_title_changed);
|
||||
@@ -10929,6 +10932,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
@@ -10762,6 +10762,15 @@ VteTerminalPrivate::emit_pending_signals()
|
||||
|
||||
emit_adjustment_changed();
|
||||
|
||||
@ -83,16 +49,16 @@ index bc7ff146f59b..40b9785de5fb 100644
|
||||
+ _vte_debug_print (VTE_DEBUG_SIGNALS,
|
||||
+ "Emitting `notification-received'.\n");
|
||||
+ g_signal_emit(object, signals[SIGNAL_NOTIFICATION_RECEIVED], 0,
|
||||
+ m_notification_summary,
|
||||
+ m_notification_body);
|
||||
+ m_notification_summary.c_str(),
|
||||
+ m_notification_body.c_str());
|
||||
+ m_notification_received = FALSE;
|
||||
+ }
|
||||
+
|
||||
if (m_window_title_changed) {
|
||||
really_changed = (g_strcmp0(m_window_title, m_window_title_changed) != 0);
|
||||
g_free (m_window_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 4e2896cf1aaf..f288f9e0f49a 100644
|
||||
index 8c493bc1b223..fac2d26a50e4 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -104,8 +104,10 @@ struct _VteTerminalClass {
|
||||
@ -108,10 +74,10 @@ index 4e2896cf1aaf..f288f9e0f49a 100644
|
||||
VteTerminalClassPrivate *priv;
|
||||
};
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 516e042526cd..83ca17961abf 100644
|
||||
index 4d74b21accf8..9a3bc1128d9e 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -709,6 +709,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -700,6 +700,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
klass->child_exited = NULL;
|
||||
klass->encoding_changed = NULL;
|
||||
klass->char_size_changed = NULL;
|
||||
@ -119,7 +85,7 @@ index 516e042526cd..83ca17961abf 100644
|
||||
klass->window_title_changed = NULL;
|
||||
klass->icon_title_changed = NULL;
|
||||
klass->selection_changed = NULL;
|
||||
@@ -784,6 +785,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -775,6 +776,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
G_TYPE_NONE,
|
||||
1, G_TYPE_INT);
|
||||
|
||||
@ -159,141 +125,94 @@ index c49754ef38ee..126d29326f11 100644
|
||||
LAST_SIGNAL
|
||||
};
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index ec434667281c..193be6374070 100644
|
||||
index 737678a06b09..78bacbcd1b8b 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -630,6 +630,11 @@ public:
|
||||
@@ -572,6 +572,11 @@ public:
|
||||
gboolean m_cursor_moved_pending;
|
||||
gboolean m_contents_changed_pending;
|
||||
|
||||
+ /* desktop notification */
|
||||
+ gboolean m_notification_received;
|
||||
+ gchar *m_notification_summary;
|
||||
+ gchar *m_notification_body;
|
||||
+ /* desktop notification */
|
||||
+ gboolean m_notification_received;
|
||||
+ std::string m_notification_summary;
|
||||
+ std::string m_notification_body;
|
||||
+
|
||||
/* window name changes */
|
||||
char* m_window_title;
|
||||
char* m_window_title_changed;
|
||||
diff --git a/src/vteseq-list.hh b/src/vteseq-list.hh
|
||||
index af9fc893ef5a..7f97be94a184 100644
|
||||
--- a/src/vteseq-list.hh
|
||||
+++ b/src/vteseq-list.hh
|
||||
@@ -121,6 +121,7 @@ SEQUENCE_HANDLER(select_character_protection)
|
||||
SEQUENCE_HANDLER(select_locator_events)
|
||||
SEQUENCE_HANDLER(selective_erase_in_display)
|
||||
SEQUENCE_HANDLER(selective_erase_in_line)
|
||||
+SEQUENCE_HANDLER(send_notification)
|
||||
SEQUENCE_HANDLER(send_primary_device_attributes)
|
||||
SEQUENCE_HANDLER(send_secondary_device_attributes)
|
||||
SEQUENCE_HANDLER(send_tertiary_device_attributes)
|
||||
std::string m_window_title{};
|
||||
std::string m_current_directory_uri{};
|
||||
std::string m_current_file_uri{};
|
||||
@@ -1315,6 +1320,9 @@ public:
|
||||
int osc) noexcept;
|
||||
|
||||
/* OSC handlers */
|
||||
+ void handle_urxvt_extension(vte::parser::Sequence const& seq,
|
||||
+ vte::parser::StringTokeniser::const_iterator& token,
|
||||
+ vte::parser::StringTokeniser::const_iterator const& endtoken) noexcept;
|
||||
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 218bedf43da9..235e8d2b7426 100644
|
||||
index ba97480ce120..ddf1dcca84f6 100644
|
||||
--- a/src/vteseq.cc
|
||||
+++ b/src/vteseq.cc
|
||||
@@ -2200,6 +2200,98 @@ VteTerminalPrivate::seq_return_terminal_id(vte::parser::Params const& params)
|
||||
seq_send_primary_device_attributes(params);
|
||||
@@ -1339,6 +1339,34 @@ VteTerminalPrivate::delete_lines(vte::grid::row_t param)
|
||||
m_text_deleted_flag = TRUE;
|
||||
}
|
||||
|
||||
+void
|
||||
+VteTerminalPrivate::seq_send_notification (vte::parser::Params const& params)
|
||||
+VteTerminalPrivate::handle_urxvt_extension(vte::parser::Sequence const& seq,
|
||||
+ vte::parser::StringTokeniser::const_iterator& token,
|
||||
+ vte::parser::StringTokeniser::const_iterator const& endtoken) noexcept
|
||||
+{
|
||||
+ GValue *value;
|
||||
+ const char *end;
|
||||
+ char *option = NULL;
|
||||
+ char *str = NULL;
|
||||
+ char *p, *validated;
|
||||
+ if (token == endtoken) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ g_clear_pointer (&m_notification_summary, g_free);
|
||||
+ g_clear_pointer (&m_notification_body, g_free);
|
||||
+ if (*token == "notify") {
|
||||
+ ++token;
|
||||
+
|
||||
+ value = params.value_at_unchecked (0);
|
||||
+ if (value == NULL) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+ if (token == endtoken)
|
||||
+ return;
|
||||
+
|
||||
+ if (G_VALUE_HOLDS_STRING (value)) {
|
||||
+ option = g_value_dup_string (value);
|
||||
+ } else if (G_VALUE_HOLDS_POINTER (value)) {
|
||||
+ option = params.ucs4_to_utf8 ((gunichar const*)g_value_get_pointer (value));
|
||||
+ } else {
|
||||
+ goto out;
|
||||
+ }
|
||||
+ m_notification_summary = *token;
|
||||
+ m_notification_body.clear();
|
||||
+ m_notification_received = TRUE;
|
||||
+ ++token;
|
||||
+
|
||||
+ if (g_strcmp0 (option, "notify") != 0) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+ if (token == endtoken)
|
||||
+ return;
|
||||
+
|
||||
+ value = params.value_at_unchecked (1);
|
||||
+ if (value == NULL) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ if (G_VALUE_HOLDS_STRING (value)) {
|
||||
+ str = g_value_dup_string (value);
|
||||
+ } else if (G_VALUE_HOLDS_POINTER (value)) {
|
||||
+ str = params.ucs4_to_utf8 ((gunichar const*)g_value_get_pointer (value));
|
||||
+ } else {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ g_utf8_validate (str, strlen (str), &end);
|
||||
+ validated = g_strndup (str, end - str);
|
||||
+
|
||||
+ /* No control characters allowed. */
|
||||
+ for (p = validated; *p != '\0'; p++) {
|
||||
+ if ((*p & 0x1f) == *p) {
|
||||
+ *p = ' ';
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ m_notification_summary = validated;
|
||||
+ validated = NULL;
|
||||
+ g_free (str);
|
||||
+
|
||||
+ m_notification_received = TRUE;
|
||||
+ if (params.size () == 2) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ value = params.value_at_unchecked (2);
|
||||
+ if (value == NULL) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ if (G_VALUE_HOLDS_STRING (value)) {
|
||||
+ str = g_value_dup_string (value);
|
||||
+ } else if (G_VALUE_HOLDS_POINTER (value)) {
|
||||
+ str = params.ucs4_to_utf8 ((gunichar const*)g_value_get_pointer (value));
|
||||
+ } else {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ g_utf8_validate (str, strlen (str), &end);
|
||||
+ validated = g_strndup (str, end - str);
|
||||
+
|
||||
+ /* No control characters allowed. */
|
||||
+ for (p = validated; *p != '\0'; p++) {
|
||||
+ if ((*p & 0x1f) == *p) {
|
||||
+ *p = ' ';
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ m_notification_body = validated;
|
||||
+ validated = NULL;
|
||||
+ g_free (str);
|
||||
+
|
||||
+ out:
|
||||
+ g_free (option);
|
||||
+ m_notification_body = *token;
|
||||
+ return;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/* Send secondary device attributes. */
|
||||
void
|
||||
VteTerminalPrivate::seq_send_secondary_device_attributes(vte::parser::Params const& params)
|
||||
bool
|
||||
VteTerminalPrivate::get_osc_color_index(int osc,
|
||||
int value,
|
||||
@@ -6342,6 +6370,10 @@ VteTerminalPrivate::OSC(vte::parser::Sequence const& seq)
|
||||
reset_color(VTE_HIGHLIGHT_FG, VTE_COLOR_SOURCE_ESCAPE);
|
||||
break;
|
||||
|
||||
+ case VTE_OSC_URXVT_EXTENSION:
|
||||
+ handle_urxvt_extension(seq, it, cend);
|
||||
+ break;
|
||||
+
|
||||
case VTE_OSC_XTERM_SET_ICON_TITLE:
|
||||
case VTE_OSC_XTERM_SET_XPROPERTY:
|
||||
case VTE_OSC_XTERM_SET_COLOR_MOUSE_CURSOR_FG:
|
||||
@@ -6382,7 +6414,6 @@ VteTerminalPrivate::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:
|
||||
case VTE_OSC_YF_RQGWR:
|
||||
default:
|
||||
break;
|
||||
--
|
||||
2.16.2
|
||||
2.14.3
|
||||
|
||||
|
||||
From b889392fd5b2a697079709e6b95f06b87a463681 Mon Sep 17 00:00:00 2001
|
||||
From 288021fb19079967ef1f4489cdaa9933a93bb1a2 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
|
||||
@ -304,7 +223,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/vte.sh b/src/vte.sh
|
||||
index 2d211caa2f17..1c0543bd9d26 100644
|
||||
index 5fb16996dd93..2a328de27cbd 100644
|
||||
--- a/src/vte.sh
|
||||
+++ b/src/vte.sh
|
||||
@@ -50,9 +50,11 @@ __vte_osc7 () {
|
||||
@ -315,16 +234,16 @@ index 2d211caa2f17..1c0543bd9d26 100644
|
||||
+ command="${command//;/ }"
|
||||
local pwd='~'
|
||||
[ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/}
|
||||
- printf "\033]0;%s@%s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
|
||||
+ printf "\033]777;notify;Command completed;%s\007\033]0;%s@%s:%s\007%s" "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
|
||||
- printf "\u009D0;%s@%s:%s\u009C%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
|
||||
+ printf "\u009D777;notify;Command completed;%s\u009C\u009D0;%s@%s:%s\u009C%s" "${command}" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
|
||||
}
|
||||
|
||||
case "$TERM" in
|
||||
--
|
||||
2.16.2
|
||||
2.14.3
|
||||
|
||||
|
||||
From 2d0b14d5b261d5366075ca9d6ae780844926f35e Mon Sep 17 00:00:00 2001
|
||||
From 30b066b9ff43f2e12540e9d47a1cf90ed4c5b436 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] Test the notification-received signal
|
||||
@ -360,10 +279,10 @@ index 8663d63c5445..4c5d9a2b3bad 100644
|
||||
|
||||
class App : Gtk.Application
|
||||
diff --git a/src/app/app.cc b/src/app/app.cc
|
||||
index d4240640fc82..a581c60a839e 100644
|
||||
index eb2afc215998..38ae1e5ccc9e 100644
|
||||
--- a/src/app/app.cc
|
||||
+++ b/src/app/app.cc
|
||||
@@ -1588,6 +1588,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
|
||||
@@ -1621,6 +1621,14 @@ window_window_title_changed_cb(VteTerminal* terminal,
|
||||
vte_terminal_get_window_title(window->terminal));
|
||||
}
|
||||
|
||||
@ -378,7 +297,7 @@ index d4240640fc82..a581c60a839e 100644
|
||||
static void
|
||||
window_lower_window_cb(VteTerminal* terminal,
|
||||
VteappWindow* window)
|
||||
@@ -1815,6 +1823,8 @@ vteapp_window_constructed(GObject *object)
|
||||
@@ -1848,6 +1856,8 @@ vteapp_window_constructed(GObject *object)
|
||||
if (options.object_notifications)
|
||||
g_signal_connect(window->terminal, "notify", G_CALLBACK(window_notify_cb), window);
|
||||
|
||||
@ -388,10 +307,10 @@ index d4240640fc82..a581c60a839e 100644
|
||||
if (options.no_double_buffer)
|
||||
gtk_widget_set_double_buffered(GTK_WIDGET(window->terminal), false);
|
||||
--
|
||||
2.16.2
|
||||
2.14.3
|
||||
|
||||
|
||||
From 450ef6bea0e195e2f88b4d4fea2d4c507eca61ae Mon Sep 17 00:00:00 2001
|
||||
From d2ae1e7e5972076ed94a7569dd82987feec0c464 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
|
||||
@ -410,7 +329,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380
|
||||
6 files changed, 71 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
|
||||
index 6e37f0bad223..025986ee2146 100644
|
||||
index e76ac3a8f923..433d721b7400 100644
|
||||
--- a/doc/reference/vte-sections.txt
|
||||
+++ b/doc/reference/vte-sections.txt
|
||||
@@ -55,6 +55,7 @@ vte_terminal_get_cursor_blink_mode
|
||||
@ -422,10 +341,10 @@ index 6e37f0bad223..025986ee2146 100644
|
||||
vte_terminal_get_scrollback_lines
|
||||
vte_terminal_set_font
|
||||
diff --git a/src/vte.cc b/src/vte.cc
|
||||
index 40b9785de5fb..b83d26d4feb4 100644
|
||||
index c7c7e98c2c43..ba7c1fee2eec 100644
|
||||
--- a/src/vte.cc
|
||||
+++ b/src/vte.cc
|
||||
@@ -10174,6 +10174,7 @@ void
|
||||
@@ -10021,6 +10021,7 @@ void
|
||||
VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
{
|
||||
gdouble delta_x, delta_y;
|
||||
@ -433,7 +352,7 @@ index 40b9785de5fb..b83d26d4feb4 100644
|
||||
gdouble v;
|
||||
gint cnt, i;
|
||||
int button;
|
||||
@@ -10227,7 +10228,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
@@ -10074,7 +10075,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
|
||||
return;
|
||||
}
|
||||
|
||||
@ -448,7 +367,7 @@ index 40b9785de5fb..b83d26d4feb4 100644
|
||||
_vte_debug_print(VTE_DEBUG_EVENTS,
|
||||
"Scroll speed is %d lines per non-smooth scroll unit\n",
|
||||
(int) v);
|
||||
@@ -10488,6 +10495,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
|
||||
@@ -10335,6 +10342,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
|
||||
}
|
||||
}
|
||||
|
||||
@ -466,7 +385,7 @@ index 40b9785de5fb..b83d26d4feb4 100644
|
||||
VteTerminalPrivate::set_scrollback_lines(long lines)
|
||||
{
|
||||
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
|
||||
index f288f9e0f49a..7d09c761aded 100644
|
||||
index fac2d26a50e4..c4834bfdf310 100644
|
||||
--- a/src/vte/vteterminal.h
|
||||
+++ b/src/vte/vteterminal.h
|
||||
@@ -296,6 +296,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
|
||||
@ -481,10 +400,10 @@ index f288f9e0f49a..7d09c761aded 100644
|
||||
_VTE_PUBLIC
|
||||
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
|
||||
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
|
||||
index 83ca17961abf..921457e7f62f 100644
|
||||
index 9a3bc1128d9e..77038cd14407 100644
|
||||
--- a/src/vtegtk.cc
|
||||
+++ b/src/vtegtk.cc
|
||||
@@ -491,6 +491,9 @@ vte_terminal_get_property (GObject *object,
|
||||
@@ -483,6 +483,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;
|
||||
@ -494,7 +413,7 @@ index 83ca17961abf..921457e7f62f 100644
|
||||
case PROP_SCROLLBACK_LINES:
|
||||
g_value_set_uint (value, vte_terminal_get_scrollback_lines(terminal));
|
||||
break;
|
||||
@@ -592,6 +595,9 @@ vte_terminal_set_property (GObject *object,
|
||||
@@ -584,6 +587,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;
|
||||
@ -504,7 +423,7 @@ index 83ca17961abf..921457e7f62f 100644
|
||||
case PROP_SCROLLBACK_LINES:
|
||||
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
|
||||
break;
|
||||
@@ -1540,6 +1546,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
@@ -1531,6 +1537,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
|
||||
TRUE,
|
||||
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
|
||||
|
||||
@ -526,7 +445,7 @@ index 83ca17961abf..921457e7f62f 100644
|
||||
/**
|
||||
* VteTerminal:scrollback-lines:
|
||||
*
|
||||
@@ -4067,6 +4088,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
|
||||
@@ -4064,6 +4085,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
|
||||
return IMPL(terminal)->m_row_count;
|
||||
}
|
||||
|
||||
@ -570,18 +489,18 @@ index 126d29326f11..b2c9edfa8246 100644
|
||||
PROP_SCROLL_ON_KEYSTROKE,
|
||||
PROP_SCROLL_ON_OUTPUT,
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index 193be6374070..d2db275b3e36 100644
|
||||
index 78bacbcd1b8b..b6b26360f3c7 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -498,6 +498,7 @@ public:
|
||||
@@ -445,6 +445,7 @@ public:
|
||||
/* Scrolling options. */
|
||||
gboolean m_scroll_on_output;
|
||||
gboolean m_scroll_on_keystroke;
|
||||
gboolean m_alternate_screen_scroll;
|
||||
+ guint m_scroll_speed;
|
||||
vte::grid::row_t m_scrollback_lines;
|
||||
|
||||
/* Restricted scrolling */
|
||||
@@ -1264,6 +1265,7 @@ public:
|
||||
@@ -1197,6 +1198,7 @@ public:
|
||||
bool set_mouse_autohide(bool autohide);
|
||||
bool set_pty(VtePty *pty);
|
||||
bool set_rewrap_on_resize(bool rewrap);
|
||||
@ -590,10 +509,10 @@ index 193be6374070..d2db275b3e36 100644
|
||||
bool set_scroll_on_keystroke(bool scroll);
|
||||
bool set_scroll_on_output(bool scroll);
|
||||
--
|
||||
2.16.2
|
||||
2.14.3
|
||||
|
||||
|
||||
From 65f2c1766bdc252d3cb925d2d676c40a368498b5 Mon Sep 17 00:00:00 2001
|
||||
From 872857d91a15ead2319e6da1afc8690a4952950f 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] Test the scroll-speed property
|
||||
@ -634,10 +553,10 @@ index 4c5d9a2b3bad..3b7310679239 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 a581c60a839e..3faa2d76dd10 100644
|
||||
index 38ae1e5ccc9e..a3daf28070cc 100644
|
||||
--- a/src/app/app.cc
|
||||
+++ b/src/app/app.cc
|
||||
@@ -91,6 +91,7 @@ public:
|
||||
@@ -92,6 +92,7 @@ public:
|
||||
int verbosity{0};
|
||||
double cell_height_scale{1.0};
|
||||
double cell_width_scale{1.0};
|
||||
@ -645,7 +564,7 @@ index a581c60a839e..3faa2d76dd10 100644
|
||||
VteCursorBlinkMode cursor_blink_mode{VTE_CURSOR_BLINK_SYSTEM};
|
||||
VteCursorShape cursor_shape{VTE_CURSOR_SHAPE_BLOCK};
|
||||
VteTextBlinkMode text_blink_mode{VTE_TEXT_BLINK_ALWAYS};
|
||||
@@ -401,6 +402,8 @@ public:
|
||||
@@ -404,6 +405,8 @@ public:
|
||||
"Save terminal contents to file at exit", nullptr },
|
||||
{ "reverse", 0, 0, G_OPTION_ARG_NONE, &reverse,
|
||||
"Reverse foreground/background colors", nullptr },
|
||||
@ -654,7 +573,7 @@ index a581c60a839e..3faa2d76dd10 100644
|
||||
{ "scrollback-lines", 'n', 0, G_OPTION_ARG_INT, &scrollback_lines,
|
||||
"Specify the number of scrollback-lines (-1 for infinite)", nullptr },
|
||||
{ "transparent", 'T', 0, G_OPTION_ARG_INT, &transparency_percent,
|
||||
@@ -1853,6 +1856,7 @@ vteapp_window_constructed(GObject *object)
|
||||
@@ -1886,6 +1889,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);
|
||||
@ -663,5 +582,5 @@ index a581c60a839e..3faa2d76dd10 100644
|
||||
vte_terminal_set_text_blink_mode(window->terminal, options.text_blink_mode);
|
||||
|
||||
--
|
||||
2.16.2
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
%global apiver 2.91
|
||||
|
||||
Name: vte291
|
||||
Version: 0.52.2
|
||||
Version: 0.53.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Terminal emulator library
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://www.gnome.org/
|
||||
Source0: http://download.gnome.org/sources/vte/0.52/vte-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/vte/0.53/vte-%{version}.tar.xz
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=711059
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1103380
|
||||
@ -96,6 +96,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
%{_sysconfdir}/profile.d/vte.sh
|
||||
|
||||
%changelog
|
||||
* Mon Jun 04 2018 Debarshi Ray <rishi@fedoraproject.org> - 0.53.0-1
|
||||
- Update to 0.53.0
|
||||
|
||||
* Mon May 21 2018 Kalev Lember <klember@redhat.com> - 0.52.2-1
|
||||
- Update to 0.52.2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user