[Xfce4-commits] [apps/xfce4-screensaver] 342/425: Drop unused xfce-bg-crossfade.{c, h}
noreply at xfce.org
noreply at xfce.org
Mon Oct 15 01:53:09 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit 1b5f5b4963d3bb14919facda973276fad1a5e5ef
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Oct 1 22:53:37 2018 -0400
Drop unused xfce-bg-crossfade.{c,h}
---
src/Makefile.am | 2 -
src/xfce-bg-crossfade.c | 752 ------------------------------------------------
src/xfce-bg-crossfade.h | 76 -----
src/xfce-bg.c | 1 -
src/xfce-bg.h | 1 -
5 files changed, 832 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index adcdf17..8e834f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -257,8 +257,6 @@ xfce4_screensaver_SOURCES = \
xfce-rr.h \
xfce-bg.c \
xfce-bg.h \
- xfce-bg-crossfade.c \
- xfce-bg-crossfade.h \
xfce-desktop-thumbnail.c \
xfce-desktop-thumbnail.h \
xfce-desktop-utils.c \
diff --git a/src/xfce-bg-crossfade.c b/src/xfce-bg-crossfade.c
deleted file mode 100644
index 45feee6..0000000
--- a/src/xfce-bg-crossfade.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/* xfce-bg-crossfade.h - fade window background between two surfaces
- *
- * Copyright (C) 2008 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., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * Author: Ray Strode <rstrode at redhat.com>
-*/
-#include <string.h>
-#include <math.h>
-#include <stdarg.h>
-
-#include <gio/gio.h>
-
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <gtk/gtk.h>
-
-#include <cairo.h>
-#include <cairo-xlib.h>
-
-#include <xfce-bg.h>
-#include "xfce-bg-crossfade.h"
-
-struct _XfceBGCrossfadePrivate
-{
- GdkWindow *window;
- GtkWidget *widget;
- int width;
- int height;
- cairo_surface_t *fading_surface;
- cairo_surface_t *start_surface;
- cairo_surface_t *end_surface;
- gdouble start_time;
- gdouble total_duration;
- guint timeout_id;
- guint is_first_frame : 1;
-};
-
-enum {
- PROP_0,
- PROP_WIDTH,
- PROP_HEIGHT,
-};
-
-enum {
- FINISHED,
- NUMBER_OF_SIGNALS
-};
-
-static guint signals[NUMBER_OF_SIGNALS] = { 0 };
-
-G_DEFINE_TYPE (XfceBGCrossfade, xfce_bg_crossfade, G_TYPE_OBJECT)
-#define XFCE_BG_CROSSFADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),\
- XFCE_TYPE_BG_CROSSFADE,\
- XfceBGCrossfadePrivate))
-
-static void
-xfce_bg_crossfade_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- XfceBGCrossfade *fade;
-
- g_assert (XFCE_IS_BG_CROSSFADE (object));
-
- fade = XFCE_BG_CROSSFADE (object);
-
- switch (property_id)
- {
- case PROP_WIDTH:
- fade->priv->width = g_value_get_int (value);
- break;
- case PROP_HEIGHT:
- fade->priv->height = g_value_get_int (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
-static void
-xfce_bg_crossfade_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
-{
- XfceBGCrossfade *fade;
-
- g_assert (XFCE_IS_BG_CROSSFADE (object));
-
- fade = XFCE_BG_CROSSFADE (object);
-
- switch (property_id)
- {
- case PROP_WIDTH:
- g_value_set_int (value, fade->priv->width);
- break;
- case PROP_HEIGHT:
- g_value_set_int (value, fade->priv->height);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
-static void
-xfce_bg_crossfade_finalize (GObject *object)
-{
- XfceBGCrossfade *fade;
-
- fade = XFCE_BG_CROSSFADE (object);
-
- xfce_bg_crossfade_stop (fade);
-
- if (fade->priv->fading_surface != NULL) {
- cairo_surface_destroy (fade->priv->fading_surface);
- fade->priv->fading_surface = NULL;
- }
-
- if (fade->priv->start_surface != NULL) {
- cairo_surface_destroy (fade->priv->start_surface);
- fade->priv->start_surface = NULL;
- }
-
- if (fade->priv->end_surface != NULL) {
- cairo_surface_destroy (fade->priv->end_surface);
- fade->priv->end_surface = NULL;
- }
-}
-
-static void
-xfce_bg_crossfade_class_init (XfceBGCrossfadeClass *fade_class)
-{
- GObjectClass *gobject_class;
-
- gobject_class = G_OBJECT_CLASS (fade_class);
-
- gobject_class->get_property = xfce_bg_crossfade_get_property;
- gobject_class->set_property = xfce_bg_crossfade_set_property;
- gobject_class->finalize = xfce_bg_crossfade_finalize;
-
- /**
- * XfceBGCrossfade:width:
- *
- * When a crossfade is running, this is width of the fading
- * surface.
- */
- g_object_class_install_property (gobject_class,
- PROP_WIDTH,
- g_param_spec_int ("width",
- "Window Width",
- "Width of window to fade",
- 0, G_MAXINT, 0,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-
- /**
- * XfceBGCrossfade:height:
- *
- * When a crossfade is running, this is height of the fading
- * surface.
- */
- g_object_class_install_property (gobject_class,
- PROP_HEIGHT,
- g_param_spec_int ("height", "Window Height",
- "Height of window to fade on",
- 0, G_MAXINT, 0,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-
- /**
- * XfceBGCrossfade::finished:
- * @fade: the #XfceBGCrossfade that received the signal
- * @window: the #GdkWindow the crossfade happend on.
- *
- * When a crossfade finishes, @window will have a copy
- * of the end surface as its background, and this signal will
- * get emitted.
- */
- signals[FINISHED] = g_signal_new ("finished",
- G_OBJECT_CLASS_TYPE (gobject_class),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, G_TYPE_OBJECT);
-
- g_type_class_add_private (gobject_class, sizeof (XfceBGCrossfadePrivate));
-}
-
-static void
-xfce_bg_crossfade_init (XfceBGCrossfade *fade)
-{
- fade->priv = XFCE_BG_CROSSFADE_GET_PRIVATE (fade);
-
- fade->priv->window = NULL;
- fade->priv->widget = NULL;
- fade->priv->fading_surface = NULL;
- fade->priv->start_surface = NULL;
- fade->priv->end_surface = NULL;
- fade->priv->timeout_id = 0;
-}
-
-/**
- * xfce_bg_crossfade_new:
- * @width: The width of the crossfading window
- * @height: The height of the crossfading window
- *
- * Creates a new object to manage crossfading a
- * window background between two #cairo_surface_ts.
- *
- * Return value: the new #XfceBGCrossfade
- **/
-XfceBGCrossfade* xfce_bg_crossfade_new (int width, int height)
-{
- GObject* object;
-
- object = g_object_new(XFCE_TYPE_BG_CROSSFADE,
- "width", width,
- "height", height,
- NULL);
-
- return (XfceBGCrossfade*) object;
-}
-
-static cairo_surface_t *
-tile_surface (cairo_surface_t *surface,
- int width,
- int height)
-{
- cairo_surface_t *copy;
- cairo_t *cr;
-
- if (surface == NULL)
- {
- copy = gdk_window_create_similar_surface (gdk_get_default_root_window (),
- CAIRO_CONTENT_COLOR,
- width, height);
- }
- else
- {
- copy = cairo_surface_create_similar (surface,
- cairo_surface_get_content (surface),
- width, height);
- }
-
- cr = cairo_create (copy);
-
- if (surface != NULL)
- {
- cairo_pattern_t *pattern;
- cairo_set_source_surface (cr, surface, 0.0, 0.0);
- pattern = cairo_get_source (cr);
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
- }
- else
- {
- GtkStyleContext *context;
- GdkRGBA bg;
- context = gtk_style_context_new ();
- gtk_style_context_add_provider (context,
- GTK_STYLE_PROVIDER (gtk_css_provider_get_default ()),
- GTK_STYLE_PROVIDER_PRIORITY_THEME);
- gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
- gdk_cairo_set_source_rgba(cr, &bg);
- g_object_unref (G_OBJECT (context));
- }
-
- cairo_paint (cr);
-
- if (cairo_status (cr) != CAIRO_STATUS_SUCCESS)
- {
- cairo_surface_destroy (copy);
- copy = NULL;
- }
-
- cairo_destroy(cr);
-
- return copy;
-}
-
-/**
- * xfce_bg_crossfade_set_start_surface:
- * @fade: a #XfceBGCrossfade
- * @surface: The cairo surface to fade from
- *
- * Before initiating a crossfade with xfce_bg_crossfade_start()
- * a start and end surface have to be set. This function sets
- * the surface shown at the beginning of the crossfade effect.
- *
- * Return value: %TRUE if successful, or %FALSE if the surface
- * could not be copied.
- **/
-gboolean
-xfce_bg_crossfade_set_start_surface (XfceBGCrossfade* fade, cairo_surface_t *surface)
-{
- g_return_val_if_fail (XFCE_IS_BG_CROSSFADE (fade), FALSE);
-
- if (fade->priv->start_surface != NULL)
- {
- cairo_surface_destroy (fade->priv->start_surface);
- fade->priv->start_surface = NULL;
- }
-
- fade->priv->start_surface = tile_surface (surface,
- fade->priv->width,
- fade->priv->height);
-
- return fade->priv->start_surface != NULL;
-}
-
-static gdouble
-get_current_time (void)
-{
- const double microseconds_per_second = (double) G_USEC_PER_SEC;
- double timestamp;
- GTimeVal now;
-
- g_get_current_time (&now);
-
- timestamp = ((microseconds_per_second * now.tv_sec) + now.tv_usec) /
- microseconds_per_second;
-
- return timestamp;
-}
-
-/**
- * xfce_bg_crossfade_set_end_surface:
- * @fade: a #XfceBGCrossfade
- * @surface: The cairo surface to fade to
- *
- * Before initiating a crossfade with xfce_bg_crossfade_start()
- * a start and end surface have to be set. This function sets
- * the surface shown at the end of the crossfade effect.
- *
- * Return value: %TRUE if successful, or %FALSE if the surface
- * could not be copied.
- **/
-gboolean
-xfce_bg_crossfade_set_end_surface (XfceBGCrossfade* fade, cairo_surface_t *surface)
-{
- g_return_val_if_fail (XFCE_IS_BG_CROSSFADE (fade), FALSE);
-
- if (fade->priv->end_surface != NULL) {
- cairo_surface_destroy (fade->priv->end_surface);
- fade->priv->end_surface = NULL;
- }
-
- fade->priv->end_surface = tile_surface (surface,
- fade->priv->width,
- fade->priv->height);
-
- /* Reset timer in case we're called while animating
- */
- fade->priv->start_time = get_current_time ();
- return fade->priv->end_surface != NULL;
-}
-
-static gboolean
-animations_are_disabled (XfceBGCrossfade *fade)
-{
- GtkSettings *settings;
- GdkScreen *screen;
- gboolean are_enabled;
-
- g_assert (fade->priv->window != NULL);
-
- screen = gdk_window_get_screen(fade->priv->window);
-
- settings = gtk_settings_get_for_screen (screen);
-
- g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL);
-
- return !are_enabled;
-}
-
-static void
-send_root_property_change_notification (XfceBGCrossfade *fade)
-{
- long zero_length_pixmap = 0;
-
- /* We do a zero length append to force a change notification,
- * without changing the value */
- XChangeProperty (GDK_WINDOW_XDISPLAY (fade->priv->window),
- GDK_WINDOW_XID (fade->priv->window),
- gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"),
- XA_PIXMAP, 32, PropModeAppend,
- (unsigned char *) &zero_length_pixmap, 0);
-}
-
-static void
-draw_background (XfceBGCrossfade *fade)
-{
- if (fade->priv->widget != NULL) {
- gtk_widget_queue_draw (fade->priv->widget);
- } else if (gdk_window_get_window_type (fade->priv->window) != GDK_WINDOW_ROOT) {
- cairo_t *cr;
- cairo_region_t *region;
- GdkDrawingContext *draw_context;
-
- region = gdk_window_get_visible_region (fade->priv->window);
- draw_context = gdk_window_begin_draw_frame (fade->priv->window,
- region);
- cr = gdk_drawing_context_get_cairo_context (draw_context);
- cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- cairo_set_source_surface (cr, fade->priv->fading_surface, 0, 0);
- cairo_paint (cr);
- gdk_window_end_draw_frame (fade->priv->window, draw_context);
- cairo_region_destroy (region);
- } else {
- Display *xdisplay = GDK_WINDOW_XDISPLAY (fade->priv->window);
- GdkDisplay *display;
- display = gdk_display_get_default ();
- gdk_x11_display_error_trap_push (display);
- XGrabServer (xdisplay);
- XClearWindow (xdisplay, GDK_WINDOW_XID (fade->priv->window));
- send_root_property_change_notification (fade);
- XFlush (xdisplay);
- XUngrabServer (xdisplay);
- gdk_x11_display_error_trap_pop_ignored (display);
- }
-}
-
-static gboolean
-on_widget_draw (GtkWidget *widget,
- cairo_t *cr,
- XfceBGCrossfade *fade)
-{
- g_assert (fade->priv->fading_surface != NULL);
-
- cairo_set_source_surface (cr, fade->priv->fading_surface, 0, 0);
- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
- cairo_paint (cr);
-
- return FALSE;
-}
-
-static gboolean
-on_tick (XfceBGCrossfade *fade)
-{
- gdouble now, percent_done;
- cairo_t *cr;
- cairo_status_t status;
-
- g_return_val_if_fail (XFCE_IS_BG_CROSSFADE (fade), FALSE);
-
- now = get_current_time ();
-
- percent_done = (now - fade->priv->start_time) / fade->priv->total_duration;
- percent_done = CLAMP (percent_done, 0.0, 1.0);
-
- /* If it's taking a long time to get to the first frame,
- * then lengthen the duration, so the user will get to see
- * the effect.
- */
- if (fade->priv->is_first_frame && percent_done > .33) {
- fade->priv->is_first_frame = FALSE;
- fade->priv->total_duration *= 1.5;
- return on_tick (fade);
- }
-
- if (fade->priv->fading_surface == NULL ||
- fade->priv->end_surface == NULL) {
- return FALSE;
- }
-
- if (animations_are_disabled (fade)) {
- return FALSE;
- }
-
- /* We accumulate the results in place for performance reasons.
- *
- * This means 1) The fade is exponential, not linear (looks good!)
- * 2) The rate of fade is not independent of frame rate. Slower machines
- * will get a slower fade (but never longer than .75 seconds), and
- * even the fastest machines will get *some* fade because the framerate
- * is capped.
- */
- cr = cairo_create (fade->priv->fading_surface);
-
- cairo_set_source_surface (cr, fade->priv->end_surface,
- 0.0, 0.0);
- cairo_paint_with_alpha (cr, percent_done);
-
- status = cairo_status (cr);
- cairo_destroy (cr);
-
- if (status == CAIRO_STATUS_SUCCESS) {
- draw_background (fade);
- }
- return percent_done <= .99;
-}
-
-static void
-on_finished (XfceBGCrossfade *fade)
-{
- cairo_t *cr;
-
- if (fade->priv->timeout_id == 0)
- return;
-
- g_assert (fade->priv->fading_surface != NULL);
- g_assert (fade->priv->end_surface != NULL);
-
- cr = cairo_create (fade->priv->fading_surface);
- cairo_set_source_surface (cr, fade->priv->end_surface, 0, 0);
- cairo_paint (cr);
- cairo_destroy (cr);
- draw_background (fade);
-
- cairo_surface_destroy (fade->priv->fading_surface);
- fade->priv->fading_surface = NULL;
-
- cairo_surface_destroy (fade->priv->end_surface);
- fade->priv->end_surface = NULL;
-
- g_assert (fade->priv->start_surface != NULL);
-
- cairo_surface_destroy (fade->priv->start_surface);
- fade->priv->start_surface = NULL;
-
- if (fade->priv->widget != NULL) {
- g_signal_handlers_disconnect_by_func (fade->priv->widget,
- (GCallback) on_widget_draw,
- fade);
- }
- fade->priv->widget = NULL;
-
- fade->priv->timeout_id = 0;
- g_signal_emit (fade, signals[FINISHED], 0, fade->priv->window);
-}
-
-/* This function queries the _XROOTPMAP_ID property from the root window
- * to determine the current root window background pixmap and returns a
- * surface to draw directly to it.
- * If _XROOTPMAP_ID is not set, then NULL returned.
- */
-static cairo_surface_t *
-get_root_pixmap_id_surface (GdkDisplay *display)
-{
- GdkScreen *screen;
- Display *xdisplay;
- Visual *xvisual;
- Window xroot;
- Atom type;
- int format, result;
- unsigned long nitems, bytes_after;
- unsigned char *data;
- cairo_surface_t *surface = NULL;
-
- g_return_val_if_fail (display != NULL, NULL);
-
- screen = gdk_display_get_default_screen (display);
- xdisplay = GDK_DISPLAY_XDISPLAY (display);
- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_system_visual (screen));
- xroot = RootWindow (xdisplay, GDK_SCREEN_XNUMBER (screen));
-
- result = XGetWindowProperty (xdisplay, xroot,
- gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"),
- 0L, 1L, False, XA_PIXMAP,
- &type, &format, &nitems, &bytes_after,
- &data);
-
- if (result != Success || type != XA_PIXMAP ||
- format != 32 || nitems != 1) {
- XFree (data);
- data = NULL;
- }
-
- if (data != NULL) {
- Pixmap pixmap = *(Pixmap *) data;
- Window root_ret;
- int x_ret, y_ret;
- unsigned int w_ret, h_ret, bw_ret, depth_ret;
-
- gdk_x11_display_error_trap_push (display);
- if (XGetGeometry (xdisplay, pixmap, &root_ret,
- &x_ret, &y_ret, &w_ret, &h_ret,
- &bw_ret, &depth_ret))
- {
- surface = cairo_xlib_surface_create (xdisplay,
- pixmap, xvisual,
- w_ret, h_ret);
- }
-
- gdk_x11_display_error_trap_pop_ignored (display);
- XFree (data);
- }
-
- gdk_display_flush (display);
- return surface;
-}
-
-/**
- * xfce_bg_crossfade_start:
- * @fade: a #XfceBGCrossfade
- * @window: The #GdkWindow to draw crossfade on
- *
- * This function initiates a quick crossfade between two surfaces on
- * the background of @window. Before initiating the crossfade both
- * xfce_bg_crossfade_set_start_surface() and
- * xfce_bg_crossfade_set_end_surface() need to be called. If animations
- * are disabled, the crossfade is skipped, and the window background is
- * set immediately to the end surface.
- **/
-void
-xfce_bg_crossfade_start (XfceBGCrossfade *fade,
- GdkWindow *window)
-{
- GSource *source;
- GMainContext *context;
-
- g_return_if_fail (XFCE_IS_BG_CROSSFADE (fade));
- g_return_if_fail (window != NULL);
- g_return_if_fail (fade->priv->start_surface != NULL);
- g_return_if_fail (fade->priv->end_surface != NULL);
- g_return_if_fail (!xfce_bg_crossfade_is_started (fade));
- g_return_if_fail (gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN);
-
- /* If drawing is done on the root window,
- * it is essential to have the root pixmap.
- */
- if (gdk_window_get_window_type (window) == GDK_WINDOW_ROOT) {
- GdkDisplay *display = gdk_window_get_display (window);
- cairo_surface_t *surface = get_root_pixmap_id_surface (display);
-
- g_return_if_fail (surface != NULL);
- cairo_surface_destroy (surface);
- }
-
- if (fade->priv->fading_surface != NULL) {
- cairo_surface_destroy (fade->priv->fading_surface);
- fade->priv->fading_surface = NULL;
- }
-
- fade->priv->window = window;
- if (gdk_window_get_window_type (fade->priv->window) != GDK_WINDOW_ROOT) {
- fade->priv->fading_surface = tile_surface (fade->priv->start_surface,
- fade->priv->width,
- fade->priv->height);
- if (fade->priv->widget != NULL) {
- g_signal_connect (fade->priv->widget, "draw",
- (GCallback) on_widget_draw, fade);
- }
- } else {
- cairo_t *cr;
- GdkDisplay *display = gdk_window_get_display (fade->priv->window);
-
- fade->priv->fading_surface = get_root_pixmap_id_surface (display);
- cr = cairo_create (fade->priv->fading_surface);
- cairo_set_source_surface (cr, fade->priv->start_surface, 0, 0);
- cairo_paint (cr);
- cairo_destroy (cr);
- }
- draw_background (fade);
-
- source = g_timeout_source_new (1000 / 60.0);
- g_source_set_callback (source,
- (GSourceFunc) on_tick,
- fade,
- (GDestroyNotify) on_finished);
- context = g_main_context_default ();
- fade->priv->timeout_id = g_source_attach (source, context);
- g_source_unref (source);
-
- fade->priv->is_first_frame = TRUE;
- fade->priv->total_duration = .75;
- fade->priv->start_time = get_current_time ();
-}
-
-/**
- * xfce_bg_crossfade_start_widget:
- * @fade: a #XfceBGCrossfade
- * @widget: The #GtkWidget to draw crossfade on
- *
- * This function initiates a quick crossfade between two surfaces on
- * the background of @widget. Before initiating the crossfade both
- * xfce_bg_crossfade_set_start_surface() and
- * xfce_bg_crossfade_set_end_surface() need to be called. If animations
- * are disabled, the crossfade is skipped, and the window background is
- * set immediately to the end surface.
- **/
-void
-xfce_bg_crossfade_start_widget (XfceBGCrossfade *fade,
- GtkWidget *widget)
-{
- GdkWindow *window;
-
- g_return_if_fail (XFCE_IS_BG_CROSSFADE (fade));
- g_return_if_fail (widget != NULL);
-
- fade->priv->widget = widget;
- gtk_widget_realize (fade->priv->widget);
- window = gtk_widget_get_window (fade->priv->widget);
-
- xfce_bg_crossfade_start (fade, window);
-}
-
-/**
- * xfce_bg_crossfade_is_started:
- * @fade: a #XfceBGCrossfade
- *
- * This function reveals whether or not @fade is currently
- * running on a window. See xfce_bg_crossfade_start() for
- * information on how to initiate a crossfade.
- *
- * Return value: %TRUE if fading, or %FALSE if not fading
- **/
-gboolean
-xfce_bg_crossfade_is_started (XfceBGCrossfade *fade)
-{
- g_return_val_if_fail (XFCE_IS_BG_CROSSFADE (fade), FALSE);
-
- return fade->priv->timeout_id != 0;
-}
-
-/**
- * xfce_bg_crossfade_stop:
- * @fade: a #XfceBGCrossfade
- *
- * This function stops any in progress crossfades that may be
- * happening. It's harmless to call this function if @fade is
- * already stopped.
- **/
-void
-xfce_bg_crossfade_stop (XfceBGCrossfade *fade)
-{
- g_return_if_fail (XFCE_IS_BG_CROSSFADE (fade));
-
- if (!xfce_bg_crossfade_is_started (fade))
- return;
-
- g_assert (fade->priv->timeout_id != 0);
- g_source_remove (fade->priv->timeout_id);
- fade->priv->timeout_id = 0;
-}
diff --git a/src/xfce-bg-crossfade.h b/src/xfce-bg-crossfade.h
deleted file mode 100644
index 7b19693..0000000
--- a/src/xfce-bg-crossfade.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* xfce-bg-crossfade.h - fade window background between two pixmaps
-
- Copyright 2008, Red Hat, Inc.
-
- This file is part of the Mate Library.
-
- The Mate 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 Mate 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 Mate Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- Floor, Boston, MA 02110-1301 US.
-
- Author: Ray Strode <rstrode at redhat.com>
-*/
-
-#ifndef __XFCE_BG_CROSSFADE_H__
-#define __XFCE_BG_CROSSFADE_H__
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define XFCE_TYPE_BG_CROSSFADE (xfce_bg_crossfade_get_type ())
-#define XFCE_BG_CROSSFADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_BG_CROSSFADE, XfceBGCrossfade))
-#define XFCE_BG_CROSSFADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_BG_CROSSFADE, XfceBGCrossfadeClass))
-#define XFCE_IS_BG_CROSSFADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_BG_CROSSFADE))
-#define XFCE_IS_BG_CROSSFADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_BG_CROSSFADE))
-#define XFCE_BG_CROSSFADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_BG_CROSSFADE, XfceBGCrossfadeClass))
-
-typedef struct _XfceBGCrossfadePrivate XfceBGCrossfadePrivate;
-typedef struct _XfceBGCrossfade XfceBGCrossfade;
-typedef struct _XfceBGCrossfadeClass XfceBGCrossfadeClass;
-
-struct _XfceBGCrossfade
-{
- GObject parent_object;
-
- XfceBGCrossfadePrivate *priv;
-};
-
-struct _XfceBGCrossfadeClass
-{
- GObjectClass parent_class;
-
- void (* finished) (XfceBGCrossfade *fade, GdkWindow *window);
-};
-
-GType xfce_bg_crossfade_get_type (void);
-XfceBGCrossfade *xfce_bg_crossfade_new (int width, int height);
-
-gboolean xfce_bg_crossfade_set_start_surface (XfceBGCrossfade *fade,
- cairo_surface_t *surface);
-gboolean xfce_bg_crossfade_set_end_surface (XfceBGCrossfade *fade,
- cairo_surface_t *surface);
-
-void xfce_bg_crossfade_start (XfceBGCrossfade *fade,
- GdkWindow *window);
-void xfce_bg_crossfade_start_widget (XfceBGCrossfade *fade,
- GtkWidget *widget);
-gboolean xfce_bg_crossfade_is_started (XfceBGCrossfade *fade);
-void xfce_bg_crossfade_stop (XfceBGCrossfade *fade);
-
-G_END_DECLS
-
-#endif
diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index fb8be1f..dab363f 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -44,7 +44,6 @@ Authors: Soren Sandmann <sandmann at redhat.com>
#include <cairo.h>
#include <xfce-bg.h>
-#include <xfce-bg-crossfade.h>
# include <cairo-xlib.h>
diff --git a/src/xfce-bg.h b/src/xfce-bg.h
index 647dae0..5d44640 100644
--- a/src/xfce-bg.h
+++ b/src/xfce-bg.h
@@ -31,7 +31,6 @@
#include <gdk/gdk.h>
#include <gio/gio.h>
#include "xfce-desktop-thumbnail.h"
-#include "xfce-bg-crossfade.h"
G_BEGIN_DECLS
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list