From f1ae7f91ec5c97436000457714ddaefacb271a46 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 1 Jul 2016 19:30:56 +0200 Subject: [PATCH] Add a property to configure the scroll speed --- ...> vte291-command-notify-scroll-speed.patch | 319 ++++++++++++++---- vte291.spec | 10 +- 2 files changed, 268 insertions(+), 61 deletions(-) rename vte291-command-notify.patch => vte291-command-notify-scroll-speed.patch (50%) diff --git a/vte291-command-notify.patch b/vte291-command-notify-scroll-speed.patch similarity index 50% rename from vte291-command-notify.patch rename to vte291-command-notify-scroll-speed.patch index 103ed62..a4ed9f8 100644 --- a/vte291-command-notify.patch +++ b/vte291-command-notify-scroll-speed.patch @@ -1,8 +1,7 @@ -From f3ed32458c6dd092421977691b069bc8508b649f Mon Sep 17 00:00:00 2001 +From f9e12ac88768a60b095e0966dacc8c791ec65d46 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 -Subject: [PATCH 1/4] emulation: Add sequences and signals for desktop - notification +Subject: [PATCH 1/5] Add sequences and signals for desktop notification Add sequences OSC 777 ; notify ; SUMMARY ; BODY BEL @@ -21,13 +20,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 | 3 +- + src/vte/vteterminal.h | 4 ++- src/vtegtk.cc | 21 ++++++++++++ src/vtegtk.hh | 1 + src/vteinternal.hh | 5 +++ src/vteseq-n.gperf | 1 + src/vteseq.cc | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 9 files changed, 137 insertions(+), 1 deletion(-) + 9 files changed, 138 insertions(+), 1 deletion(-) diff --git a/src/caps.cc b/src/caps.cc index f5ad64a1c7b2..d74971870955 100644 @@ -62,10 +61,10 @@ index 0276422ec6d4..2c35c685930a 100644 VOID:STRING,UINT VOID:UINT,UINT diff --git a/src/vte.cc b/src/vte.cc -index 8f7a18b8b0c6..aa80a02f5120 100644 +index d3ff12a34249..bba5447af888 100644 --- a/src/vte.cc +++ b/src/vte.cc -@@ -8518,6 +8518,9 @@ VteTerminalPrivate::~VteTerminalPrivate() +@@ -8538,6 +8538,9 @@ VteTerminalPrivate::~VteTerminalPrivate() remove_update_timeout(this); @@ -75,7 +74,7 @@ index 8f7a18b8b0c6..aa80a02f5120 100644 /* discard title updates */ g_free(m_window_title); g_free(m_window_title_changed); -@@ -10552,6 +10555,15 @@ VteTerminalPrivate::emit_pending_signals() +@@ -10574,6 +10577,15 @@ VteTerminalPrivate::emit_pending_signals() emit_adjustment_changed(); @@ -92,20 +91,15 @@ index 8f7a18b8b0c6..aa80a02f5120 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 38ea8c3bc460..cb00855f0cf8 100644 +index 7836271db108..f514c3b227f9 100644 --- a/src/vte/vteterminal.h +++ b/src/vte/vteterminal.h -@@ -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 { +@@ -104,8 +104,10 @@ 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]; @@ -113,10 +107,10 @@ index 38ea8c3bc460..cb00855f0cf8 100644 VteTerminalClassPrivate *priv; }; diff --git a/src/vtegtk.cc b/src/vtegtk.cc -index a2591b4bc7e8..19733ea85505 100644 +index 5ecec5e28a20..e394a3690f2e 100644 --- a/src/vtegtk.cc +++ b/src/vtegtk.cc -@@ -666,6 +666,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -657,6 +657,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -124,7 +118,7 @@ index a2591b4bc7e8..19733ea85505 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -742,6 +743,26 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -733,6 +734,26 @@ vte_terminal_class_init(VteTerminalClass *klass) 1, G_TYPE_INT); /** @@ -152,22 +146,22 @@ index a2591b4bc7e8..19733ea85505 100644 * @vteterminal: the object which received the signal * diff --git a/src/vtegtk.hh b/src/vtegtk.hh -index 5fd8c1161538..d28c72ff5adb 100644 +index 5340725d374c..f8a83525b18c 100644 --- a/src/vtegtk.hh +++ b/src/vtegtk.hh -@@ -53,6 +53,7 @@ enum { +@@ -55,6 +55,7 @@ enum { SIGNAL_TEXT_INSERTED, SIGNAL_TEXT_MODIFIED, SIGNAL_TEXT_SCROLLED, + SIGNAL_NOTIFICATION_RECEIVED, SIGNAL_WINDOW_TITLE_CHANGED, - COPY_CLIPBOARD, - PASTE_CLIPBOARD, + LAST_SIGNAL + }; diff --git a/src/vteinternal.hh b/src/vteinternal.hh -index 696750b585f0..cb57a60c4e7e 100644 +index 7292c3332eb3..5ecb1cbf8e28 100644 --- a/src/vteinternal.hh +++ b/src/vteinternal.hh -@@ -513,6 +513,11 @@ public: +@@ -511,6 +511,11 @@ public: gboolean m_cursor_moved_pending; gboolean m_contents_changed_pending; @@ -290,13 +284,13 @@ index c83391c7dc0f..0152c1a55ecb 100644 static void vte_sequence_handler_send_secondary_device_attributes (VteTerminalPrivate *that, GValueArray *params) -- -2.5.0 +2.5.5 -From 937ea8e74fdfa983766647e55257d56b9b23bb5c Mon Sep 17 00:00:00 2001 +From 19455f3dadf2a8430aab1cfa11047c73b9033d2f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 -Subject: [PATCH 2/4] vte.sh: Emit OSC 777 from PROMPT_COMMAND +Subject: [PATCH 2/5] vte.sh: Emit OSC 777 from PROMPT_COMMAND https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- @@ -321,20 +315,20 @@ index 2d211caa2f17..1c0543bd9d26 100644 case "$TERM" in -- -2.5.0 +2.5.5 -From 7e529abe60dffbb304117dfa8f44a7c275acf7ee Mon Sep 17 00:00:00 2001 +From 4237ca5f7e6bf191c65231446af71d3d100d7acd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 -Subject: [PATCH 3/4] vteapp: Add a test for the notification-received signal +Subject: [PATCH 3/5] 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 81049640358f..364836a61f1c 100644 +index 275ae3a6eb25..a0a728786b5c 100644 --- a/src/app.vala +++ b/src/app.vala @@ -332,6 +332,8 @@ class Window : Gtk.ApplicationWindow @@ -359,41 +353,250 @@ index 81049640358f..364836a61f1c 100644 class App : Gtk.Application -- -2.5.0 +2.5.5 -From cf9441b98846e21b179d3c3b186db7521bdb2759 Mon Sep 17 00:00:00 2001 +From d79520b1ce6497ec7538a866a700b715f6519c6d Mon Sep 17 00:00:00 2001 From: Debarshi Ray -Date: Mon, 9 May 2016 12:48:46 +0200 -Subject: [PATCH 4/4] Fix the order of vfunc pointers in VteTerminalClass to - undo ABI break +Date: Fri, 13 May 2016 17:53:54 +0200 +Subject: [PATCH 4/5] Add a property to configure the scroll speed -https://bugzilla.gnome.org/show_bug.cgi?id=711059 +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. + +https://bugzilla.redhat.com/show_bug.cgi?id=1103380 --- - src/vte/vteterminal.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + doc/reference/vte-sections.txt | 1 + + src/vte.cc | 19 +++++++++++++++++- + src/vte/vteterminal.h | 4 ++++ + src/vtegtk.cc | 45 ++++++++++++++++++++++++++++++++++++++++++ + src/vtegtk.hh | 1 + + src/vteinternal.hh | 2 ++ + 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 +--- a/doc/reference/vte-sections.txt ++++ b/doc/reference/vte-sections.txt +@@ -41,6 +41,7 @@ vte_terminal_set_cursor_shape + vte_terminal_get_cursor_shape + vte_terminal_get_cursor_blink_mode + vte_terminal_set_cursor_blink_mode ++vte_terminal_set_scroll_speed + vte_terminal_set_scrollback_lines + vte_terminal_set_font + vte_terminal_get_font +diff --git a/src/vte.cc b/src/vte.cc +index bba5447af888..6194368ea5df 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -9857,6 +9857,7 @@ void + VteTerminalPrivate::widget_scroll(GdkEventScroll *event) + { + gdouble delta_x, delta_y; ++ gdouble scroll_speed; + gdouble v; + gint cnt, i; + int button; +@@ -9910,7 +9911,13 @@ VteTerminalPrivate::widget_scroll(GdkEventScroll *event) + return; + } + +- v = MAX (1., ceil (gtk_adjustment_get_page_increment (m_vadjustment) / 10.)); ++ if (m_scroll_speed == 0) { ++ scroll_speed = ceil (gtk_adjustment_get_page_increment (m_vadjustment) / 10.); ++ } else { ++ scroll_speed = m_scroll_speed; ++ } ++ ++ v = MAX (1., scroll_speed); + _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() + } + + bool ++VteTerminalPrivate::set_scroll_speed(unsigned int scroll_speed) ++{ ++ if (scroll_speed == m_scroll_speed) ++ return false; ++ ++ m_scroll_speed = scroll_speed; ++ return true; ++} ++ ++bool + VteTerminalPrivate::set_scrollback_lines(long lines) + { + glong low, high, next; diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h -index cb00855f0cf8..7dc616c13fbb 100644 +index f514c3b227f9..89c267555cf9 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 { +@@ -267,6 +267,10 @@ void vte_terminal_set_cursor_shape(VteTerminal *terminal, + _VTE_PUBLIC + VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void (*bell)(VteTerminal* terminal); - -+ void (*notification_received)(VteTerminal* terminal, const gchar *summary, const gchar *body); ++_VTE_PUBLIC ++void vte_terminal_set_scroll_speed(VteTerminal *terminal, ++ guint scroll_speed) _VTE_GNUC_NONNULL(1); + - /* Padding for future expansion. */ - gpointer padding[15]; + /* 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 e394a3690f2e..953b76fe074f 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -464,6 +464,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; ++ case PROP_SCROLL_SPEED: ++ g_value_set_uint (value, impl->m_scroll_speed); ++ break; + case PROP_SCROLLBACK_LINES: + g_value_set_uint (value, impl->m_scrollback_lines); + break; +@@ -550,6 +553,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; ++ case PROP_SCROLL_SPEED: ++ vte_terminal_set_scroll_speed (terminal, g_value_get_uint (value)); ++ break; + 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) + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); + /** ++ * VteTerminal:scroll-speed: ++ * ++ * The number of lines by which the buffer is moved when ++ * scrolling with a mouse wheel on top of the terminal ++ * Setting it to zero will cause the buffer to be moved by an ++ * amount depending on the number of visible rows the widget ++ * can display. ++ */ ++ pspecs[PROP_SCROLL_SPEED] = ++ g_param_spec_uint ("scroll-speed", NULL, NULL, ++ 0, G_MAXUINT, ++ 0, ++ (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); ++ ++ /** + * 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) + } + + /** ++ * vte_terminal_set_scroll_speed: ++ * @terminal: a #VteTerminal ++ * @scroll_speed: move the buffer by this number of lines while scrolling ++ * ++ * Sets the number of lines by which the buffer is moved when ++ * scrolling with a mouse wheel. Setting it to zero will cause the ++ * buffer to be moved by an amount depending on the number of visible ++ * rows the widget can display. ++ */ ++void ++vte_terminal_set_scroll_speed(VteTerminal *terminal, guint scroll_speed) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ GObject *object = G_OBJECT(terminal); ++ g_object_freeze_notify(object); ++ ++ if (IMPL(terminal)->set_scroll_speed(scroll_speed)) ++ g_object_notify_by_pspec(object, pspecs[PROP_SCROLL_SPEED]); ++ ++ g_object_thaw_notify(object); ++} ++ ++/** + * vte_terminal_set_scrollback_lines: + * @terminal: a #VteTerminal + * @lines: the length of the history buffer +diff --git a/src/vtegtk.hh b/src/vtegtk.hh +index f8a83525b18c..98c616f54de6 100644 +--- a/src/vtegtk.hh ++++ b/src/vtegtk.hh +@@ -80,6 +80,7 @@ enum { + PROP_MOUSE_POINTER_AUTOHIDE, + PROP_PTY, + PROP_REWRAP_ON_RESIZE, ++ PROP_SCROLL_SPEED, + PROP_SCROLLBACK_LINES, + PROP_SCROLL_ON_KEYSTROKE, + PROP_SCROLL_ON_OUTPUT, +diff --git a/src/vteinternal.hh b/src/vteinternal.hh +index 5ecb1cbf8e28..cfe39fc92301 100644 +--- a/src/vteinternal.hh ++++ b/src/vteinternal.hh +@@ -402,6 +402,7 @@ public: + 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 */ +@@ -1142,6 +1143,7 @@ public: + bool set_mouse_autohide(bool autohide); + bool set_pty(VtePty *pty); + bool set_rewrap_on_resize(bool rewrap); ++ bool set_scroll_speed(unsigned int scroll_speed); + bool set_scrollback_lines(long lines); + bool set_scroll_on_keystroke(bool scroll); + bool set_scroll_on_output(bool scroll); -- -2.5.0 +2.5.5 + + +From 2ea58047d01a58c9e4f18559dc23cb1ccd76dc48 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 13 May 2016 17:54:57 +0200 +Subject: [PATCH 5/5] vteapp: Add a test for the scroll-speed property + +https://bugzilla.redhat.com/show_bug.cgi?id=1103380 +--- + src/app.vala | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/app.vala b/src/app.vala +index a0a728786b5c..3d0ab8b41513 100644 +--- a/src/app.vala ++++ b/src/app.vala +@@ -357,6 +357,7 @@ class Window : Gtk.ApplicationWindow + terminal.set_rewrap_on_resize(!App.Options.no_rewrap); + terminal.set_scroll_on_output(false); + terminal.set_scroll_on_keystroke(true); ++ terminal.set_scroll_speed(App.Options.scroll_speed); + terminal.set_scrollback_lines(App.Options.scrollback_lines); + + /* Style */ +@@ -872,6 +873,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; +@@ -1063,6 +1065,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", 'n', 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, +-- +2.5.5 diff --git a/vte291.spec b/vte291.spec index e790d49..f20b4ca 100644 --- a/vte291.spec +++ b/vte291.spec @@ -2,7 +2,7 @@ Name: vte291 Version: 0.44.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -10,7 +10,8 @@ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/vte/0.44/vte-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=711059 -Patch100: vte291-command-notify.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1103380 +Patch100: vte291-command-notify-scroll-speed.patch BuildRequires: gettext BuildRequires: pkgconfig(gnutls) @@ -55,7 +56,7 @@ emulator library. %prep %setup -q -n vte-%{version} -%patch100 -p1 -b .command-notify +%patch100 -p1 -b .command-notify-scroll-speed %build CFLAGS="%optflags -fPIE -DPIE -Wno-nonnull" \ @@ -98,6 +99,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_sysconfdir}/profile.d/vte.sh %changelog +* Fri Jul 01 2016 Debarshi Ray - 0.44.2-2 +- Add a property to configure the scroll speed + * Tue May 10 2016 Debarshi Ray - 0.44.2-1 - Update to 0.44.2 - Rebase downstream patches and undo unintentional ABI break