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

Rebase the scroll speed patches

Browse Source
This commit is contained in:
Debarshi Ray 2016-07-01 19:46:50 +02:00
parent f1ae7f91ec
commit 525ec1b166
1 changed files with 88 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
vte291-command-notify-scroll-speed.patch
View File

@ -1,7 +1,8 @@
From f9e12ac88768a60b095e0966dacc8c791ec65d46 Mon Sep 17 00:00:00 2001
From c22c1f0d126c968d02177259fc71924238f4b310 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
Subject: [PATCH 1/6] emulation: Add sequences and signals for desktop
notification
Add sequences
OSC 777 ; notify ; SUMMARY ; BODY BEL
@ -20,13 +21,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
src/caps.cc | 4 +++
src/marshal.list | 1 +
src/vte.cc | 12 +++++++
src/vte/vteterminal.h | 4 ++-
src/vte/vteterminal.h | 3 +-
src/vtegtk.cc | 21 ++++++++++++
src/vtegtk.hh | 1 +
src/vteinternal.hh | 5 +++
src/vteseq-n.gperf | 1 +
src/vteseq.cc | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
9 files changed, 138 insertions(+), 1 deletion(-)
9 files changed, 137 insertions(+), 1 deletion(-)
diff --git a/src/caps.cc b/src/caps.cc
index f5ad64a1c7b2..d74971870955 100644
@ -61,10 +62,10 @@ index 0276422ec6d4..2c35c685930a 100644
VOID:STRING,UINT
VOID:UINT,UINT
diff --git a/src/vte.cc b/src/vte.cc
index d3ff12a34249..bba5447af888 100644
index 02bea92e85d3..33a4e77f177d 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -8538,6 +8538,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
@@ -8528,6 +8528,9 @@ VteTerminalPrivate::~VteTerminalPrivate()
remove_update_timeout(this);
@ -74,7 +75,7 @@ index d3ff12a34249..bba5447af888 100644
/* discard title updates */
g_free(m_window_title);
g_free(m_window_title_changed);
@@ -10574,6 +10577,15 @@ VteTerminalPrivate::emit_pending_signals()
@@ -10566,6 +10569,15 @@ VteTerminalPrivate::emit_pending_signals()
emit_adjustment_changed();
@ -91,15 +92,20 @@ index d3ff12a34249..bba5447af888 100644
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 7836271db108..f514c3b227f9 100644
index 38ea8c3bc460..cb00855f0cf8 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -104,8 +104,10 @@ struct _VteTerminalClass {
@@ -71,6 +71,7 @@ struct _VteTerminalClass {
void (*child_exited)(VteTerminal* terminal, int status);
void (*encoding_changed)(VteTerminal* terminal);
void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
+ void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
void (*window_title_changed)(VteTerminal* terminal);
void (*icon_title_changed)(VteTerminal* terminal);
void (*selection_changed)(VteTerminal* terminal);
@@ -104,7 +105,7 @@ struct _VteTerminalClass {
void (*bell)(VteTerminal* terminal);
+ void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
+
/* Padding for future expansion. */
- gpointer padding[16];
+ gpointer padding[15];
@ -107,10 +113,10 @@ index 7836271db108..f514c3b227f9 100644
VteTerminalClassPrivate *priv;
};
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 5ecec5e28a20..e394a3690f2e 100644
index 6ea47f949a72..c81cff0331ce 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -657,6 +657,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -675,6 +675,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
klass->child_exited = NULL;
klass->encoding_changed = NULL;
klass->char_size_changed = NULL;
@ -118,7 +124,7 @@ index 5ecec5e28a20..e394a3690f2e 100644
klass->window_title_changed = NULL;
klass->icon_title_changed = NULL;
klass->selection_changed = NULL;
@@ -733,6 +734,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -751,6 +752,26 @@ vte_terminal_class_init(VteTerminalClass *klass)
1, G_TYPE_INT);
/**
@ -146,22 +152,22 @@ index 5ecec5e28a20..e394a3690f2e 100644
* @vteterminal: the object which received the signal
*
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 5340725d374c..f8a83525b18c 100644
index 5fd8c1161538..d28c72ff5adb 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -55,6 +55,7 @@ enum {
@@ -53,6 +53,7 @@ enum {
SIGNAL_TEXT_INSERTED,
SIGNAL_TEXT_MODIFIED,
SIGNAL_TEXT_SCROLLED,
+ SIGNAL_NOTIFICATION_RECEIVED,
SIGNAL_WINDOW_TITLE_CHANGED,
LAST_SIGNAL
};
COPY_CLIPBOARD,
PASTE_CLIPBOARD,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 7292c3332eb3..5ecb1cbf8e28 100644
index 1ef0cea59b0d..5e0b846f9dfc 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -511,6 +511,11 @@ public:
@@ -513,6 +513,11 @@ public:
gboolean m_cursor_moved_pending;
gboolean m_contents_changed_pending;
@ -287,10 +293,10 @@ index c83391c7dc0f..0152c1a55ecb 100644
2.5.5
From 19455f3dadf2a8430aab1cfa11047c73b9033d2f Mon Sep 17 00:00:00 2001
From f8cc6cff12059d32dfc731897961ed3ec1493d52 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
Subject: [PATCH 2/6] vte.sh: Emit OSC 777 from PROMPT_COMMAND
https://bugzilla.gnome.org/show_bug.cgi?id=711059
---
@ -318,17 +324,17 @@ index 2d211caa2f17..1c0543bd9d26 100644
2.5.5
From 4237ca5f7e6bf191c65231446af71d3d100d7acd Mon Sep 17 00:00:00 2001
From 4aa708b29f8b102732e3ad2fe73ede1cafea3c56 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/6] vteapp: Add a test for the notification-received signal
---
src/app.vala | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/app.vala b/src/app.vala
index 275ae3a6eb25..a0a728786b5c 100644
index 81049640358f..364836a61f1c 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -332,6 +332,8 @@ class Window : Gtk.ApplicationWindow
@ -356,10 +362,46 @@ index 275ae3a6eb25..a0a728786b5c 100644
2.5.5
From d79520b1ce6497ec7538a866a700b715f6519c6d Mon Sep 17 00:00:00 2001
From f3f2d97ef01e2678aa40802f1c1600c30967acbd Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 9 May 2016 12:48:46 +0200
Subject: [PATCH 4/6] Fix the order of vfunc pointers in VteTerminalClass to
undo ABI break
https://bugzilla.gnome.org/show_bug.cgi?id=711059
---
src/vte/vteterminal.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index cb00855f0cf8..7dc616c13fbb 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -71,7 +71,6 @@ struct _VteTerminalClass {
void (*child_exited)(VteTerminal* terminal, int status);
void (*encoding_changed)(VteTerminal* terminal);
void (*char_size_changed)(VteTerminal* terminal, guint char_width, guint char_height);
- void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
void (*window_title_changed)(VteTerminal* terminal);
void (*icon_title_changed)(VteTerminal* terminal);
void (*selection_changed)(VteTerminal* terminal);
@@ -104,6 +103,8 @@ struct _VteTerminalClass {
void (*bell)(VteTerminal* terminal);
+ void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body);
+
/* Padding for future expansion. */
gpointer padding[15];
--
2.5.5
From ee2cb8443cf0628c76461d710b0901ad83fb17cc 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
Subject: [PATCH 5/6] Add a property to configure the scroll speed
By default, it is set to zero which gives the current behaviour of
moving the buffer by a function of the number of visible rows.
@ -375,7 +417,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 56ae7754491d..58ce6c2c5c23 100644
index 7969e2fe6d85..722e2a73ac13 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -41,6 +41,7 @@ vte_terminal_set_cursor_shape
@ -387,10 +429,10 @@ index 56ae7754491d..58ce6c2c5c23 100644
vte_terminal_set_font
vte_terminal_get_font
diff --git a/src/vte.cc b/src/vte.cc
index bba5447af888..6194368ea5df 100644
index 33a4e77f177d..a0fcc0021e7c 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9857,6 +9857,7 @@ void
@@ -9847,6 +9847,7 @@ void
VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
{
gdouble delta_x, delta_y;
@ -398,7 +440,7 @@ index bba5447af888..6194368ea5df 100644
gdouble v;
gint cnt, i;
int button;
@@ -9910,7 +9911,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
@@ -9900,7 +9901,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event)
return;
}
@ -413,7 +455,7 @@ index bba5447af888..6194368ea5df 100644
_vte_debug_print(VTE_DEBUG_EVENTS,
"Scroll speed is %d lines per non-smooth scroll unit\n",
(int) v);
@@ -10127,6 +10134,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
@@ -10117,6 +10124,16 @@ VteTerminalPrivate::decscusr_cursor_shape()
}
bool
@ -431,10 +473,10 @@ index bba5447af888..6194368ea5df 100644
{
glong low, high, next;
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index f514c3b227f9..89c267555cf9 100644
index 7dc616c13fbb..e78f9b8a90fd 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -267,6 +267,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
@@ -266,6 +266,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal,
_VTE_PUBLIC
VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
@ -446,10 +488,10 @@ index f514c3b227f9..89c267555cf9 100644
_VTE_PUBLIC
void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index e394a3690f2e..953b76fe074f 100644
index c81cff0331ce..cf37d3d1078f 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -464,6 +464,9 @@ vte_terminal_get_property (GObject *object,
@@ -482,6 +482,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;
@ -459,7 +501,7 @@ index e394a3690f2e..953b76fe074f 100644
case PROP_SCROLLBACK_LINES:
g_value_set_uint (value, impl->m_scrollback_lines);
break;
@@ -550,6 +553,9 @@ vte_terminal_set_property (GObject *object,
@@ -568,6 +571,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;
@ -469,7 +511,7 @@ index e394a3690f2e..953b76fe074f 100644
case PROP_SCROLLBACK_LINES:
vte_terminal_set_scrollback_lines (terminal, g_value_get_uint (value));
break;
@@ -1406,6 +1412,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
@@ -1424,6 +1430,21 @@ vte_terminal_class_init(VteTerminalClass *klass)
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
/**
@ -491,7 +533,7 @@ index e394a3690f2e..953b76fe074f 100644
* VteTerminal:scrollback-lines:
*
* The length of the scrollback buffer used by the terminal. The size of
@@ -3462,6 +3483,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
@@ -3463,6 +3484,30 @@ vte_terminal_get_row_count(VteTerminal *terminal)
}
/**
@ -523,7 +565,7 @@ index e394a3690f2e..953b76fe074f 100644
* @terminal: a #VteTerminal
* @lines: the length of the history buffer
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index f8a83525b18c..98c616f54de6 100644
index d28c72ff5adb..faf1484dcc21 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -80,6 +80,7 @@ enum {
@ -535,10 +577,10 @@ index f8a83525b18c..98c616f54de6 100644
PROP_SCROLL_ON_KEYSTROKE,
PROP_SCROLL_ON_OUTPUT,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 5ecb1cbf8e28..cfe39fc92301 100644
index 5e0b846f9dfc..59ad70b0c12e 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -402,6 +402,7 @@ public:
@@ -404,6 +404,7 @@ public:
gboolean m_scroll_on_output;
gboolean m_scroll_on_keystroke;
gboolean m_alternate_screen_scroll;
@ -558,10 +600,10 @@ index 5ecb1cbf8e28..cfe39fc92301 100644
2.5.5
From 2ea58047d01a58c9e4f18559dc23cb1ccd76dc48 Mon Sep 17 00:00:00 2001
From a82ea79b3c28be65074b161096a9b43337df86eb 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 6/6] vteapp: Add a test for the scroll-speed property
https://bugzilla.redhat.com/show_bug.cgi?id=1103380
---
@ -569,7 +611,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1103380
1 file changed, 4 insertions(+)
diff --git a/src/app.vala b/src/app.vala
index a0a728786b5c..3d0ab8b41513 100644
index 364836a61f1c..b0ebb47c4c5d 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -357,6 +357,7 @@ class Window : Gtk.ApplicationWindow