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

2 files changed, 113 insertions, 0 deletions

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,