From e8a1ebe5d43b3239ba2d5d9c4ee51692edfbdf79 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 7 Aug 2019 12:54:33 +0200 Subject: mate-bg-crossfade: replace tabs with spaces fixes codestyling, caused by usage of different tab size in editors. --- libmate-desktop/mate-bg-crossfade.c | 906 ++++++++++++++++++------------------ libmate-desktop/mate-bg-crossfade.h | 16 +- 2 files changed, 461 insertions(+), 461 deletions(-) diff --git a/libmate-desktop/mate-bg-crossfade.c b/libmate-desktop/mate-bg-crossfade.c index 78e9b83..3e77e5f 100644 --- a/libmate-desktop/mate-bg-crossfade.c +++ b/libmate-desktop/mate-bg-crossfade.c @@ -40,28 +40,28 @@ struct _MateBGCrossfadePrivate { - 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; + 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, + PROP_0, + PROP_WIDTH, + PROP_HEIGHT, }; enum { - FINISHED, - NUMBER_OF_SIGNALS + FINISHED, + NUMBER_OF_SIGNALS }; static guint signals[NUMBER_OF_SIGNALS] = { 0 }; @@ -70,147 +70,147 @@ G_DEFINE_TYPE_WITH_PRIVATE (MateBGCrossfade, mate_bg_crossfade, G_TYPE_OBJECT) static void mate_bg_crossfade_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) + guint property_id, + const GValue *value, + GParamSpec *pspec) { - MateBGCrossfade *fade; - - g_assert (MATE_IS_BG_CROSSFADE (object)); - - fade = MATE_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; - } + MateBGCrossfade *fade; + + g_assert (MATE_IS_BG_CROSSFADE (object)); + + fade = MATE_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 mate_bg_crossfade_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) + guint property_id, + GValue *value, + GParamSpec *pspec) { - MateBGCrossfade *fade; + MateBGCrossfade *fade; - g_assert (MATE_IS_BG_CROSSFADE (object)); + g_assert (MATE_IS_BG_CROSSFADE (object)); - fade = MATE_BG_CROSSFADE (object); + fade = MATE_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; + 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; - } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void mate_bg_crossfade_finalize (GObject *object) { - MateBGCrossfade *fade; + MateBGCrossfade *fade; - fade = MATE_BG_CROSSFADE (object); + fade = MATE_BG_CROSSFADE (object); - mate_bg_crossfade_stop (fade); + mate_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->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->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; - } + if (fade->priv->end_surface != NULL) { + cairo_surface_destroy (fade->priv->end_surface); + fade->priv->end_surface = NULL; + } } static void mate_bg_crossfade_class_init (MateBGCrossfadeClass *fade_class) { - GObjectClass *gobject_class; - - gobject_class = G_OBJECT_CLASS (fade_class); - - gobject_class->get_property = mate_bg_crossfade_get_property; - gobject_class->set_property = mate_bg_crossfade_set_property; - gobject_class->finalize = mate_bg_crossfade_finalize; - - /** - * MateBGCrossfade: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)); - - /** - * MateBGCrossfade: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)); - - /** - * MateBGCrossfade::finished: - * @fade: the #MateBGCrossfade 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); + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (fade_class); + + gobject_class->get_property = mate_bg_crossfade_get_property; + gobject_class->set_property = mate_bg_crossfade_set_property; + gobject_class->finalize = mate_bg_crossfade_finalize; + + /** + * MateBGCrossfade: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)); + + /** + * MateBGCrossfade: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)); + + /** + * MateBGCrossfade::finished: + * @fade: the #MateBGCrossfade 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); } static void mate_bg_crossfade_init (MateBGCrossfade *fade) { - fade->priv = mate_bg_crossfade_get_instance_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; + fade->priv = mate_bg_crossfade_get_instance_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; } /** @@ -225,14 +225,14 @@ mate_bg_crossfade_init (MateBGCrossfade *fade) **/ MateBGCrossfade* mate_bg_crossfade_new (int width, int height) { - GObject* object; + GObject* object; - object = g_object_new(MATE_TYPE_BG_CROSSFADE, - "width", width, - "height", height, - NULL); + object = g_object_new(MATE_TYPE_BG_CROSSFADE, + "width", width, + "height", height, + NULL); - return (MateBGCrossfade*) object; + return (MateBGCrossfade*) object; } static cairo_surface_t * @@ -240,55 +240,55 @@ 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; + 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; } /** @@ -306,34 +306,34 @@ tile_surface (cairo_surface_t *surface, gboolean mate_bg_crossfade_set_start_surface (MateBGCrossfade* fade, cairo_surface_t *surface) { - g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); + g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); - if (fade->priv->start_surface != NULL) - { - cairo_surface_destroy (fade->priv->start_surface); - fade->priv->start_surface = NULL; - } + 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); + fade->priv->start_surface = tile_surface (surface, + fade->priv->width, + fade->priv->height); - return fade->priv->start_surface != NULL; + 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; + const double microseconds_per_second = (double) G_USEC_PER_SEC; + double timestamp; + GTimeVal now; - g_get_current_time (&now); + g_get_current_time (&now); - timestamp = ((microseconds_per_second * now.tv_sec) + now.tv_usec) / - microseconds_per_second; + timestamp = ((microseconds_per_second * now.tv_sec) + now.tv_usec) / + microseconds_per_second; - return timestamp; + return timestamp; } /** @@ -351,39 +351,39 @@ get_current_time (void) gboolean mate_bg_crossfade_set_end_surface (MateBGCrossfade* fade, cairo_surface_t *surface) { - g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); + g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); - if (fade->priv->end_surface != NULL) { - cairo_surface_destroy (fade->priv->end_surface); - fade->priv->end_surface = NULL; - } + 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); + 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; + /* 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 (MateBGCrossfade *fade) { - GtkSettings *settings; - GdkScreen *screen; - gboolean are_enabled; + GtkSettings *settings; + GdkScreen *screen; + gboolean are_enabled; - g_assert (fade->priv->window != NULL); + g_assert (fade->priv->window != NULL); - screen = gdk_window_get_screen(fade->priv->window); + screen = gdk_window_get_screen(fade->priv->window); - settings = gtk_settings_get_for_screen (screen); + settings = gtk_settings_get_for_screen (screen); - g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL); + g_object_get (settings, "gtk-enable-animations", &are_enabled, NULL); - return !are_enabled; + return !are_enabled; } static void @@ -403,34 +403,34 @@ send_root_property_change_notification (MateBGCrossfade *fade) static void draw_background (MateBGCrossfade *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); - } + 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 @@ -438,108 +438,108 @@ on_widget_draw (GtkWidget *widget, cairo_t *cr, MateBGCrossfade *fade) { - g_assert (fade->priv->fading_surface != NULL); + 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); + 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; + return FALSE; } static gboolean on_tick (MateBGCrossfade *fade) { - gdouble now, percent_done; - cairo_t *cr; - cairo_status_t status; - - g_return_val_if_fail (MATE_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; + gdouble now, percent_done; + cairo_t *cr; + cairo_status_t status; + + g_return_val_if_fail (MATE_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 (MateBGCrossfade *fade) { - cairo_t *cr; + cairo_t *cr; - if (fade->priv->timeout_id == 0) - return; + if (fade->priv->timeout_id == 0) + return; - g_assert (fade->priv->fading_surface != NULL); - g_assert (fade->priv->end_surface != NULL); + 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); + 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->fading_surface); + fade->priv->fading_surface = NULL; - cairo_surface_destroy (fade->priv->end_surface); - fade->priv->end_surface = NULL; + cairo_surface_destroy (fade->priv->end_surface); + fade->priv->end_surface = NULL; - g_assert (fade->priv->start_surface != NULL); + g_assert (fade->priv->start_surface != NULL); - cairo_surface_destroy (fade->priv->start_surface); - 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; + 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); + 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 @@ -550,57 +550,57 @@ on_finished (MateBGCrossfade *fade) 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; + 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; } /** @@ -619,65 +619,65 @@ void mate_bg_crossfade_start (MateBGCrossfade *fade, GdkWindow *window) { - GSource *source; - GMainContext *context; - - g_return_if_fail (MATE_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 (!mate_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 (); + GSource *source; + GMainContext *context; + + g_return_if_fail (MATE_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 (!mate_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 (); } /** @@ -696,16 +696,16 @@ void mate_bg_crossfade_start_widget (MateBGCrossfade *fade, GtkWidget *widget) { - GdkWindow *window; + GdkWindow *window; - g_return_if_fail (MATE_IS_BG_CROSSFADE (fade)); - g_return_if_fail (widget != NULL); + g_return_if_fail (MATE_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); + fade->priv->widget = widget; + gtk_widget_realize (fade->priv->widget); + window = gtk_widget_get_window (fade->priv->widget); - mate_bg_crossfade_start (fade, window); + mate_bg_crossfade_start (fade, window); } /** @@ -721,9 +721,9 @@ mate_bg_crossfade_start_widget (MateBGCrossfade *fade, gboolean mate_bg_crossfade_is_started (MateBGCrossfade *fade) { - g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); + g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); - return fade->priv->timeout_id != 0; + return fade->priv->timeout_id != 0; } /** @@ -737,12 +737,12 @@ mate_bg_crossfade_is_started (MateBGCrossfade *fade) void mate_bg_crossfade_stop (MateBGCrossfade *fade) { - g_return_if_fail (MATE_IS_BG_CROSSFADE (fade)); + g_return_if_fail (MATE_IS_BG_CROSSFADE (fade)); - if (!mate_bg_crossfade_is_started (fade)) - return; + if (!mate_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; + g_assert (fade->priv->timeout_id != 0); + g_source_remove (fade->priv->timeout_id); + fade->priv->timeout_id = 0; } diff --git a/libmate-desktop/mate-bg-crossfade.h b/libmate-desktop/mate-bg-crossfade.h index af6b206..51a9241 100644 --- a/libmate-desktop/mate-bg-crossfade.h +++ b/libmate-desktop/mate-bg-crossfade.h @@ -48,25 +48,25 @@ typedef struct _MateBGCrossfadeClass MateBGCrossfadeClass; struct _MateBGCrossfade { - GObject parent_object; + GObject parent_object; - MateBGCrossfadePrivate *priv; + MateBGCrossfadePrivate *priv; }; struct _MateBGCrossfadeClass { - GObjectClass parent_class; + GObjectClass parent_class; - void (* finished) (MateBGCrossfade *fade, GdkWindow *window); + void (* finished) (MateBGCrossfade *fade, GdkWindow *window); }; -GType mate_bg_crossfade_get_type (void); -MateBGCrossfade *mate_bg_crossfade_new (int width, int height); +GType mate_bg_crossfade_get_type (void); +MateBGCrossfade *mate_bg_crossfade_new (int width, int height); gboolean mate_bg_crossfade_set_start_surface (MateBGCrossfade *fade, - cairo_surface_t *surface); + cairo_surface_t *surface); gboolean mate_bg_crossfade_set_end_surface (MateBGCrossfade *fade, - cairo_surface_t *surface); + cairo_surface_t *surface); void mate_bg_crossfade_start (MateBGCrossfade *fade, GdkWindow *window); -- cgit v1.2.1