Attachment 62499 Details for Bug 135448

[patch] Patch that went into HEAD to fix image backgrounds

gnome-panel-image-background-HEAD.diff (text/plain), 8.55 KB, created by Federico Mena Quintero on 2006-01-09 20:41:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Federico Mena Quintero

Created: 2006-01-09 20:41:19 UTC

Size: 8.55 KB

patch

obsolete

>Index: gnome-panel/ChangeLog
>===================================================================
>RCS file: /cvs/gnome/gnome-panel/gnome-panel/ChangeLog,v
>retrieving revision 1.2718
>retrieving revision 1.2720
>diff -u -p -r1.2718 -r1.2720
>--- gnome-panel/ChangeLog	2 Jan 2006 21:07:16 -0000	1.2718
>+++ gnome-panel/ChangeLog	9 Jan 2006 19:58:59 -0000	1.2720
>@@ -1,3 +1,22 @@
>+2006-01-09  Vincent Untz  <vuntz@gnome.org>
>+
>+	* panel-background.c: (panel_background_prepare): notify for change
>+	here instead of... (since we want to notify for change when the size
>+	of panel changes, eg)
>+	(panel_background_composite): here
>+	(panel_background_set_image_background_on_widget): rewrite with cairo
>+	goodness so that we correctly handle tiles
>+	Fix part of bug #164349.
>+	* panel-menu-bar.c: (panel_menu_bar_setup_tooltip): add a FIXME
>+
>+2006-01-06  William Jon McCann  <mccann@jhu.edu>
>+
>+	* panel-util.c (panel_lock_screen_action_get_command): 
>+	* panel-action-button.c (panel_action_lock_setup_menu):
>+	Remove the screensaver exit and restart commands.  I think
>+	that was for restarting xscreensaver to activate new prefs.
>+	Fixes bug #326059
>+
> ==================== 2.13.4 ====================
> 
> 2006-01-01  Vincent Untz  <vuntz@gnome.org>
>Index: gnome-panel/panel-background.c
>===================================================================
>RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-background.c,v
>retrieving revision 1.24
>retrieving revision 1.25
>diff -u -p -r1.24 -r1.25
>--- gnome-panel/panel-background.c	29 Dec 2005 18:08:59 -0000	1.24
>+++ gnome-panel/panel-background.c	9 Jan 2006 19:58:59 -0000	1.25
>@@ -28,6 +28,8 @@
> 
> #include <string.h>
> #include <gdk/gdkx.h>
>+#include <cairo.h>
>+#include <cairo-xlib.h> //FIXME should be removed when gdk_cairo_set_source_pixmap() is available (GTK+ 2.10)
> 
> #include "panel-background-monitor.h"
> #include "panel-gdk-pixbuf-extensions.h"
>@@ -146,6 +148,8 @@ panel_background_prepare (PanelBackgroun
> 
> 	background->prepared = TRUE;
> 
>+	background->notify_changed (background, background->user_data);
>+
> 	return TRUE;
> }
> 
>@@ -326,8 +330,6 @@ panel_background_composite (PanelBackgro
> 
> 	panel_background_prepare (background);
> 
>-	background->notify_changed (background, background->user_data);
>-
> 	return TRUE;
> }
> 
>@@ -477,7 +479,7 @@ panel_background_transform (PanelBackgro
> 
> 	free_transformed_resources (background);
> 
>-	if (background->type == PANEL_BACK_IMAGE) 
>+	if (background->type == PANEL_BACK_IMAGE)
> 		background->transformed_image =
> 			get_scaled_and_rotated_pixbuf (background);
> 
>@@ -1050,33 +1052,49 @@ static void
> panel_background_set_image_background_on_widget (PanelBackground *background,
> 						 GtkWidget       *widget)
> {
>-	const GdkPixmap  *bg_pixmap;
>-	GdkPixmap        *pixmap;
>+	const GdkPixmap *bg_pixmap;
>+	GdkPixmap       *pixmap;
>+	int              width;
>+	int              height;
>+	cairo_t         *cr;
>+	cairo_surface_t *surface;
>+	cairo_pattern_t *pattern;
>+	cairo_matrix_t   matrix;
> 	GtkStyle         *style;
>-	GdkGC            *gc;
> 
> 	bg_pixmap = panel_background_get_pixmap (background);
> 	if (!bg_pixmap)
> 		return;
> 
>-	gc = gdk_gc_new (widget->window);
>-	g_return_if_fail (GDK_IS_GC (gc));
>+	gdk_drawable_get_size (GDK_DRAWABLE (bg_pixmap), &width, &height);
>+
>+	//FIXME gdk_cairo_set_source_pixmap() should do the trick (GTK+ 2.10)
>+	surface = cairo_xlib_surface_create (gdk_x11_drawable_get_xdisplay (widget->window),
>+ 					     gdk_x11_drawable_get_xid (GDK_DRAWABLE (bg_pixmap)),
>+					     gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (widget->window)),
>+					     width, height);
>+
>+	pattern = cairo_pattern_create_for_surface (surface);
>+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
>+	cairo_matrix_init_translate (&matrix,
>+				     widget->allocation.x,
>+				     widget->allocation.y);
>+	cairo_pattern_set_matrix (pattern, &matrix);
> 
> 	pixmap = gdk_pixmap_new (widget->window,
> 				 widget->allocation.width,
> 				 widget->allocation.height,
> 				 -1);
> 
>-	gdk_draw_drawable (GDK_DRAWABLE (pixmap),
>-			   gc, 
>-			   GDK_DRAWABLE (bg_pixmap),
>-			   widget->allocation.x,
>-			   widget->allocation.y,
>-			   0, 0,
>-			   widget->allocation.width,
>-			   widget->allocation.height);
>-
>-	g_object_unref (gc);
>+	cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
>+	cairo_set_source (cr, pattern);
>+	cairo_rectangle (cr, 0, 0,
>+			 widget->allocation.width, widget->allocation.height);
>+	cairo_fill (cr);
>+
>+	cairo_pattern_destroy (pattern);
>+	cairo_surface_destroy (surface);
>+	cairo_destroy (cr);
> 
> 	style = gtk_style_copy (widget->style);
> 	if (style->bg_pixmap[GTK_STATE_NORMAL])
>Index: libpanel-applet/ChangeLog
>===================================================================
>RCS file: /cvs/gnome/gnome-panel/libpanel-applet/ChangeLog,v
>retrieving revision 1.178
>retrieving revision 1.179
>diff -u -p -r1.178 -r1.179
>--- libpanel-applet/ChangeLog	2 Jan 2006 21:07:17 -0000	1.178
>+++ libpanel-applet/ChangeLog	9 Jan 2006 20:00:29 -0000	1.179
>@@ -1,3 +1,10 @@
>+2006-01-09  Vincent Untz  <vuntz@gnome.org>
>+
>+	* panel-applet.c: (panel_applet_get_pixmap): rewrite with cairo
>+	goodness so that we correctly handle tiles. Also, grab the display to
>+	avoid crashes with xid that are being removed.
>+	Fix part of bug #164349.
>+
> ==================== 2.13.4 ====================
> 
> 2005-12-30  Vincent Untz  <vuntz@gnome.org>
>Index: libpanel-applet/panel-applet.c
>===================================================================
>RCS file: /cvs/gnome/gnome-panel/libpanel-applet/panel-applet.c,v
>retrieving revision 1.100
>retrieving revision 1.101
>diff -u -p -r1.100 -r1.101
>--- libpanel-applet/panel-applet.c	29 Dec 2005 18:45:27 -0000	1.100
>+++ libpanel-applet/panel-applet.c	9 Jan 2006 20:00:29 -0000	1.101
>@@ -29,6 +29,8 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <string.h>
>+#include <cairo.h>
>+#include <cairo-xlib.h> //FIXME should be removed when gdk_cairo_set_source_pixmap() is available (GTK+ 2.10)
> #include <gdk/gdk.h>
> #include <gdk/gdkx.h>
> #include <gdk/gdkkeysyms.h>
>@@ -942,49 +944,74 @@ panel_applet_get_pixmap (PanelApplet    
> 			 int              x,
> 			 int              y)
> {
>-	GdkPixmap  *pixmap;
>-	GdkDisplay *display;
>-	GdkPixmap  *retval;
>-	GdkGC      *gc;
>-	int         width;
>-	int         height;
>+	gboolean         display_grabbed;
>+	GdkPixmap       *pixmap;
>+	GdkDisplay      *display;
>+	GdkPixmap       *retval;
>+	int              width;
>+	int              height;
>+	cairo_t         *cr;
>+	cairo_surface_t *surface;
>+	cairo_pattern_t *pattern;
>+	cairo_matrix_t   matrix;
> 
> 	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
> 
> 	if (!GTK_WIDGET_REALIZED (applet))
> 		return NULL;
> 
>-	gc = gdk_gc_new (GDK_DRAWABLE (GTK_WIDGET (applet)->window));
>-
>-	g_return_val_if_fail (GDK_IS_GC (gc), NULL);
>-
> 	display = gdk_display_get_default ();
>-	
>+	display_grabbed = FALSE;
>+
> 	pixmap = gdk_pixmap_lookup_for_display (display, xid);
> 	if (pixmap)
> 		g_object_ref (pixmap);
>-	else
>+	else {
>+		display_grabbed = TRUE;
>+		gdk_x11_display_grab (display);
> 		pixmap = gdk_pixmap_foreign_new_for_display (display, xid);
>+	}
> 
> 	/* This can happen if the user changes the background very fast.
> 	 * We'll get the next update, so it's not a big deal. */
>-	if (pixmap == NULL)
>+	if (pixmap == NULL) {
>+		if (display_grabbed)
>+			gdk_x11_display_ungrab (display);
> 		return NULL;
>+	}
>+
>+	gdk_drawable_get_size (GDK_DRAWABLE (pixmap), &width, &height);
>+
>+	//FIXME gdk_cairo_set_source_pixmap() should do the trick (GTK+ 2.10)
>+	surface = cairo_xlib_surface_create (GDK_DISPLAY_XDISPLAY (display),
>+ 					     //xid,
>+					     gdk_x11_drawable_get_xid (GDK_DRAWABLE (pixmap)),
>+					     gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (GTK_WIDGET (applet)->window)),
>+					     width, height);
>+
>+	pattern = cairo_pattern_create_for_surface (surface);
>+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
>+	cairo_matrix_init_translate (&matrix, x, y);
>+	cairo_pattern_set_matrix (pattern, &matrix);
> 
> 	gdk_drawable_get_size (GDK_DRAWABLE (GTK_WIDGET (applet)->window),
> 			       &width, &height);
>+	retval = gdk_pixmap_new (GTK_WIDGET (applet)->window,
>+				 width, height, -1);
> 
>-	retval = gdk_pixmap_new (GTK_WIDGET (applet)->window, width, height, -1);
>+	cr = gdk_cairo_create (GDK_DRAWABLE (retval));
>+	cairo_set_source (cr, pattern);
>+	cairo_rectangle (cr, 0, 0, width, height);
>+	cairo_fill (cr);
>+
>+	cairo_pattern_destroy (pattern);
>+	cairo_surface_destroy (surface);
>+	cairo_destroy (cr);
> 
>-	gdk_draw_drawable (GDK_DRAWABLE (retval),
>-			   gc, 
>-			   GDK_DRAWABLE (pixmap),
>-			   x, y,
>-			   0, 0,
>-			   width, height);
>-
>-	g_object_unref (gc);
> 	g_object_unref (pixmap);
>+
>+	if (display_grabbed)
>+		gdk_x11_display_ungrab (display);
> 
> 	return retval;
> }

Actions: View | Diff

Attachments on bug 135448: 62499