diff --git a/.gitignore b/.gitignore index 878a6c7..3420df5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /vte-0.39.92.tar.xz /vte-0.40.0.tar.xz /vte-0.40.2.tar.xz +/vte-0.41.90.tar.xz diff --git a/0001-widget-Only-show-the-cursor-on-motion-if-moved.patch b/0001-widget-Only-show-the-cursor-on-motion-if-moved.patch index 6195e27..5935eae 100644 --- a/0001-widget-Only-show-the-cursor-on-motion-if-moved.patch +++ b/0001-widget-Only-show-the-cursor-on-motion-if-moved.patch @@ -1,6 +1,6 @@ -From 9077ef68bebee9a22d836a00af72aa02d5628ed4 Mon Sep 17 00:00:00 2001 +From f54c7051b61c0ab935fe64e6a69503ce3430bb9b Mon Sep 17 00:00:00 2001 From: Bastien Nocera -Date: Fri, 16 Nov 2012 16:18:05 +0100 +Date: Mon, 14 Sep 2015 14:22:35 +0200 Subject: [PATCH] widget: Only show the cursor on motion if moved Some devices, like Wacom tablets, will emit mouse motion @@ -13,14 +13,14 @@ mouse cursor to avoid this behaviour. https://bugzilla.gnome.org/show_bug.cgi?id=688456 --- - src/vte.c | 7 +++++-- + src/vte.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/src/vte.c b/src/vte.c -index bbe6cf6..c5922e6 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -7294,8 +7294,11 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event) +diff --git a/src/vte.cc b/src/vte.cc +index 55e57dd3270a..1ec07a945812 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -7321,8 +7321,11 @@ vte_terminal_motion_notify(GtkWidget *widget, GdkEventMotion *event) } else { /* Hilite any matches. */ vte_terminal_match_hilite(terminal, x, y); @@ -35,5 +35,5 @@ index bbe6cf6..c5922e6 100644 switch (event->type) { -- -1.8.0 +2.1.0 diff --git a/sources b/sources index 17eb36b..9dfa449 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a7a6af8eb0ebadaf3338e820a7229a3 vte-0.40.2.tar.xz +e82d00c389068b8da1176f6a38582820 vte-0.41.90.tar.xz diff --git a/vte291-command-notify.patch b/vte291-command-notify.patch index b9ccf8b..70aa402 100644 --- a/vte291-command-notify.patch +++ b/vte291-command-notify.patch @@ -1,4 +1,4 @@ -From c4cc87d1fc82b20190ad1fc491385df8a75db848 Mon Sep 17 00:00:00 2001 +From fec7cd86ca4fe43d64f51af873fa9f81b6c7cf9f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 7 Jan 2015 16:01:00 +0100 Subject: [PATCH 1/3] emulation: Add sequences and signals for desktop @@ -18,19 +18,19 @@ https://phab.enlightenment.org/T1765 https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/caps.c | 4 +++ - src/marshal.list | 1 + - src/vte-private.h | 5 +++ - src/vte.c | 38 +++++++++++++++++++++++ - src/vteseq-n.gperf | 1 + - src/vteseq.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/vteterminal.h | 3 +- + src/caps.cc | 4 +++ + src/marshal.list | 1 + + src/vte.cc | 38 ++++++++++++++++++++++ + src/vte/vteterminal.h | 3 +- + src/vteinternal.hh | 5 +++ + src/vteseq-n.gperf | 1 + + src/vteseq.cc | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 1 deletion(-) -diff --git a/src/caps.c b/src/caps.c -index b51882f..0fe0661 100644 ---- a/src/caps.c -+++ b/src/caps.c +diff --git a/src/caps.cc b/src/caps.cc +index 82078af3f405..e3514eb11f38 100644 +--- a/src/caps.cc ++++ b/src/caps.cc @@ -254,6 +254,8 @@ const char _vte_xterm_capability_strings[] = ENTRY(OSC "117" BEL, "reset-highlight-background-color") ENTRY(OSC "118" BEL, "reset-tek-cursor-color") @@ -50,7 +50,7 @@ index b51882f..0fe0661 100644 COMMENT(/* These may be bogus, I can't find docs for them anywhere (#104154). */) ENTRY(OSC "21;%s" BEL, "set-text-property-21") diff --git a/src/marshal.list b/src/marshal.list -index 0276422..2c35c68 100644 +index 0276422ec6d4..2c35c685930a 100644 --- a/src/marshal.list +++ b/src/marshal.list @@ -1,4 +1,5 @@ @@ -59,27 +59,11 @@ index 0276422..2c35c68 100644 +VOID:STRING,STRING VOID:STRING,UINT VOID:UINT,UINT -diff --git a/src/vte-private.h b/src/vte-private.h -index 43d2266..cbb9402 100644 ---- a/src/vte-private.h -+++ b/src/vte-private.h -@@ -421,6 +421,11 @@ struct _VteTerminalPrivate { - gboolean cursor_moved_pending; - gboolean contents_changed_pending; - -+ /* desktop notification */ -+ gboolean notification_received; -+ gchar *notification_summary; -+ gchar *notification_body; -+ - /* window name changes */ - gchar *window_title; - gchar *window_title_changed; -diff --git a/src/vte.c b/src/vte.c -index d49fccd..8125633 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -8581,6 +8581,9 @@ vte_terminal_finalize(GObject *object) +diff --git a/src/vte.cc b/src/vte.cc +index 5b70bd1bfa77..55e57dd3270a 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -8898,6 +8898,9 @@ vte_terminal_finalize(GObject *object) remove_update_timeout (terminal); @@ -89,7 +73,7 @@ index d49fccd..8125633 100644 /* discard title updates */ g_free(terminal->pvt->window_title); g_free(terminal->pvt->window_title_changed); -@@ -10314,6 +10317,7 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -10630,6 +10633,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->child_exited = NULL; klass->encoding_changed = NULL; klass->char_size_changed = NULL; @@ -97,7 +81,7 @@ index d49fccd..8125633 100644 klass->window_title_changed = NULL; klass->icon_title_changed = NULL; klass->selection_changed = NULL; -@@ -10388,6 +10392,25 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -10704,6 +10708,25 @@ vte_terminal_class_init(VteTerminalClass *klass) 1, G_TYPE_INT); /** @@ -123,7 +107,7 @@ index d49fccd..8125633 100644 * VteTerminal::window-title-changed: * @vteterminal: the object which received the signal * -@@ -12396,6 +12419,16 @@ need_processing (VteTerminal *terminal) +@@ -12720,6 +12743,16 @@ need_processing (VteTerminal *terminal) return _vte_incoming_chunks_length (terminal->pvt->incoming) != 0; } @@ -140,7 +124,7 @@ index d49fccd..8125633 100644 /* Emit an "icon-title-changed" signal. */ static void vte_terminal_emit_icon_title_changed(VteTerminal *terminal) -@@ -12443,6 +12476,11 @@ vte_terminal_emit_pending_signals(VteTerminal *terminal) +@@ -12767,6 +12800,11 @@ vte_terminal_emit_pending_signals(VteTerminal *terminal) vte_terminal_emit_adjustment_changed (terminal); @@ -152,20 +136,57 @@ index d49fccd..8125633 100644 if (terminal->pvt->window_title_changed) { g_free (terminal->pvt->window_title); terminal->pvt->window_title = terminal->pvt->window_title_changed; +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index dbe3ffed81ba..8b21635bea9e 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -78,6 +78,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); +@@ -111,7 +112,7 @@ struct _VteTerminalClass { + void (*bell)(VteTerminal* terminal); + + /* Padding for future expansion. */ +- gpointer padding[16]; ++ gpointer padding[15]; + + VteTerminalClassPrivate *priv; + }; +diff --git a/src/vteinternal.hh b/src/vteinternal.hh +index 4eeeddbc2e1f..b8575d02c99e 100644 +--- a/src/vteinternal.hh ++++ b/src/vteinternal.hh +@@ -367,6 +367,11 @@ public: + gboolean cursor_moved_pending; + gboolean contents_changed_pending; + ++ /* desktop notification */ ++ gboolean notification_received; ++ gchar *notification_summary; ++ gchar *notification_body; ++ + /* window name changes */ + gchar *window_title; + gchar *window_title_changed; diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf -index f28625b..7ee43be 100644 +index ad5b6d99f938..287caa5b5928 100644 --- a/src/vteseq-n.gperf +++ b/src/vteseq-n.gperf -@@ -167,3 +167,4 @@ struct vteseq_n_struct { +@@ -168,3 +168,4 @@ struct vteseq_n_struct { #"reset-mouse-cursor-foreground-color", VTE_SEQUENCE_HANDLER_NULL "set-current-directory-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_directory_uri) "set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri) +"send-notification", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_notification) -diff --git a/src/vteseq.c b/src/vteseq.c -index b2f4b7d..eb34848 100644 ---- a/src/vteseq.c -+++ b/src/vteseq.c -@@ -2221,6 +2221,96 @@ vte_sequence_handler_return_terminal_id (VteTerminal *terminal, GValueArray *par +diff --git a/src/vteseq.cc b/src/vteseq.cc +index ffb00f689a0a..ec9370c7c37d 100644 +--- a/src/vteseq.cc ++++ b/src/vteseq.cc +@@ -2227,6 +2227,96 @@ vte_sequence_handler_return_terminal_id (VteTerminal *terminal, GValueArray *par vte_sequence_handler_send_primary_device_attributes (terminal, params); } @@ -189,7 +210,7 @@ index b2f4b7d..eb34848 100644 + if (G_VALUE_HOLDS_STRING (value)) { + option = g_value_dup_string (value); + } else if (G_VALUE_HOLDS_POINTER (value)) { -+ option = vte_ucs4_to_utf8 (terminal, g_value_get_pointer (value)); ++ option = vte_ucs4_to_utf8 (terminal, (const guchar *)g_value_get_pointer (value)); + } else { + goto out; + } @@ -206,7 +227,7 @@ index b2f4b7d..eb34848 100644 + if (G_VALUE_HOLDS_STRING (value)) { + str = g_value_dup_string (value); + } else if (G_VALUE_HOLDS_POINTER (value)) { -+ str = vte_ucs4_to_utf8 (terminal, g_value_get_pointer (value)); ++ str = vte_ucs4_to_utf8 (terminal, (const guchar *)g_value_get_pointer (value)); + } else { + goto out; + } @@ -237,7 +258,7 @@ index b2f4b7d..eb34848 100644 + if (G_VALUE_HOLDS_STRING (value)) { + str = g_value_dup_string (value); + } else if (G_VALUE_HOLDS_POINTER (value)) { -+ str = vte_ucs4_to_utf8 (terminal, g_value_get_pointer (value)); ++ str = vte_ucs4_to_utf8 (terminal, (const guchar *)g_value_get_pointer (value)); + } else { + goto out; + } @@ -262,32 +283,11 @@ index b2f4b7d..eb34848 100644 /* Send secondary device attributes. */ static void vte_sequence_handler_send_secondary_device_attributes (VteTerminal *terminal, GValueArray *params) -diff --git a/src/vteterminal.h b/src/vteterminal.h -index 08f3b8f..d6ba7e2 100644 ---- a/src/vteterminal.h -+++ b/src/vteterminal.h -@@ -72,6 +72,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); -@@ -105,7 +106,7 @@ struct _VteTerminalClass { - void (*bell)(VteTerminal* terminal); - - /* Padding for future expansion. */ -- gpointer padding[16]; -+ gpointer padding[15]; - - VteTerminalClassPrivate *priv; - }; -- 2.1.0 -From 7decbc150a5f6764c0b1778133247fe542622189 Mon Sep 17 00:00:00 2001 +From 930f9e8252175ed3ca94f12af3d6c271637da947 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 13:09:17 +0100 Subject: [PATCH 2/3] vte.sh: Emit OSC 777 from PROMPT_COMMAND @@ -298,7 +298,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 2d211ca..1c0543b 100644 +index 2d211caa2f17..1c0543bd9d26 100644 --- a/src/vte.sh +++ b/src/vte.sh @@ -50,9 +50,11 @@ __vte_osc7 () { @@ -318,7 +318,7 @@ index 2d211ca..1c0543b 100644 2.1.0 -From f0f281dd333f8639eb6e8ddb40bea9c097483243 Mon Sep 17 00:00:00 2001 +From 2b2ad252df1add231616f5024cdc572ef587771c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 22 Jan 2015 16:37:10 +0100 Subject: [PATCH 3/3] vteapp: Add a test for the notification-received signal @@ -328,7 +328,7 @@ Subject: [PATCH 3/3] vteapp: Add a test for the notification-received signal 1 file changed, 7 insertions(+) diff --git a/src/app.vala b/src/app.vala -index e102e46..cc22480 100644 +index e102e4618d81..cc2248009232 100644 --- a/src/app.vala +++ b/src/app.vala @@ -102,6 +102,8 @@ class Window : Gtk.ApplicationWindow diff --git a/vte291.spec b/vte291.spec index 719c853..5c1e473 100644 --- a/vte291.spec +++ b/vte291.spec @@ -1,8 +1,8 @@ %global apiver 2.91 Name: vte291 -Version: 0.40.2 -Release: 2%{?dist} +Version: 0.41.90 +Release: 1%{?dist} Summary: Terminal emulator library License: LGPLv2+ @@ -102,6 +102,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_sysconfdir}/profile.d/vte.sh %changelog +* Mon Sep 14 2015 Debarshi Ray - 0.41.90-1 +- Update to 0.41.90 +- Rebased downstream patches after the migration to C++ + * Fri Jun 19 2015 Fedora Release Engineering - 0.40.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild