Added patch from #52951 for shift-(up,down) single line scrolling.

5 files changed, 112 insertions, 9 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index a979394964ae..deb4ddfb3b8a 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.49 2004/11/01 19:43:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.50 2004/11/06 10:18:35 obz Exp $
+
+*vte-0.11.11-r2 (07 Nov 2004)
+
+  07 Nov 2004; Mike Gardiner <obz@gentoo.org> +files/vte-line-scroll.patch,
+  +vte-0.11.11-r2.ebuild:
+  Added patch from #52951 for shift-(up,down) single line scrolling
 
   01 Nov 2004; Markus Rothe <corsair@gentoo.org>
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index eae076d3d2f4..4ec353a79b92 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,14 +1,18 @@
-MD5 145bd93178b152b98a0b6d0d093d0cae ChangeLog 5596
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 30b37a1004de92e55daeeba93a3be13b vte-0.10.29.ebuild 843
-MD5 5ed810e7aee45c5bed662b2ef762dc10 vte-0.11.10-r1.ebuild 971
 MD5 97babfc8b56c4ee41095a8ef269375e5 vte-0.11.10.ebuild 699
-MD5 e8b4fb83554bb9c15caefdf67d9b1865 vte-0.11.11-r1.ebuild 795
+MD5 5ed810e7aee45c5bed662b2ef762dc10 vte-0.11.10-r1.ebuild 971
+MD5 30b37a1004de92e55daeeba93a3be13b vte-0.10.29.ebuild 843
+MD5 6c43a5318a478fd7cfa9f3d179d06ec0 vte-0.11.11-r2.ebuild 794
+MD5 66209d8cd101048b5e88fb862d84d19f .vte-0.11.11-r2.ebuild.swp 12288
 MD5 4da252236fee0bc3858646772a02d107 vte-0.11.11.ebuild 680
-MD5 be623776239aa85bd3c86ba840b71c45 files/digest-vte-0.10.29 64
-MD5 bae7fb7cbc1656fb42249c1aefc806cb files/digest-vte-0.11.10 64
+MD5 e8b4fb83554bb9c15caefdf67d9b1865 vte-0.11.11-r1.ebuild 795
+MD5 145bd93178b152b98a0b6d0d093d0cae ChangeLog 5596
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
 MD5 bae7fb7cbc1656fb42249c1aefc806cb files/digest-vte-0.11.10-r1 64
-MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11 64
 MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11-r1 64
+MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11-r2 64
 MD5 553e8d9e7925f1daa0245c9e92c7f72b files/vte-0.11.10-bg_fix.patch 3428
 MD5 38c957d83d560c18819204fe28c3c1ae files/vte-0.11.11-spaces.patch 15370
+MD5 be623776239aa85bd3c86ba840b71c45 files/digest-vte-0.10.29 64
+MD5 bae7fb7cbc1656fb42249c1aefc806cb files/digest-vte-0.11.10 64
+MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11 64
diff --git a/x11-libs/vte/files/digest-vte-0.11.11-r2 b/x11-libs/vte/files/digest-vte-0.11.11-r2
new file mode 100644
index 000000000000..d80d9702c408
--- /dev/null
+++ b/x11-libs/vte/files/digest-vte-0.11.11-r2
@@ -0,0 +1 @@
+MD5 4d7a3674df5b8be7f1adffa981c1fc3d vte-0.11.11.tar.bz2 888405
diff --git a/x11-libs/vte/files/vte-line-scroll.patch b/x11-libs/vte/files/vte-line-scroll.patch
new file mode 100644
index 000000000000..ad5f878530f7
--- /dev/null
+++ b/x11-libs/vte/files/vte-line-scroll.patch
@@ -0,0 +1,57 @@
+--- vte.c.ORG	2004-03-06 10:28:09.000000000 -0800
++++ vte.c	2004-03-06 10:44:23.000000000 -0800
+@@ -1917,4 +1917,31 @@
+ }
+ 
++/* Scroll up or down in the current screen. */
++static void
++vte_terminal_scroll_lines(VteTerminal *terminal, gint lines)
++{
++        glong destination;
++        g_return_if_fail(VTE_IS_TERMINAL(terminal));
++#ifdef VTE_DEBUG
++        if (_vte_debug_on(VTE_DEBUG_IO)) {
++                fprintf(stderr, "Scrolling %d lines.\n", lines);
++        }
++#endif
++        /* Calculate the ideal position where we want to be before clamping. */
++        destination = floor(gtk_adjustment_get_value(terminal->adjustment));
++        destination += lines;
++        /* Can't scroll past data we have. */
++        destination = CLAMP(destination,
++                            terminal->adjustment->lower,
++                            terminal->adjustment->upper - terminal->row_count);
++        /* Tell the scrollbar to adjust itself. */
++        gtk_adjustment_set_value(terminal->adjustment, destination);
++        /* Clear dingus match set. */
++        vte_terminal_match_contents_clear(terminal);
++        /* Notify viewers that the contents have changed. */
++        vte_terminal_emit_contents_changed(terminal);
++}
++
++
+ /* Scroll so that the scroll delta is the minimum value. */
+ static void
+@@ -8038,4 +8065,22 @@
+ 			}
+ 			break;
++		case GDK_KP_Up:
++                case GDK_Up:
++                        if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
++                                vte_terminal_scroll_lines(terminal, -1);
++                                scrolled = TRUE;
++                                handled = TRUE;
++                                suppress_meta_esc = TRUE;
++                        }
++                        break;
++                case GDK_KP_Down:
++                case GDK_Down:
++                        if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
++                                vte_terminal_scroll_lines(terminal, 1);
++                                scrolled = TRUE;
++                                handled = TRUE;
++                                suppress_meta_esc = TRUE;
++                        }
++                        break;
+ 		case GDK_KP_Home:
+ 		case GDK_Home:
diff --git a/x11-libs/vte/vte-0.11.11-r2.ebuild b/x11-libs/vte/vte-0.11.11-r2.ebuild
new file mode 100644
index 000000000000..96108ebbeb87
--- /dev/null
+++ b/x11-libs/vte/vte-0.11.11-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.11-r2.ebuild,v 1.1 2004/11/06 10:18:35 obz Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc python"
+
+DESCRIPTION="Xft powered terminal widget"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+LICENSE="LGPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=x11-libs/pango-1.2
+	python? ( >=dev-python/pygtk-2
+		>=dev-lang/python-2.2 )"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-0.6 )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS COPY* README HACKING INSTALL NEWS TODO ChangeLog"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-spaces.patch
+	# Apply the, shift-<up,down> scroll one
+	# line at a time patch.
+	epatch ${FILESDIR}/${PN}-line-scroll.patch
+}