diff -up gnome-desktop-2.18.3/configure.in.gnome-bg gnome-desktop-2.18.3/configure.in
--- gnome-desktop-2.18.3/configure.in.gnome-bg 2007-07-02 13:22:43.000000000 -0400
+++ gnome-desktop-2.18.3/configure.in 2007-10-23 11:08:40.000000000 -0400
@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
AC_SUBST(GNOME_DISTRIBUTOR)
AC_SUBST(GNOME_DATE)
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+#GNOME_COMMON_INIT
+#GNOME_DEBUG_CHECK
+#GNOME_COMPILE_WARNINGS([maximum])
+#GNOME_MAINTAINER_MODE_DEFINES
# As a special favour for vuntz, support --disable-deprecations
diff -up /dev/null gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/gnome-bg.h
--- /dev/null 2007-11-13 12:35:54.536025751 -0500
+++ gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/gnome-bg.h 2007-10-23 11:08:40.000000000 -0400
@@ -0,0 +1,99 @@
+/* gnome-bg.h -
+
+ Copyright 2007, Red Hat, Inc.
+
+ This file is part of the Gnome Library.
+
+ The Gnome Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The Gnome Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the Gnome Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ Author: Soren Sandmann <sandmann@redhat.com>
+*/
+
+#ifndef __GNOME_BG_H__
+#define __GNOME_BG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <libgnomeui/libgnomeui.h>
+#include <gdk/gdk.h>
+
+#define GNOME_TYPE_BG (gnome_bg_get_type ())
+#define GNOME_BG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_BG, GnomeBG))
+#define GNOME_BG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_BG, GnomeBGClass))
+#define GNOME_IS_BG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_BG))
+#define GNOME_IS_BG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_BG))
+#define GNOME_BG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_BG, GnomeBGClass))
+
+typedef struct _GnomeBG GnomeBG;
+typedef struct _GnomeBGClass GnomeBGClass;
+
+typedef enum {
+ GNOME_BG_COLOR_SOLID,
+ GNOME_BG_COLOR_H_GRADIENT,
+ GNOME_BG_COLOR_V_GRADIENT
+} GnomeBGColorType;
+
+typedef enum {
+ GNOME_BG_PLACEMENT_TILED,
+ GNOME_BG_PLACEMENT_ZOOMED,
+ GNOME_BG_PLACEMENT_CENTERED,
+ GNOME_BG_PLACEMENT_SCALED,
+ GNOME_BG_PLACEMENT_FILL_SCREEN
+} GnomeBGPlacement;
+
+GType gnome_bg_get_type (void);
+GnomeBG * gnome_bg_new (void);
+void gnome_bg_free (GnomeBG *img);
+void gnome_bg_set_placement (GnomeBG *img,
+ GnomeBGPlacement placement);
+void gnome_bg_set_color (GnomeBG *img,
+ GnomeBGColorType type,
+ GdkColor *c1,
+ GdkColor *c2);
+void gnome_bg_set_uri (GnomeBG *img,
+ const char *uri);
+void gnome_bg_draw (GnomeBG *img,
+ GdkPixbuf *dest);
+GdkPixmap *gnome_bg_create_pixmap (GnomeBG *img,
+ GdkWindow *window,
+ int width,
+ int height,
+ gboolean root);
+gboolean gnome_bg_get_image_size (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ int *width,
+ int *height);
+GdkPixbuf *gnome_bg_create_thumbnail (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height);
+gboolean gnome_bg_is_dark (GnomeBG *img);
+gboolean gnome_bg_changes_with_size (GnomeBG *img);
+
+
+/* Set a pixmap as root - not a GnomeBG method */
+void gnome_bg_set_pixmap_as_root (GdkScreen *screen,
+ GdkPixmap *pixmap);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -up gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/Makefile.am
--- gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg 2007-07-02 13:21:44.000000000 -0400
+++ gnome-desktop-2.18.3/libgnome-desktop/libgnomeui/Makefile.am 2007-10-23 11:08:40.000000000 -0400
@@ -1,4 +1,5 @@
libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
libgnomeui_desktop_HEADERS = \
gnome-ditem-edit.h \
- gnome-hint.h
+ gnome-hint.h \
+ gnome-bg.h
diff -up /dev/null gnome-desktop-2.18.3/libgnome-desktop/gnome-bg.c
--- /dev/null 2007-11-13 12:35:54.536025751 -0500
+++ gnome-desktop-2.18.3/libgnome-desktop/gnome-bg.c 2007-11-13 16:17:11.000000000 -0500
@@ -0,0 +1,1706 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+gnomebg.c: Object for the desktop background.
+
+Copyright (C) 2000 Eazel, Inc.
+Copyright (C) 2007 Red Hat, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this program; if not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+Derived from eel-background.c and eel-gdk-pixbuf-extensions.c by
+Darin Adler <darin@eazel.com> and Ramiro Estrugo <ramiro@eazel.com>
+
+Author: Soren Sandmann <sandmann@redhat.com>
+
+*/
+
+#include <string.h>
+#include <libgnomeui/gnome-bg.h>
+#include <gdk/gdkx.h>
+#include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomeui/libgnomeui.h>
+#include <math.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <gdk/gdkx.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <stdarg.h>
+
+typedef struct _SlideShow SlideShow;
+typedef struct _Slide Slide;
+
+/* This is the size of the GdkRGB dither matrix, in order to avoid
+ * bad dithering when tiling the gradient
+ */
+#define GRADIENT_PIXMAP_TILE_SIZE 128
+
+/*
+ * Implementation of the GnomeBG class
+ */
+struct _GnomeBG
+{
+ GObject parent_instance;
+
+ char * uri;
+ GnomeBGPlacement placement;
+ GnomeBGColorType color_type;
+ GdkColor c1;
+ GdkColor c2;
+
+ /* Cached information, only access through cache accessor functions */
+ SlideShow * slideshow;
+ time_t uri_mtime;
+ GdkPixbuf * pixbuf_cache;
+ int timeout_id;
+ GList * file_cache;
+};
+
+struct _GnomeBGClass
+{
+ GObjectClass parent_class;
+};
+
+enum {
+ CHANGED,
+ N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0 };
+
+G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT);
+
+static GdkPixmap *make_root_pixmap (GdkScreen *screen,
+ gint width,
+ gint height);
+
+/* Pixbuf utils */
+static guint32 pixbuf_average_value (GdkPixbuf *pixbuf);
+static GdkPixbuf *pixbuf_scale_to_fit (GdkPixbuf *src,
+ int max_width,
+ int max_height);
+static GdkPixbuf *pixbuf_scale_to_min (GdkPixbuf *src,
+ int min_width,
+ int min_height);
+static void pixbuf_draw_gradient (GdkPixbuf *pixbuf,
+ gboolean horizontal,
+ GdkColor *c1,
+ GdkColor *c2);
+static void pixbuf_tile (GdkPixbuf *src,
+ GdkPixbuf *dest);
+static void pixbuf_blend (GdkPixbuf *src,
+ GdkPixbuf *dest,
+ int src_x,
+ int src_y,
+ int width,
+ int height,
+ int dest_x,
+ int dest_y,
+ double alpha);
+
+/* Thumbnail utilities */
+static GdkPixbuf *get_thumbnail_for_uri (GnomeThumbnailFactory *factory,
+ const char *uri);
+static gboolean get_thumb_annotations (GdkPixbuf *thumb,
+ int *orig_width,
+ int *orig_height);
+
+/* Cache */
+static GdkPixbuf *get_pixbuf (GnomeBG *bg);
+static void clear_cache (GnomeBG *bg);
+static gboolean is_different (GnomeBG *bg,
+ const char *uri);
+static time_t get_mtime (const char *uri);
+static GdkPixbuf *create_img_thumbnail (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height);
+
+static void
+gnome_bg_init (GnomeBG *bg)
+{
+}
+
+static void
+gnome_bg_finalize (GObject *object)
+{
+ GnomeBG *bg = GNOME_BG (object);
+
+ clear_cache (bg);
+
+ G_OBJECT_CLASS (gnome_bg_parent_class)->finalize (object);
+}
+
+static void
+gnome_bg_class_init (GnomeBGClass *class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+ object_class->finalize = gnome_bg_finalize;
+
+ signals[CHANGED] = g_signal_new ("changed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+static void
+emit_changed (GnomeBG *bg)
+{
+ g_signal_emit (G_OBJECT (bg), signals[CHANGED], 0);
+}
+
+GnomeBG *
+gnome_bg_new (void)
+{
+ return g_object_new (GNOME_TYPE_BG, NULL);
+}
+
+static gboolean
+colors_equal (const GdkColor *c1, const GdkColor *c2)
+{
+ return c1->red == c2->red &&
+ c1->green == c2->green &&
+ c1->blue == c2->blue;
+}
+
+void
+gnome_bg_set_color (GnomeBG *bg,
+ GnomeBGColorType type,
+ GdkColor *c1,
+ GdkColor *c2)
+{
+ g_return_if_fail (bg != NULL);
+
+ if (bg->color_type != type ||
+ !colors_equal (&bg->c1, c1) ||
+ (c2 && !colors_equal (&bg->c2, c2))) {
+
+ bg->color_type = type;
+ bg->c1 = *c1;
+ if (c2) {
+ bg->c2 = *c2;
+ }
+
+ emit_changed (bg);
+ }
+}
+
+void
+gnome_bg_set_placement (GnomeBG *bg,
+ GnomeBGPlacement placement)
+{
+ g_return_if_fail (bg != NULL);
+
+ if (bg->placement != placement) {
+ bg->placement = placement;
+
+ emit_changed (bg);
+ }
+}
+
+void
+gnome_bg_set_uri (GnomeBG *bg,
+ const char *uri)
+{
+ g_return_if_fail (bg != NULL);
+
+ if (is_different (bg, uri)) {
+ char *tmp = g_strdup (uri);
+
+ /* FIXME: maybe check that it is local */
+
+ g_free (bg->uri);
+
+ bg->uri = tmp;
+
+ clear_cache (bg);
+
+ emit_changed (bg);
+ }
+}
+
+static void
+draw_color (GnomeBG *bg, GdkPixbuf *dest)
+{
+ guint32 pixel;
+
+ switch (bg->color_type)
+ {
+ case GNOME_BG_COLOR_SOLID:
+ pixel = ((bg->c1.red >> 8) << 24) |
+ ((bg->c1.green >> 8) << 16) |
+ ((bg->c1.blue >> 8) << 8) |
+ (0xff);
+
+ gdk_pixbuf_fill (dest, pixel);
+ break;
+
+ case GNOME_BG_COLOR_H_GRADIENT:
+ pixbuf_draw_gradient (dest, TRUE, &(bg->c1), &(bg->c2));
+ break;
+
+ case GNOME_BG_COLOR_V_GRADIENT:
+ pixbuf_draw_gradient (dest, FALSE, &(bg->c1), &(bg->c2));
+ break;
+
+ default:
+ break;
+ }
+}
+
+static GdkPixbuf *
+get_scaled_pixbuf (GnomeBGPlacement placement,
+ GdkPixbuf *pixbuf,
+ int width, int height,
+ int *x, int *y, int *w, int *h)
+{
+ GdkPixbuf *new;
+
+#if 0
+ g_print ("original_width: %d %d\n",
+ gdk_pixbuf_get_width (pixbuf),
+ gdk_pixbuf_get_height (pixbuf));
+#endif
+
+ switch (placement) {
+ case GNOME_BG_PLACEMENT_ZOOMED:
+ new = pixbuf_scale_to_min (pixbuf, width, height);
+ break;
+
+ case GNOME_BG_PLACEMENT_CENTERED:
+ new = g_object_ref (pixbuf);
+ break;
+
+ case GNOME_BG_PLACEMENT_FILL_SCREEN:
+ new = gdk_pixbuf_scale_simple (pixbuf, width, height,
+ GDK_INTERP_BILINEAR);
+ break;
+
+ case GNOME_BG_PLACEMENT_SCALED:
+ new = pixbuf_scale_to_fit (pixbuf, width, height);
+ break;
+
+ case GNOME_BG_PLACEMENT_TILED:
+ default:
+ new = g_object_ref (pixbuf);
+ break;
+ }
+
+ *w = gdk_pixbuf_get_width (new);
+ *h = gdk_pixbuf_get_height (new);
+ *x = (width - *w) / 2;
+ *y = (height - *h) / 2;
+
+ return new;
+}
+
+static void
+draw_image (GnomeBGPlacement placement,
+ GdkPixbuf *pixbuf,
+ GdkPixbuf *dest)
+{
+ int dest_width = gdk_pixbuf_get_width (dest);
+ int dest_height = gdk_pixbuf_get_height (dest);
+ int x, y, w, h;
+ GdkPixbuf *scaled;
+
+ if (!pixbuf)
+ return;
+
+ scaled = get_scaled_pixbuf (
+ placement, pixbuf, dest_width, dest_height, &x, &y, &w, &h);
+
+ switch (placement) {
+ case GNOME_BG_PLACEMENT_TILED:
+ pixbuf_tile (scaled, dest);
+ break;
+ case GNOME_BG_PLACEMENT_ZOOMED:
+ case GNOME_BG_PLACEMENT_CENTERED:
+ case GNOME_BG_PLACEMENT_FILL_SCREEN:
+ case GNOME_BG_PLACEMENT_SCALED:
+ pixbuf_blend (scaled, dest, 0, 0, w, h, x, y, 1.0);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+
+ g_object_unref (scaled);
+}
+
+void
+gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
+{
+ if (!bg)
+ return;
+
+ draw_color (bg, dest);
+
+ draw_image (bg->placement, get_pixbuf (bg), dest);
+}
+
+gboolean
+gnome_bg_changes_with_size (GnomeBG *bg)
+{
+ g_return_val_if_fail (bg != NULL, FALSE);
+
+ if (bg->color_type != GNOME_BG_COLOR_SOLID) {
+ if (!get_pixbuf (bg))
+ return TRUE;
+ if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)))
+ return TRUE;
+ if (bg->placement == GNOME_BG_PLACEMENT_CENTERED)
+ return TRUE;
+ return FALSE;
+ }
+ else if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
+}
+
+static void
+gnome_bg_get_pixmap_size (GnomeBG *bg,
+ int width,
+ int height,
+ int *pixmap_width,
+ int *pixmap_height)
+{
+ int dummy;
+ int pb_width, pb_height;
+
+ if (!pixmap_width)
+ pixmap_width = &dummy;
+ if (!pixmap_height)
+ pixmap_height = &dummy;
+
+ *pixmap_width = width;
+ *pixmap_height = height;
+
+ if (!get_pixbuf (bg)) {
+ switch (bg->color_type) {
+ case GNOME_BG_COLOR_SOLID:
+ *pixmap_width = 1;
+ *pixmap_height = 1;
+ break;
+
+ case GNOME_BG_COLOR_H_GRADIENT:
+ *pixmap_width = width;
+ *pixmap_height = GRADIENT_PIXMAP_TILE_SIZE;
+ break;
+
+ case GNOME_BG_COLOR_V_GRADIENT:
+ *pixmap_width = GRADIENT_PIXMAP_TILE_SIZE;
+ *pixmap_height = height;
+ break;
+ }
+
+ return;
+ }
+
+ pb_width = gdk_pixbuf_get_width (get_pixbuf (bg));
+ pb_height = gdk_pixbuf_get_height (get_pixbuf (bg));
+
+ if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+ if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)) &&
+ bg->color_type != GNOME_BG_COLOR_SOLID) {
+ if (bg->color_type == GNOME_BG_COLOR_H_GRADIENT) {
+ /* FIXME: Should this be
+ * MAX (GRADIENT_TILE_SIZE, pb_height)?
+ */
+ *pixmap_height = pb_height;
+ *pixmap_width = width;
+ }
+ else {
+ /* FIXME: Should this be
+ * MAX (GRAIDENT_TILE_SIZE, pb_width? */
+ *pixmap_width = pb_width;
+ *pixmap_height = height;
+ }
+ }
+ else {
+ *pixmap_width = pb_width;
+ *pixmap_height = pb_height;
+ }
+ }
+}
+
+/**
+ * gnome_bg_get_pixmap:
+ * @bg: GnomeBG
+ * @window:
+ * @width:
+ * @height:
+ *
+ * Create a pixmap that can be set as background for @window. If @root is TRUE,
+ * the pixmap created will be created by a temporary X server connection so
+ * that if someone calls XKillClient on it, it won't affect the application who
+ * created it.
+ *
+ * Since: 2.20
+ **/
+GdkPixmap *
+gnome_bg_create_pixmap (GnomeBG *bg,
+ GdkWindow *window,
+ int width,
+ int height,
+ gboolean root)
+{
+ int pm_width, pm_height;
+ GdkPixmap *pixmap;
+
+ g_return_val_if_fail (bg != NULL, NULL);
+ g_return_val_if_fail (window != NULL, NULL);
+
+ gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
+
+ if (root) {
+ pixmap = make_root_pixmap (gdk_drawable_get_screen (window),
+ pm_width, pm_height);
+ }
+ else {
+ pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
+ }
+
+ if (!get_pixbuf (bg) && bg->color_type == GNOME_BG_COLOR_SOLID) {
+ GdkGC *gc = gdk_gc_new (pixmap);
+ gdk_gc_set_rgb_fg_color (gc, &(bg->c1));
+
+ gdk_draw_point (pixmap, gc, 0, 0);
+
+ g_object_unref (gc);
+ }
+ else {
+ GdkPixbuf *pixbuf;
+
+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+ width, height);
+ gnome_bg_draw (bg, pixbuf);
+ gdk_draw_pixbuf (pixmap, NULL, pixbuf,
+ 0, 0,
+ 0, 0, width, height,
+ GDK_RGB_DITHER_MAX, 0, 0);
+ g_object_unref (pixbuf);
+ }
+
+ return pixmap;
+}
+
+
+/* determine if a background is darker or lighter than average, to help
+ * clients know what colors to draw on top with
+ */
+gboolean
+gnome_bg_is_dark (GnomeBG *bg)
+{
+ GdkColor color;
+ int intensity;
+
+ g_return_val_if_fail (bg != NULL, FALSE);
+
+ if (bg->color_type == GNOME_BG_COLOR_SOLID) {
+ color = bg->c1;
+ } else {
+ color.red = (bg->c1.red + bg->c2.red) / 2;
+ color.green = (bg->c1.green + bg->c2.green) / 2;
+ color.blue = (bg->c1.blue + bg->c2.blue) / 2;
+ }
+
+ if (get_pixbuf (bg)) {
+ guint32 argb = pixbuf_average_value (get_pixbuf (bg));
+ guchar a = (argb >> 24) & 0xff;
+ guchar r = (argb >> 16) & 0xff;
+ guchar g = (argb >> 8) & 0xff;
+ guchar b = (argb >> 0) & 0xff;
+
+ color.red = (color.red * (0xFF - a) + r * 0x101 * a) / 0xFF;
+ color.green = (color.green * (0xFF - a) + g * 0x101 * a) / 0xFF;
+ color.blue = (color.blue * (0xFF - a) + b * 0x101 * a) / 0xFF;
+ }
+
+ intensity = (color.red * 77 +
+ color.green * 150 +
+ color.blue * 28) >> 16;
+
+ return intensity < 160; /* biased slightly to be dark */
+}
+
+void
+gnome_bg_free (GnomeBG *bg)
+{
+ g_return_if_fail (bg != NULL);
+
+ g_object_unref (G_OBJECT (bg));
+}
+
+/*
+ * Create a persistent pixmap. We create a separate display
+ * and set the closedown mode on it to RetainPermanent.
+ */
+static GdkPixmap *
+make_root_pixmap (GdkScreen *screen, gint width, gint height)
+{
+ Display *display;
+ const char *display_name;
+ Pixmap result;
+ GdkPixmap *gdk_pixmap;
+ int screen_num;
+
+ screen_num = gdk_screen_get_number (screen);
+
+ gdk_flush ();
+
+ display_name = gdk_display_get_name (gdk_screen_get_display (screen));
+ display = XOpenDisplay (display_name);
+
+ if (display == NULL) {
+ g_warning ("Unable to open display '%s' when setting "
+ "background pixmap\n",
+ (display_name) ? display_name : "NULL");
+ return NULL;
+ }
+
+ /* Desktop background pixmap should be created from
+ * dummy X client since most applications will try to
+ * kill it with XKillClient later when changing pixmap
+ */
+
+ XSetCloseDownMode (display, RetainPermanent);
+
+ result = XCreatePixmap (display,
+ RootWindow (display, screen_num),
+ width, height,
+ DefaultDepth (display, screen_num));
+
+ XCloseDisplay (display);
+
+ gdk_pixmap = gdk_pixmap_foreign_new (result);
+ gdk_drawable_set_colormap (
+ GDK_DRAWABLE (gdk_pixmap),
+ gdk_drawable_get_colormap (gdk_screen_get_root_window (screen)));
+
+ return gdk_pixmap;
+}
+
+static gboolean
+get_original_size (const char *uri,
+ int *orig_width,
+ int *orig_height)
+{
+ char *filename = gnome_vfs_get_local_path_from_uri (uri);
+
+ if (!filename)
+ return FALSE;
+
+ if (gdk_pixbuf_get_file_info (filename, orig_width, orig_height))
+ return TRUE;
+
+ return FALSE;
+}
+
+gboolean
+gnome_bg_get_image_size (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ int *width,
+ int *height)
+{
+ GdkPixbuf *thumb;
+ gboolean result = FALSE;
+
+ g_return_val_if_fail (bg != NULL, FALSE);
+ g_return_val_if_fail (factory != NULL, FALSE);
+
+ if (!bg->uri)
+ return FALSE;
+
+ thumb = get_thumbnail_for_uri (factory, bg->uri);
+
+ if (thumb) {
+ if (get_thumb_annotations (thumb, width, height))
+ result = TRUE;
+ else if (get_original_size (bg->uri, width, height))
+ result = TRUE;
+
+ g_object_unref (thumb);
+ }
+
+ return result;
+}
+
+static double
+fit_factor (int from_width, int from_height,
+ int to_width, int to_height)
+{
+ return MIN (to_width / (double) from_width, to_height / (double) from_height);
+}
+
+GdkPixbuf *
+gnome_bg_create_thumbnail (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height)
+{
+ GdkPixbuf *result;
+ GdkPixbuf *thumb;
+
+ g_return_val_if_fail (bg != NULL, NULL);
+
+ result = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, dest_width, dest_height);
+
+ draw_color (bg, result);
+
+ thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height);
+
+ if (thumb) {
+ draw_image (bg->placement, thumb, result);
+ g_object_unref (thumb);
+ }
+
+ return result;
+}
+
+
+/* Set the root pixmap, and properties pointing to it. We
+ * do this atomically with XGrabServer to make sure that
+ * we won't leak the pixmap if somebody else it setting
+ * it at the same time. (This assumes that they follow the
+ * same conventions we do)
+ */
+void
+gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
+{
+ int result;
+ gint format;
+ gulong nitems;
+ gulong bytes_after;
+ guchar *data_esetroot;
+ Pixmap pixmap_id;
+ Atom type;
+ Display *display;
+ int screen_num;
+
+ g_return_if_fail (screen != NULL);
+ g_return_if_fail (pixmap != NULL);
+
+ screen_num = gdk_screen_get_number (screen);
+
+ data_esetroot = NULL;
+ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+
+ XGrabServer (display);
+
+ result = XGetWindowProperty (
+ display, RootWindow (display, screen_num),
+ gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"),
+ 0L, 1L, False, XA_PIXMAP,
+ &type, &format, &nitems, &bytes_after,
+ &data_esetroot);
+
+ if (data_esetroot != NULL) {
+ if (result == Success && type == XA_PIXMAP &&
+ format == 32 &&
+ nitems == 1) {
+ gdk_error_trap_push ();
+ XKillClient (display, *(Pixmap *)data_esetroot);
+ gdk_flush ();
+ gdk_error_trap_pop ();
+ }
+ XFree (data_esetroot);
+ }
+
+ pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
+
+ XChangeProperty (display, RootWindow (display, screen_num),
+ gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"),
+ XA_PIXMAP, 32, PropModeReplace,
+ (guchar *) &pixmap_id, 1);
+ XChangeProperty (display, RootWindow (display, screen_num),
+ gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"), XA_PIXMAP,
+ 32, PropModeReplace,
+ (guchar *) &pixmap_id, 1);
+
+ XSetWindowBackgroundPixmap (display, RootWindow (display, screen_num),
+ pixmap_id);
+ XClearWindow (display, RootWindow (display, screen_num));
+
+ XUngrabServer (display);
+
+ XFlush (display);
+}
+
+
+/* Implementation of the pixbuf cache */
+struct _SlideShow
+{
+ double start_time; /* In seconds since Jan 1st 1970 */
+ double total_duration;
+
+ GQueue *slides;
+
+ /* used during parsing */
+ GQueue *stack;
+};
+
+struct _Slide
+{
+ double duration; /* in seconds */
+ gboolean fixed;
+
+ char *file1;
+ char *file2; /* NULL if fixed is TRUE */
+};
+
+static SlideShow *read_slideshow_file (const char *filename,
+ GError **err);
+static void slideshow_free (SlideShow *show);
+
+static double
+now (void)
+{
+ GTimeVal tv;
+ time_t t;
+
+ g_get_current_time (&tv);
+
+ time (&t);
+
+ return (double)tv.tv_sec + (tv.tv_usec / 1000000.0);
+}
+
+static Slide *
+get_current_slide (SlideShow *show,
+ double *alpha)
+{
+ double delta = fmod (now() - show->start_time, show->total_duration);
+ GList *list;
+ double elapsed;
+ int i;
+
+ elapsed = 0;
+ i = 0;
+ for (list = show->slides->head; list != NULL; list = list->next) {
+ Slide *slide = list->data;
+
+ if (elapsed + slide->duration > delta) {
+ *alpha = (delta - elapsed) / (double)slide->duration;
+ return slide;
+ }
+
+ i++;
+ elapsed += slide->duration;
+ }
+
+ return NULL;
+}
+
+static GdkPixbuf *
+blend (GdkPixbuf *p1,
+ GdkPixbuf *p2,
+ double alpha)
+{
+ GdkPixbuf *result = gdk_pixbuf_copy (p1);
+
+ pixbuf_blend (p2, result, 0, 0, -1, -1, 0, 0, alpha);
+
+ return result;
+}
+
+typedef enum {
+ PIXBUF,
+ SLIDESHOW,
+ THUMBNAIL
+} FileType;
+
+typedef struct FileCacheEntry FileCacheEntry;
+struct FileCacheEntry
+{
+ FileType type;
+ char *uri;
+ union {
+ GdkPixbuf *pixbuf;
+ SlideShow *slideshow;
+ GdkPixbuf *thumbnail;
+ } u;
+};
+
+static const FileCacheEntry *
+file_cache_lookup (GnomeBG *bg, FileType type, const char *uri)
+{
+ GList *list;
+
+ for (list = bg->file_cache; list != NULL; list = list->next) {
+ FileCacheEntry *ent = list->data;
+
+ if (ent->type == type && strcmp (ent->uri, uri) == 0)
+ return ent;
+ }
+
+ return NULL;
+}
+
+static void
+file_cache_add_pixbuf (GnomeBG *bg,
+ const char *uri,
+ GdkPixbuf *pixbuf)
+{
+ FileCacheEntry *ent = g_new0 (FileCacheEntry, 1);
+
+ g_assert (!file_cache_lookup (bg, PIXBUF, uri));
+
+ ent->type = PIXBUF;
+ ent->uri = g_strdup (uri);
+ ent->u.pixbuf = pixbuf;
+
+ bg->file_cache = g_list_prepend (bg->file_cache, ent);
+}
+
+static void
+file_cache_add_thumbnail (GnomeBG *bg,
+ const char *uri,
+ GdkPixbuf *pixbuf)
+{
+ FileCacheEntry *ent = g_new0 (FileCacheEntry, 1);
+
+ g_assert (!file_cache_lookup (bg, THUMBNAIL, uri));
+
+ ent->type = THUMBNAIL;
+ ent->uri = g_strdup (uri);
+ ent->u.thumbnail = pixbuf;
+
+ bg->file_cache = g_list_prepend (bg->file_cache, ent);
+}
+
+static void
+file_cache_add_slide_show (GnomeBG *bg,
+ const char *uri,
+ SlideShow *show)
+{
+ FileCacheEntry *ent = g_new0 (FileCacheEntry, 1);
+
+ g_assert (!file_cache_lookup (bg, SLIDESHOW, uri));
+
+ ent->type = SLIDESHOW;
+ ent->uri = g_strdup (uri);
+ ent->u.slideshow = show;
+
+ bg->file_cache = g_list_prepend (bg->file_cache, ent);
+}
+
+static GdkPixbuf *
+get_as_pixbuf (GnomeBG *bg, const char *uri)
+{
+ const FileCacheEntry *ent;
+ if ((ent = file_cache_lookup (bg, PIXBUF, uri))) {
+ return ent->u.pixbuf;
+ }
+ else {
+ GdkPixbuf *pixbuf = gnome_gdk_pixbuf_new_from_uri (uri);
+
+ if (pixbuf)
+ file_cache_add_pixbuf (bg, uri, pixbuf);
+
+ return pixbuf;
+ }
+}
+
+static SlideShow *
+get_as_slideshow (GnomeBG *bg, const char *uri)
+{
+ const FileCacheEntry *ent;
+ if ((ent = file_cache_lookup (bg, SLIDESHOW, uri))) {
+ return ent->u.slideshow;
+ }
+ else {
+ SlideShow *show = read_slideshow_file (uri, NULL);
+
+ if (show)
+ file_cache_add_slide_show (bg, uri, show);
+
+ return show;
+ }
+}
+
+static GdkPixbuf *
+get_as_thumbnail (GnomeBG *bg, GnomeThumbnailFactory *factory, const char *uri)
+{
+ const FileCacheEntry *ent;
+ if ((ent = file_cache_lookup (bg, THUMBNAIL, uri))) {
+ return ent->u.thumbnail;
+ }
+ else {
+ GdkPixbuf *thumb = get_thumbnail_for_uri (factory, uri);
+
+ if (thumb)
+ file_cache_add_thumbnail (bg, uri, thumb);
+
+ return thumb;
+ }
+}
+
+static gboolean
+on_timeout (gpointer data)
+{
+ GnomeBG *bg = data;
+
+ if (bg->pixbuf_cache) {
+ g_object_unref (bg->pixbuf_cache);
+ bg->pixbuf_cache = NULL;
+ }
+
+ bg->timeout_id = 0;
+
+ emit_changed (bg);
+
+ return FALSE;
+}
+
+static void
+ensure_timeout (GnomeBG *bg,
+ Slide *slide)
+{
+ if (!bg->timeout_id) {
+ double timeout;
+
+ if (slide->fixed) {
+ timeout = slide->duration;
+ }
+ else {
+ /* Maybe the number of steps should be configurable? */
+ timeout = slide->duration / 255.0;
+ }
+
+ bg->timeout_id = g_timeout_add_full (
+ G_PRIORITY_LOW,
+ timeout * 1000, on_timeout, bg, NULL);
+
+ }
+}
+
+static time_t
+get_mtime (const char *uri)
+{
+ time_t mtime;
+ GnomeVFSFileInfo *info;
+
+ mtime = (time_t)-1;
+
+ if (uri) {
+ GnomeVFSResult vfs_res;
+
+ info = gnome_vfs_file_info_new ();
+
+ vfs_res = gnome_vfs_get_file_info (
+ uri, info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
+
+ if (vfs_res == GNOME_VFS_OK)
+ mtime = info->mtime;
+
+ gnome_vfs_file_info_unref (info);
+ }
+
+ return mtime;
+}
+
+static GdkPixbuf *
+scale_thumbnail (GnomeBGPlacement placement,
+ const char *uri,
+ GdkPixbuf *thumb,
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height)
+{
+ int o_width;
+ int o_height;
+
+ if (placement != GNOME_BG_PLACEMENT_TILED &&
+ placement != GNOME_BG_PLACEMENT_CENTERED) {
+
+ /* In this case, the pixbuf will be scaled to fit the screen anyway,
+ * so just return the pixbuf here
+ */
+ return g_object_ref (thumb);
+ }
+
+ /* FIXME: in case of tiled, we should probably scale the pixbuf to
+ * be maybe dest_width/4 pixels tall. While strictly speaking incorrect,
+ * it might give a better idea of what the background would actually look
+ * like.
+ */
+ if (get_thumb_annotations (thumb, &o_width, &o_height) ||
+ (uri && get_original_size (uri, &o_width, &o_height))) {
+
+ int scr_height = gdk_screen_get_height (screen);
+ int scr_width = gdk_screen_get_width (screen);
+ int thumb_width = gdk_pixbuf_get_width (thumb);
+ int thumb_height = gdk_pixbuf_get_height (thumb);
+ double screen_to_dest = fit_factor (scr_width, scr_height,
+ dest_width, dest_height);
+ double thumb_to_orig = fit_factor (thumb_width, thumb_height,
+ o_width, o_height);
+ double f = thumb_to_orig * screen_to_dest;
+ int new_width, new_height;
+
+ new_width = floor (thumb_width * f + 0.5);
+ new_height = floor (thumb_height * f + 0.5);
+
+ thumb = gdk_pixbuf_scale_simple (thumb, new_width, new_height,
+ GDK_INTERP_BILINEAR);
+ }
+
+ return thumb;
+}
+
+static GdkPixbuf *
+create_img_thumbnail (GnomeBG *bg,
+ GnomeThumbnailFactory *factory,
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height)
+{
+ if (bg->uri) {
+ GdkPixbuf *thumb = get_as_thumbnail (bg, factory, bg->uri);
+
+ if (thumb) {
+ return scale_thumbnail (
+ bg->placement, bg->uri,
+ thumb, screen, dest_width, dest_height);
+ }
+ else {
+ SlideShow *show = get_as_slideshow (bg, bg->uri);
+ /* FIXME: this code is duplicated in get_pixbuf(). */
+ if (show) {
+ double alpha;
+ Slide *slide = get_current_slide (show, &alpha);
+
+ if (slide->fixed) {
+ GdkPixbuf *tmp;
+
+ tmp = get_as_thumbnail (bg, factory, slide->file1);
+
+ thumb = scale_thumbnail (
+ bg->placement, bg->uri,
+ tmp, screen, dest_width, dest_height);
+ }
+ else {
+ GdkPixbuf *p1 = get_as_thumbnail (bg, factory, slide->file1);
+ GdkPixbuf *p2 = get_as_thumbnail (bg, factory, slide->file2);
+
+ /* FIXME: compute thumb */
+ if (p1 && p2) {
+ GdkPixbuf *thumb1, *thumb2;
+
+ thumb1 = scale_thumbnail (
+ bg->placement, bg->uri,
+ p1, screen, dest_width, dest_height);
+ thumb2 = scale_thumbnail (
+ bg->placement, bg->uri,
+ p2, screen, dest_width, dest_height);
+
+ thumb = blend (thumb1, thumb2, alpha);
+
+ g_object_unref (thumb1);
+ g_object_unref (thumb2);
+ }
+ }
+
+ ensure_timeout (bg, slide);
+ }
+ }
+
+ return thumb;
+ }
+
+ return NULL;
+}
+
+static GdkPixbuf *
+get_pixbuf (GnomeBG *bg)
+{
+ /* FIXME: this ref=TRUE/FALSE stuff is crazy */
+
+ gboolean ref = FALSE;
+
+ if (!bg->pixbuf_cache && bg->uri) {
+ ref = TRUE;
+ bg->uri_mtime = get_mtime (bg->uri);
+
+ bg->pixbuf_cache = get_as_pixbuf (bg, bg->uri);
+ if (!bg->pixbuf_cache) {
+ SlideShow *show = get_as_slideshow (bg, bg->uri);
+
+ if (show) {
+ double alpha;
+ Slide *slide = get_current_slide (show, &alpha);
+
+ if (slide->fixed) {
+ bg->pixbuf_cache = get_as_pixbuf (bg, slide->file1);
+ }
+ else {
+ GdkPixbuf *p1 = get_as_pixbuf (bg, slide->file1);
+ GdkPixbuf *p2 = get_as_pixbuf (bg, slide->file2);
+
+ if (p1 && p2) {
+ bg->pixbuf_cache = blend (p1, p2, alpha);
+ ref = FALSE;
+ }
+ }
+
+ ensure_timeout (bg, slide);
+ }
+ }
+ }
+
+ if (bg->pixbuf_cache && ref)
+ g_object_ref (bg->pixbuf_cache);
+
+ return bg->pixbuf_cache;
+}
+
+static gboolean
+is_different (GnomeBG *bg,
+ const char *uri)
+{
+ if (!uri && bg->uri) {
+ return TRUE;
+ }
+ else if (uri && !bg->uri) {
+ return TRUE;
+ }
+ else if (!uri && !bg->uri) {
+ return FALSE;
+ }
+ else {
+ time_t mtime = get_mtime (uri);
+
+ if (mtime != bg->uri_mtime)
+ return TRUE;
+
+ if (strcmp (uri, bg->uri) != 0)
+ return TRUE;
+
+ return FALSE;
+ }
+}
+
+static void
+clear_cache (GnomeBG *bg)
+{
+ if (bg->pixbuf_cache) {
+ g_object_unref (bg->pixbuf_cache);
+
+ bg->pixbuf_cache = NULL;
+ }
+
+ if (bg->timeout_id) {
+ g_source_remove (bg->timeout_id);
+
+ bg->timeout_id = 0;
+ }
+}
+
+/* Pixbuf utilities */
+static guint32
+pixbuf_average_value (GdkPixbuf *pixbuf)
+{
+ guint64 a_total, r_total, g_total, b_total;
+ guint row, column;
+ int row_stride;
+ const guchar *pixels, *p;
+ int r, g, b, a;
+ guint64 dividend;
+ guint width, height;
+
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ row_stride = gdk_pixbuf_get_rowstride (pixbuf);
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+ /* iterate through the pixbuf, counting up each component */
+ a_total = 0;
+ r_total = 0;
+ g_total = 0;
+ b_total = 0;
+
+ if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+ for (row = 0; row < height; row++) {
+ p = pixels + (row * row_stride);
+ for (column = 0; column < width; column++) {
+ r = *p++;
+ g = *p++;
+ b = *p++;
+ a = *p++;
+
+ a_total += a;
+ r_total += r * a;
+ g_total += g * a;
+ b_total += b * a;
+ }
+ }
+ dividend = height * width * 0xFF;
+ a_total *= 0xFF;
+ } else {
+ for (row = 0; row < height; row++) {
+ p = pixels + (row * row_stride);
+ for (column = 0; column < width; column++) {
+ r = *p++;
+ g = *p++;
+ b = *p++;
+
+ r_total += r;
+ g_total += g;
+ b_total += b;
+ }
+ }
+ dividend = height * width;
+ a_total = dividend * 0xFF;
+ }
+
+ return ((a_total + dividend / 2) / dividend) << 24
+ | ((r_total + dividend / 2) / dividend) << 16
+ | ((g_total + dividend / 2) / dividend) << 8
+ | ((b_total + dividend / 2) / dividend);
+}
+
+static GdkPixbuf *
+pixbuf_scale_to_fit (GdkPixbuf *src, int max_width, int max_height)
+{
+ double factor;
+ int src_width, src_height;
+ int new_width, new_height;
+
+ src_width = gdk_pixbuf_get_width (src);
+ src_height = gdk_pixbuf_get_height (src);
+
+ factor = MIN (max_width / (double) src_width, max_height / (double) src_height);
+
+ new_width = floor (src_width * factor + 0.5);
+ new_height = floor (src_height * factor + 0.5);
+
+ return gdk_pixbuf_scale_simple (src, new_width, new_height, GDK_INTERP_BILINEAR);
+}
+
+static GdkPixbuf *
+pixbuf_scale_to_min (GdkPixbuf *src, int min_width, int min_height)
+{
+ double factor;
+ int src_width, src_height;
+ int new_width, new_height;
+
+ src_width = gdk_pixbuf_get_width (src);
+ src_height = gdk_pixbuf_get_height (src);
+
+ factor = MAX (min_width / (double) src_width, min_height / (double) src_height);
+
+ new_width = floor (src_width * factor + 0.5);
+ new_height = floor (src_height * factor + 0.5);
+
+ return gdk_pixbuf_scale_simple (src, new_width, new_height, GDK_INTERP_BILINEAR);
+}
+
+static guchar *
+create_gradient (const GdkColor *c1,
+ const GdkColor *c2,
+ int n_pixels)
+{
+ guchar *result = g_malloc (n_pixels * 3);
+ int i;
+
+ for (i = 0; i < n_pixels; ++i) {
+ double ratio = (i + 0.5) / n_pixels;
+
+ result[3 * i + 0] = ((guint16) (c1->red * (1 - ratio) + c2->red * ratio)) >> 8;
+ result[3 * i + 1] = ((guint16) (c1->green * (1 - ratio) + c2->green * ratio)) >> 8;
+ result[3 * i + 2] = ((guint16) (c1->blue * (1 - ratio) + c2->blue * ratio)) >> 8;
+ }
+
+ return result;
+}
+
+static void
+pixbuf_draw_gradient (GdkPixbuf *pixbuf,
+ gboolean horizontal,
+ GdkColor *c1,
+ GdkColor *c2)
+{
+ int width = gdk_pixbuf_get_width (pixbuf);
+ int height = gdk_pixbuf_get_height (pixbuf);
+ int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ guchar *dst = gdk_pixbuf_get_pixels (pixbuf);
+ guchar *dst_limit = dst + height * rowstride;
+
+ if (horizontal) {
+ guchar *gradient = create_gradient (c1, c2, width);
+ int copy_bytes_per_row = width * 3;
+
+ while (dst < dst_limit) {
+ memcpy (dst, gradient, copy_bytes_per_row);
+ dst += rowstride;
+ }
+ g_free (gradient);
+ } else {
+ guchar *gb, *gradient;
+
+ gb = gradient = create_gradient (c1, c2, height);
+ while (dst < dst_limit) {
+ int i;
+ guchar *d = dst;
+ guchar r = *gb++;
+ guchar g = *gb++;
+ guchar b = *gb++;
+ for (i = 0; i < width; i++) {
+ *d++ = r;
+ *d++ = g;
+ *d++ = b;
+ }
+ dst += rowstride;
+ }
+ g_free (gradient);
+ }
+}
+
+static void
+pixbuf_blend (GdkPixbuf *src,
+ GdkPixbuf *dest,
+ int src_x,
+ int src_y,
+ int width,
+ int height,
+ int dest_x,
+ int dest_y,
+ double alpha)
+{
+ int dest_width = gdk_pixbuf_get_width (dest);
+ int dest_height = gdk_pixbuf_get_height (dest);
+ int offset_x = dest_x - src_x;
+ int offset_y = dest_y - src_y;
+
+ if (width < 0)
+ width = gdk_pixbuf_get_width (src);
+
+ if (height < 0)
+ height = gdk_pixbuf_get_height (src);
+
+ if (dest_x < 0) {
+ offset_x -= dest_x;
+ dest_x = 0;
+ }
+
+ if (dest_y < 0) {
+ offset_y -= dest_y;
+ dest_y = 0;
+ }
+
+ if (dest_x + width > dest_width) {
+ width = dest_width - dest_x;
+ }
+
+ if (dest_y + height > dest_height) {
+ height = dest_height - dest_y;
+ }
+
+ gdk_pixbuf_composite (src, dest,
+ dest_x, dest_y,
+ width, height,
+ offset_x, offset_y,
+ 1, 1, GDK_INTERP_NEAREST,
+ alpha * 0xFF + 0.5);
+}
+
+static void
+pixbuf_tile (GdkPixbuf *src, GdkPixbuf *dest)
+{
+ int x, y;
+ int tile_width, tile_height;
+ int dest_width = gdk_pixbuf_get_width (dest);
+ int dest_height = gdk_pixbuf_get_height (dest);
+
+ tile_width = gdk_pixbuf_get_width (src);
+ tile_height = gdk_pixbuf_get_height (src);
+
+ for (y = 0; y < dest_height; y += tile_height) {
+ for (x = 0; x < dest_width; x += tile_width) {
+ pixbuf_blend (src, dest, 0, 0,
+ tile_width, tile_height, x, y, 1.0);
+ }
+ }
+}
+
+
+/* Parser for fading background */
+static void
+handle_start_element (GMarkupParseContext *context,
+ const gchar *name,
+ const gchar **attr_names,
+ const gchar **attr_values,
+ gpointer user_data,
+ GError **err)
+{
+ SlideShow *parser = user_data;
+
+ if (strcmp (name, "static") == 0 || strcmp (name, "transition") == 0) {
+ Slide *slide = g_new0 (Slide, 1);
+
+ if (strcmp (name, "static") == 0)
+ slide->fixed = TRUE;
+
+ g_queue_push_tail (parser->slides, slide);
+ }
+
+ g_queue_push_tail (parser->stack, g_strdup (name));
+}
+
+static void
+handle_end_element (GMarkupParseContext *context,
+ const gchar *name,
+ gpointer user_data,
+ GError **err)
+{
+ SlideShow *parser = user_data;
+
+ g_free (g_queue_pop_tail (parser->stack));
+}
+
+static gboolean
+stack_is (SlideShow *parser,
+ const char *s1,
+ ...)
+{
+ GList *stack = NULL;
+ const char *s;
+ GList *l1, *l2;
+ va_list args;
+
+ stack = g_list_prepend (stack, (gpointer)s1);
+
+ va_start (args, s1);
+
+ s = va_arg (args, const char *);
+ while (s) {
+ stack = g_list_prepend (stack, (gpointer)s);
+ s = va_arg (args, const char *);
+ }
+
+ l1 = stack;
+ l2 = parser->stack->head;
+
+ while (l1 && l2) {
+ if (strcmp (l1->data, l2->data) != 0)
+ return FALSE;
+
+ l1 = l1->next;
+ l2 = l2->next;
+ }
+
+ g_list_free (stack);
+
+ return (!l1 && !l2);
+}
+
+static void
+handle_text (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **err)
+{
+ SlideShow *parser = user_data;
+ Slide *slide = parser->slides->tail? parser->slides->tail->data : NULL;
+
+ if (stack_is (parser, "starttime", "background", NULL)) {
+ parser->start_time = g_strtod (text, NULL);
+ }
+ else if (stack_is (parser, "duration", "static", "background", NULL) ||
+ stack_is (parser, "duration", "transition", "background", NULL)) {
+ slide->duration = g_strtod (text, NULL);
+ parser->total_duration += slide->duration;
+ }
+ else if (stack_is (parser, "file", "static", "background", NULL) ||
+ stack_is (parser, "from", "transition", "background", NULL)) {
+ slide->file1 = g_strdup (text);
+ }
+ else if (stack_is (parser, "to", "transition", "background", NULL)) {
+ slide->file2 = g_strdup (text);
+ }
+}
+
+static void
+slideshow_free (SlideShow *show)
+{
+ GList *list;
+
+ for (list = show->slides->head; list != NULL; list = list->next) {
+ Slide *slide = list->data;
+
+ g_free (slide->file1);
+ g_free (slide->file2);
+ g_free (slide);
+ }
+
+ g_queue_free (show->slides);
+
+ for (list = show->stack->head; list != NULL; list = list->next) {
+ gchar *str = list->data;
+
+ g_free (str);
+ }
+
+ g_queue_free (show->stack);
+
+ g_free (show);
+}
+
+static void
+dump_bg (SlideShow *show)
+{
+#if 0
+ GList *list;
+
+ for (list = show->slides->head; list != NULL; list = list->next)
+ {
+ Slide *slide = list->data;
+
+ g_print ("\nSlide: %s\n", slide->fixed? "fixed" : "transition");
+ g_print ("duration: %d\n", slide->duration);
+ g_print ("file1: %p %s\n", slide, slide->file1);
+ g_print ("file2: %s\n", slide->file2);
+ }
+#endif
+}
+
+static SlideShow *
+read_slideshow_file (const char *uri,
+ GError **err)
+{
+ GMarkupParser parser = {
+ handle_start_element,
+ handle_end_element,
+ handle_text,
+ NULL, /* passthrough */
+ NULL, /* error */
+ };
+
+ char *contents = NULL;
+ gssize len;
+ SlideShow *show = NULL;
+ GMarkupParseContext *context = NULL;
+
+ if (!uri || (gnome_vfs_read_entire_file (uri, &len, &contents) != GNOME_VFS_OK))
+ return NULL;
+
+ show = g_new0 (SlideShow, 1);
+ show->stack = g_queue_new ();
+ show->slides = g_queue_new ();
+
+ context = g_markup_parse_context_new (&parser, 0, show, NULL);
+
+ if (!g_markup_parse_context_parse (context, contents, len, err)) {
+ slideshow_free (show);
+ show = NULL;
+ }
+
+ if (!g_markup_parse_context_end_parse (context, err)) {
+ if (show) {
+ slideshow_free (show);
+ show = NULL;
+ }
+ }
+
+ g_markup_parse_context_free (context);
+
+ dump_bg (show);
+
+ g_free (contents);
+
+ return show;
+}
+
+/* Thumbnail utilities */
+static GdkPixbuf *
+get_thumbnail_for_uri (GnomeThumbnailFactory *factory,
+ const char *uri)
+{
+ char *filename;
+ time_t mtime;
+ GdkPixbuf *pixbuf, *orig;
+
+ mtime = get_mtime (uri);
+
+ if (mtime == (time_t)-1)
+ return NULL;
+
+ filename = gnome_thumbnail_factory_lookup (factory, uri, mtime);
+
+ if (filename) {
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+
+ return pixbuf;
+ }
+
+ orig = gnome_gdk_pixbuf_new_from_uri (uri);
+ if (orig) {
+ int orig_width = gdk_pixbuf_get_width (orig);
+ int orig_height = gdk_pixbuf_get_height (orig);
+
+ pixbuf = pixbuf_scale_to_fit (orig, 128, 128);
+
+ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
+ g_strdup_printf ("%d", orig_height), g_free);
+ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
+ g_strdup_printf ("%d", orig_width), g_free);
+
+ g_object_unref (orig);
+
+ gnome_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, mtime);
+
+ return pixbuf;
+ }
+
+ gnome_thumbnail_factory_create_failed_thumbnail (factory, uri, mtime);
+ return NULL;
+}
+
+static gboolean
+get_thumb_annotations (GdkPixbuf *thumb,
+ int *orig_width,
+ int *orig_height)
+{
+ char *end;
+ const char *wstr, *hstr;
+
+ wstr = gdk_pixbuf_get_option (thumb, "tEXt::Thumb::Image::Width");
+ hstr = gdk_pixbuf_get_option (thumb, "tEXt::Thumb::Image::Height");
+
+ if (hstr && wstr) {
+ *orig_width = strtol (wstr, &end, 10);
+ if (*end != 0)
+ return FALSE;
+
+ *orig_height = strtol (hstr, &end, 10);
+ if (*end != 0)
+ return FALSE;
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
diff -up gnome-desktop-2.18.3/libgnome-desktop/Makefile.am.gnome-bg gnome-desktop-2.18.3/libgnome-desktop/Makefile.am
--- gnome-desktop-2.18.3/libgnome-desktop/Makefile.am.gnome-bg 2007-07-02 13:21:44.000000000 -0400
+++ gnome-desktop-2.18.3/libgnome-desktop/Makefile.am 2007-10-23 11:08:40.000000000 -0400
@@ -18,7 +18,8 @@ noinst_PROGRAMS = test-ditem test-hint t
libgnome_desktop_2_la_SOURCES = \
gnome-desktop-item.c \
gnome-ditem-edit.c \
- gnome-hint.c
+ gnome-hint.c \
+ gnome-bg.c
libgnome_desktop_2_la_LIBADD = \
$(GNOME_DESKTOP_LIBS)