Added patch that corrects background rendering problems. Closes bug #31830.

10 files changed, 177 insertions, 17 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 5f15c1540c01..86fcbd6694fb 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.35 2004/03/17 00:54:40 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.36 2004/04/20 14:49:38 leonardop Exp $
+
+*vte-0.11.10-r1 (20 Apr 2004)
+
+  20 Apr 2003; L. Boshell <leonardop@gentoo.org> vte-0.11.10-r1.ebuild,
+  files/vte-0.11.10-bg_fix.patch:
+  Added patch that resolves some inefficiency problems that caused
+  gnome-terminal to slow down dramatically under certain circumstances.
+  Closes bug #31830.
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> vte-0.11.10.ebuild:
   Added ~mips keyword.
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index dbe95cd7444b..45495853057f 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,14 +1,17 @@
-MD5 09f83d127918b39ca575be4cac416b0f vte-0.11.10.ebuild 706
-MD5 b42298ba630736f054c8ce33c27d6982 vte-0.10.27.ebuild 719
-MD5 730085b496f7cce8578c58039e0ba57a vte-0.10.29.ebuild 855
+MD5 8479b80a5bcc00e4de04451e796caa4c ChangeLog 4071
 MD5 51da691a6358d91385cd4cae05f64147 vte-0.10.26.ebuild 706
+MD5 b42298ba630736f054c8ce33c27d6982 vte-0.10.27.ebuild 719
 MD5 7d7a6debe5dfaf65721a169c3bff4607 vte-0.10.28.ebuild 860
-MD5 4e22053e033b0faa1ebd9b0151fadc1e ChangeLog 3773
-MD5 b36e3572bec873af4a2e460c28ce1710 vte-0.10.25.ebuild 704
+MD5 730085b496f7cce8578c58039e0ba57a vte-0.10.29.ebuild 855
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 163db14af61815ea6d3014d916402afa files/digest-vte-0.10.25 64
+MD5 09f83d127918b39ca575be4cac416b0f vte-0.11.10.ebuild 706
+MD5 26ab73b1ff76e1bd2cc723867b306f64 vte-0.11.10-r1.ebuild 980
+MD5 b36e3572bec873af4a2e460c28ce1710 vte-0.10.25.ebuild 704
 MD5 9ec35890659e969bf8bc097208cfc210 files/digest-vte-0.10.26 64
 MD5 9fb16c649cecfe6b194ff487ff112c40 files/digest-vte-0.10.27 64
 MD5 7fd6e432e5d911d5469eed45360aec6c files/digest-vte-0.10.28 64
 MD5 be623776239aa85bd3c86ba840b71c45 files/digest-vte-0.10.29 64
 MD5 bae7fb7cbc1656fb42249c1aefc806cb files/digest-vte-0.11.10 64
+MD5 32a4aec3dc501fcb17dc6f3f53087ac4 files/vte-0.11.10-bg_fix.patch 3407
+MD5 bae7fb7cbc1656fb42249c1aefc806cb files/digest-vte-0.11.10-r1 64
+MD5 163db14af61815ea6d3014d916402afa files/digest-vte-0.10.25 64
diff --git a/x11-libs/vte/files/digest-vte-0.11.10-r1 b/x11-libs/vte/files/digest-vte-0.11.10-r1
new file mode 100644
index 000000000000..c608db0e8904
--- /dev/null
+++ b/x11-libs/vte/files/digest-vte-0.11.10-r1
@@ -0,0 +1 @@
+MD5 71facdedd477749908402a6931d36e64 vte-0.11.10.tar.bz2 855466
diff --git a/x11-libs/vte/files/vte-0.11.10-bg_fix.patch b/x11-libs/vte/files/vte-0.11.10-bg_fix.patch
new file mode 100644
index 000000000000..b8edc1472191
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.11.10-bg_fix.patch
@@ -0,0 +1,112 @@
+diff -NurdB vte-0.11.10-orig/src/vtebg.c vte-0.11.10/src/vtebg.c
+--- vte-0.11.10-orig/src/vtebg.c	2004-04-20 09:07:01.000000000 -0500
++++ vte-0.11.10/src/vtebg.c	2004-04-20 09:09:42.000000000 -0500
+@@ -18,6 +18,7 @@
+ 
+ #ident "$Id: vte-0.11.10-bg_fix.patch,v 1.1 2004/04/20 14:49:38 leonardop Exp $"
+ #include "../config.h"
++#include <stdio.h>
+ #include <string.h>
+ #include <gtk/gtk.h>
+ #include "debug.h"
+@@ -39,6 +40,8 @@
+ static VteBg *singleton_bg = NULL;
+ static void vte_bg_set_root_pixmap(VteBg *bg, GdkPixmap *pixmap);
+ static void vte_bg_init(VteBg *bg, gpointer *klass);
++static GdkPixbuf *_vte_bg_resize_pixbuf(GdkPixbuf *pixbuf,
++					gint min_width, gint min_height);
+ 
+ static const char *
+ vte_bg_source_name(enum VteBgSourceType type)
+@@ -130,6 +133,16 @@
+ #else
+ 			pixmap = gdk_pixmap_foreign_new(pixmaps[0]);
+ #endif
++#ifdef VTE_DEBUG
++			if (_vte_debug_on(VTE_DEBUG_MISC) ||
++			    _vte_debug_on(VTE_DEBUG_EVENTS)) {
++				gint pwidth, pheight;
++				gdk_drawable_get_size(pixmap,
++						      &pwidth, &pheight);
++				fprintf(stderr, "New background image %dx%d\n",
++					pwidth, pheight);
++			}
++#endif
+ 		}
+ 		if (pixmaps != NULL) {
+ 			g_free(pixmaps);
+@@ -366,6 +379,62 @@
+ 	vte_bg_cache_prune_int(bg, FALSE);
+ }
+ 
++/**
++ * _vte_bg_resize_pixbuf:
++ * @pixmap: a #GdkPixbuf, or NULL
++ * @min_width: the requested minimum_width
++ * @min_height: the requested minimum_height
++ *
++ * The background pixbuf may be tiled, and if it is tiled, it may be very, very
++ * small.  This function creates a pixbuf consisting of the passed-in pixbuf
++ * tiled to a usable size.
++ *
++ * Returns: a new #GdkPixbuf, unrefs @pixbuf.
++ */
++static GdkPixbuf *
++_vte_bg_resize_pixbuf(GdkPixbuf *pixbuf, gint min_width, gint min_height)
++{
++	GdkPixbuf *tmp;
++	gint src_width, src_height;
++	gint dst_width, dst_height;
++	gint x, y;
++
++	if (!GDK_IS_PIXBUF(pixbuf)) {
++		return pixbuf;
++	}
++
++	src_width = gdk_pixbuf_get_width(pixbuf);
++	src_height = gdk_pixbuf_get_height(pixbuf);
++	dst_width = (((min_width - 1) / src_width) + 1) * src_width;
++	dst_height = (((min_height - 1) / src_height) + 1) * src_height;
++	if ((dst_width == src_width) && (dst_height == src_height)) {
++		return pixbuf;
++	}
++
++#ifdef VTE_DEBUG
++	if (_vte_debug_on(VTE_DEBUG_MISC) || _vte_debug_on(VTE_DEBUG_EVENTS)) {
++		fprintf(stderr, "Resizing (root?) pixbuf from %dx%d to %dx%d\n",
++			src_width, src_height, dst_width, dst_height);
++	}
++#endif
++
++	tmp = gdk_pixbuf_new(gdk_pixbuf_get_colorspace(pixbuf),
++			     gdk_pixbuf_get_has_alpha(pixbuf),
++			     gdk_pixbuf_get_bits_per_sample(pixbuf),
++			     dst_width, dst_height);
++	for (y = 0; y < dst_height; y += src_height) {
++		for (x = 0; x < dst_width; x += src_width) {
++			gdk_pixbuf_copy_area(pixbuf,
++					     0, 0, src_width, src_height,
++					     tmp,
++					     x, y);
++		}
++	}
++
++	g_object_unref(G_OBJECT(pixbuf));
++	return tmp;
++}
++
+ static void
+ vte_bg_set_root_pixmap(VteBg *bg, GdkPixmap *pixmap)
+ {
+@@ -598,6 +667,11 @@
+ 	pixmap = NULL;
+ 	mask = NULL;
+ 	if (GDK_IS_PIXBUF(pixbuf)) {
++		/* If the image is smaller than 256x256 then tile it into a
++		 * pixbuf that is at least this large.  This is done because
++		 * tiling a 1x1 pixmap onto the screen using thousands of calls
++		 * to XCopyArea is very slow. */
++		pixbuf = _vte_bg_resize_pixbuf(pixbuf, 256, 256);
+ 		gdk_pixbuf_render_pixmap_and_mask_for_colormap(pixbuf,
+ 							       colormap,
+ 							       &pixmap, &mask,
diff --git a/x11-libs/vte/vte-0.10.25.ebuild b/x11-libs/vte/vte-0.10.25.ebuild
index 6c9c1cc9922a..eafc39899b95 100644
--- a/x11-libs/vte/vte-0.10.25.ebuild
+++ b/x11-libs/vte/vte-0.10.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.25.ebuild,v 1.4 2003/03/04 01:07:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.25.ebuild,v 1.5 2004/04/20 14:49:38 leonardop Exp $
 
 inherit gnome2 flag-o-matic
 
diff --git a/x11-libs/vte/vte-0.10.26.ebuild b/x11-libs/vte/vte-0.10.26.ebuild
index 37d44810f3e7..a4bdb8fcd9e6 100644
--- a/x11-libs/vte/vte-0.10.26.ebuild
+++ b/x11-libs/vte/vte-0.10.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.26.ebuild,v 1.3 2003/04/29 15:00:01 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.26.ebuild,v 1.4 2004/04/20 14:49:38 leonardop Exp $
 
 inherit gnome2 flag-o-matic
 
diff --git a/x11-libs/vte/vte-0.10.27.ebuild b/x11-libs/vte/vte-0.10.27.ebuild
index a63147ff2ec1..fc3552a9d3d0 100644
--- a/x11-libs/vte/vte-0.10.27.ebuild
+++ b/x11-libs/vte/vte-0.10.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.27.ebuild,v 1.4 2003/07/19 23:36:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.27.ebuild,v 1.5 2004/04/20 14:49:38 leonardop Exp $
 
 inherit gnome2 flag-o-matic
 
diff --git a/x11-libs/vte/vte-0.10.28.ebuild b/x11-libs/vte/vte-0.10.28.ebuild
index face2aa13bc6..b35c95e91f9c 100644
--- a/x11-libs/vte/vte-0.10.28.ebuild
+++ b/x11-libs/vte/vte-0.10.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.28.ebuild,v 1.3 2003/07/19 23:36:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.28.ebuild,v 1.4 2004/04/20 14:49:38 leonardop Exp $
 
 inherit gnome2 flag-o-matic
 
diff --git a/x11-libs/vte/vte-0.10.29.ebuild b/x11-libs/vte/vte-0.10.29.ebuild
index 8daeb1264d97..c1413b6e1b2a 100644
--- a/x11-libs/vte/vte-0.10.29.ebuild
+++ b/x11-libs/vte/vte-0.10.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.29.ebuild,v 1.5 2003/09/23 16:13:11 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.10.29.ebuild,v 1.6 2004/04/20 14:49:38 leonardop Exp $
 
 inherit gnome2 flag-o-matic
 
diff --git a/x11-libs/vte/vte-0.11.10-r1.ebuild b/x11-libs/vte/vte-0.11.10-r1.ebuild
new file mode 100644
index 000000000000..fbb09bfccb1e
--- /dev/null
+++ b/x11-libs/vte/vte-0.11.10-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.10-r1.ebuild,v 1.1 2004/04/20 14:49:38 leonardop Exp $
+
+inherit eutils flag-o-matic gnome2
+
+IUSE="doc python"
+
+DESCRIPTION="Xft powered terminal widget"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+LICENSE="LGPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=x11-libs/pango-1.2
+	python? ( >=dev-python/pygtk-1.99
+		>=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}
+
+	# Avoid inefficiencies when the background is a small pixmap, as
+	# is the case when the background of a Gnome desktop is set to "No
+	# Picture" and "Solid Color". See bug #31830.
+	epatch ${FILESDIR}/${P}-bg_fix.patch
+}