diff options
author | Stefano Karapetsas <[email protected]> | 2014-05-18 12:22:36 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2014-05-18 12:22:36 +0200 |
commit | e964b756355ad5e66a0166d9ca218bdde2054f6d (patch) | |
tree | 6e954f241ce09e6ca540e7cafa92a035f45be113 /applets/clock | |
parent | 4e757f98c0e977032a2ad4576455aa6407e7537a (diff) | |
download | mate-panel-e964b756355ad5e66a0166d9ca218bdde2054f6d.tar.bz2 mate-panel-e964b756355ad5e66a0166d9ca218bdde2054f6d.tar.xz |
clock: Dont use deprecated rsvg_pixbuf_from_file_at_size
This required to copy some code from GTK3 source to make it working with GTK2 too
Thanks to Sander Sweers for the help to replace rsvg_pixbuf_from_file_at_size
Diffstat (limited to 'applets/clock')
-rw-r--r-- | applets/clock/clock-face.c | 12 | ||||
-rw-r--r-- | applets/clock/clock-utils.c | 204 | ||||
-rw-r--r-- | applets/clock/clock-utils.h | 2 |
3 files changed, 209 insertions, 9 deletions
diff --git a/applets/clock/clock-face.c b/applets/clock/clock-face.c index 25c0b182..558201ab 100644 --- a/applets/clock/clock-face.c +++ b/applets/clock/clock-face.c @@ -15,10 +15,9 @@ #include <math.h> #include <time.h> -#include <librsvg/rsvg.h> - #include "clock-face.h" #include "clock-location.h" +#include "clock-utils.h" static GHashTable *pixbuf_cache = NULL; @@ -506,18 +505,13 @@ clock_face_load_face (ClockFace *this, gint width, gint height) name = g_strconcat (ICONDIR, "/clock-face-", size_string[priv->size], "-", daytime_string[priv->timeofday], ".svg", NULL); - priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name, - width, height, - NULL); + priv->face_pixbuf = clock_utils_pixbuf_from_svg_file_at_size (name, width, height); g_free (name); if (!priv->face_pixbuf) { name = g_strconcat (ICONDIR, "/clock-face-", size_string[priv->size], ".svg", NULL); - priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name, - width, - height, - NULL); + priv->face_pixbuf = clock_utils_pixbuf_from_svg_file_at_size (name, width, height); g_free (name); } diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c index d0dfe2de..4ba93fef 100644 --- a/applets/clock/clock-utils.c +++ b/applets/clock/clock-utils.c @@ -34,6 +34,9 @@ #include <gtk/gtk.h> +#include <librsvg/rsvg.h> +#include <librsvg/rsvg-cairo.h> + #include "clock.h" #include "clock-utils.h" @@ -125,3 +128,204 @@ clock_utils_display_help (GtkWidget *widget, gtk_widget_show (dialog); } } + +#if !GTK_CHECK_VERSION (3, 0, 0) +/* code copied from GTK3 gdkpixbuf-drawable.c */ +static cairo_format_t +gdk_cairo_format_for_content (cairo_content_t content) +{ + switch (content) + { + case CAIRO_CONTENT_COLOR: + return CAIRO_FORMAT_RGB24; + case CAIRO_CONTENT_ALPHA: + return CAIRO_FORMAT_A8; + case CAIRO_CONTENT_COLOR_ALPHA: + default: + return CAIRO_FORMAT_ARGB32; + } +} + +static cairo_surface_t * +gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, + cairo_content_t content, + int src_x, + int src_y, + int width, + int height) +{ + cairo_surface_t *copy; + cairo_t *cr; + + copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), + width, + height); + + cr = cairo_create (copy); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_surface (cr, surface, -src_x, -src_y); + cairo_paint (cr); + cairo_destroy (cr); + + return copy; +} + +static void +convert_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + guint alpha = src[x] >> 24; + + if (alpha == 0) + { + dest_data[x * 4 + 0] = 0; + dest_data[x * 4 + 1] = 0; + dest_data[x * 4 + 2] = 0; + } + else + { + dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; + dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; + } + dest_data[x * 4 + 3] = alpha; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +static void +convert_no_alpha (guchar *dest_data, + int dest_stride, + guchar *src_data, + int src_stride, + int src_x, + int src_y, + int width, + int height) +{ + int x, y; + + src_data += src_stride * src_y + src_x * 4; + + for (y = 0; y < height; y++) { + guint32 *src = (guint32 *) src_data; + + for (x = 0; x < width; x++) { + dest_data[x * 3 + 0] = src[x] >> 16; + dest_data[x * 3 + 1] = src[x] >> 8; + dest_data[x * 3 + 2] = src[x]; + } + + src_data += src_stride; + dest_data += dest_stride; + } +} + +GdkPixbuf * +gdk_pixbuf_get_from_surface (cairo_surface_t *surface, + gint src_x, + gint src_y, + gint width, + gint height) +{ + cairo_content_t content; + GdkPixbuf *dest; + + /* General sanity checks */ + g_return_val_if_fail (surface != NULL, NULL); + g_return_val_if_fail (width > 0 && height > 0, NULL); + + content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + !!(content & CAIRO_CONTENT_ALPHA), + 8, + width, height); + + if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE && + cairo_image_surface_get_format (surface) == gdk_cairo_format_for_content (content)) + surface = cairo_surface_reference (surface); + else + { + surface = gdk_cairo_surface_coerce_to_image (surface, content, + src_x, src_y, + width, height); + src_x = 0; + src_y = 0; + } + cairo_surface_flush (surface); + if (cairo_surface_status (surface) || dest == NULL) + { + cairo_surface_destroy (surface); + return NULL; + } + + if (gdk_pixbuf_get_has_alpha (dest)) + convert_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + src_x, src_y, + width, height); + else + convert_no_alpha (gdk_pixbuf_get_pixels (dest), + gdk_pixbuf_get_rowstride (dest), + cairo_image_surface_get_data (surface), + cairo_image_surface_get_stride (surface), + src_x, src_y, + width, height); + + cairo_surface_destroy (surface); + return dest; +} +#endif + +GdkPixbuf * +clock_utils_pixbuf_from_svg_file_at_size (const char *name, int width, int height) +{ + RsvgHandle *handle = NULL; + RsvgDimensionData svg_dimensions; + GdkPixbuf *pixbuf = NULL; + cairo_surface_t *surface = NULL; + cairo_matrix_t matrix; + cairo_t *cr = NULL; + + handle = rsvg_handle_new_from_file (name, NULL); + if (!handle) + return NULL; + + rsvg_handle_get_dimensions (handle, &svg_dimensions); + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create (surface); + cairo_matrix_init_scale (&matrix, + ((double) width / svg_dimensions.width), + ((double) height / svg_dimensions.height)); + cairo_transform (cr, &matrix); + rsvg_handle_render_cairo (handle, cr); + cairo_destroy (cr); + + pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height); + cairo_surface_destroy (surface); + + rsvg_handle_close (handle, NULL); + + return pixbuf; +} + diff --git a/applets/clock/clock-utils.h b/applets/clock/clock-utils.h index da54094f..647f7222 100644 --- a/applets/clock/clock-utils.h +++ b/applets/clock/clock-utils.h @@ -50,6 +50,8 @@ void clock_utils_display_help (GtkWidget *widget, const char *doc_id, const char *link_id); +GdkPixbuf * clock_utils_pixbuf_from_svg_file_at_size (const char *name, int width, int height); + #ifdef __cplusplus } #endif |