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 new file mode 100644 index 0000000..6195e27 --- /dev/null +++ b/0001-widget-Only-show-the-cursor-on-motion-if-moved.patch @@ -0,0 +1,39 @@ +From 9077ef68bebee9a22d836a00af72aa02d5628ed4 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 16 Nov 2012 16:18:05 +0100 +Subject: [PATCH] widget: Only show the cursor on motion if moved + +Some devices, like Wacom tablets, will emit mouse motion +events even when the mouse doesn't move on the tablet. This +means that the mouse cursor will show up on the screen very shortly +after hiding. + +We now check the motion event against the last location of the +mouse cursor to avoid this behaviour. + +https://bugzilla.gnome.org/show_bug.cgi?id=688456 +--- + src/vte.c | 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) + } else { + /* Hilite any matches. */ + vte_terminal_match_hilite(terminal, x, y); +- /* Show the cursor. */ +- _vte_terminal_set_pointer_visible(terminal, TRUE); ++ /* Show the cursor if we moved. */ ++ if (event->type != GDK_MOTION_NOTIFY || ++ x != terminal->pvt->mouse_last_x || ++ y != terminal->pvt->mouse_last_y) ++ _vte_terminal_set_pointer_visible(terminal, TRUE); + } + + switch (event->type) { +-- +1.8.0 + diff --git a/vte3-make_VteCharAttributes_introspectable.patch b/vte3-make_VteCharAttributes_introspectable.patch new file mode 100644 index 0000000..d06318c --- /dev/null +++ b/vte3-make_VteCharAttributes_introspectable.patch @@ -0,0 +1,34 @@ +From 2ba27999b537300f4beb92ca27830fbd4197740e Mon Sep 17 00:00:00 2001 +From: Simon Schampijer +Date: Wed, 28 Nov 2012 20:14:59 +0000 +Subject: Move definition of VteCharAttributes up, #676999 + +I found the element-type for the attributes in vte_terminal_get_text +vte_terminal_get_text_include_trailing_spaces and vte_terminal_get_text_range +strange to be of type "Vte.CharAttributes" and not VteCharAttributes but when I +changed it I only got a warning. Then I saw that there was already a warning +about "Unknown namespace for identifier 'vte_char_attributes'", so I moved the +definition of VteCharAttributes and now those functions are introspectable. +--- +diff --git a/src/vte.h b/src/vte.h +index ed3fafe..35fb0f4 100644 +--- a/src/vte.h ++++ b/src/vte.h +@@ -57,6 +57,7 @@ typedef struct _VteTerminal VteTerminal; + typedef struct _VteTerminalPrivate VteTerminalPrivate; + typedef struct _VteTerminalClass VteTerminalClass; + typedef struct _VteTerminalClassPrivate VteTerminalClassPrivate; ++typedef struct _VteCharAttributes VteCharAttributes; + + /** + * VteTerminal: +@@ -242,7 +243,6 @@ struct _VteCharAttributes { + GdkColor fore, back; + guint underline:1, strikethrough:1; + }; +-typedef struct _VteCharAttributes VteCharAttributes; + + /* The name of the same structure in the 0.10 series, for API compatibility. */ + struct vte_char_attributes { +-- +cgit v0.9.0.2 diff --git a/vte3.spec b/vte3.spec index 589d218..ef749e3 100644 --- a/vte3.spec +++ b/vte3.spec @@ -1,6 +1,6 @@ Name: vte3 Version: 0.34.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A terminal emulator License: LGPLv2+ Group: User Interface/X @@ -9,6 +9,10 @@ Source: http://download.gnome.org/sources/vte/0.34/vte-%{version}.tar.xz Patch0: honey-I-shrank-the-terminal.patch # https://bugzilla.gnome.org/show_bug.cgi?id=663779 Patch1: vte-alt-meta-confusion.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=688456 +Patch2: 0001-widget-Only-show-the-cursor-on-motion-if-moved.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=676999 +Patch3: vte3-make_VteCharAttributes_introspectable.patch BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: ncurses-devel @@ -40,6 +44,8 @@ vte. %setup -q -n vte-%{version} %patch0 -p1 -b .grow-up %patch1 -p1 -b .alt-meta +%patch2 -p1 -b .motion +%patch3 -p1 -b .VteCharAttributes_introspectable %build %configure \ @@ -84,6 +90,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Thu Nov 29 2012 Peter Robinson 0.34.2-3 +- Add patch to fix an introspection issue. Fixes RHBZ #881662 + +* Fri Nov 16 2012 Bastien Nocera 0.34.2-2 +- Only show the cursor on motion if moved + * Tue Nov 13 2012 Kalev Lember - 0.34.2-1 - Update to 0.34.2