GTK+3 mate-bg: port GdkColor to GdkRGBA

author: raveit65 <[email protected]> 2016-06-14 17:42:52 +0200
committer: raveit65 <[email protected]> 2016-07-02 10:26:46 +0200
commit: b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec (patch)
tree: 5bc8fe048faed5889ea7e20d292113348290d195 /libmate-desktop
parent: 0be2ba2a81e8ce1f10af6891035d1c7a5d21a586 (diff)
download: mate-desktop-b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec.tar.bz2
mate-desktop-b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec.tar.xz
2 files changed, 91 insertions, 4 deletions
diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
index ac91a19..24c0776 100644
--- a/libmate-desktop/mate-bg.c
+++ b/libmate-desktop/mate-bg.c
@@ -101,8 +101,13 @@ struct _MateBG {
 char *filename;
 MateBGPlacement placement;
 MateBGColorType color_type;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA primary;
+ GdkRGBA secondary;
+#else
 GdkColor primary;
 GdkColor secondary;
+#endif
 gboolean is_enabled;
 
 GFileMonitor* file_monitor;
@@ -153,8 +158,13 @@ static GdkPixbuf *pixbuf_scale_to_min (GdkPixbuf *src,
 
 static void pixbuf_draw_gradient (GdkPixbuf *pixbuf,
 gboolean horizontal,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA *c1,
+ GdkRGBA *c2,
+#else
 GdkColor *c1,
 GdkColor *c2,
+#endif
 GdkRectangle *rect);
 
 static void pixbuf_tile (GdkPixbuf *src,
@@ -206,12 +216,35 @@ static FileSize *find_best_size (GSList *sizes,
 gint width,
 gint height);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+static void
+color_from_string (const char *string,
+ GdkRGBA *colorp)
+{
+ /* If all else fails use black */
+ gdk_rgba_parse (colorp, "#000000");
+
+ if (!string)
+ return;
+
+ gdk_rgba_parse (colorp, string);
+}
+
+static char *
+color_to_string (const GdkRGBA *color)
+{
+ return g_strdup_printf ("#%02x%02x%02x",
+ ((guint) (color->red * 65535)) >> 8,
+ ((guint) (color->green * 65535)) >> 8,
+ ((guint) (color->blue * 65535)) >> 8);
+}
+#else
 static void
 color_from_string (const char *string,
 GdkColor *colorp)
 {
 /* If all else fails use black */
- gdk_color_parse ("black", colorp);
+ gdk_color_parse ("#000000", colorp);
 
 if (!string)
 return;
@@ -227,6 +260,7 @@ color_to_string (const GdkColor *color)
 color->green >> 8,
 color->blue >> 8);
 }
+#endif
 
 static gboolean
 do_changed (MateBG *bg)
@@ -345,7 +379,11 @@ mate_bg_load_from_gsettings (MateBG *bg,
 char *tmp;
 char *filename;
 MateBGColorType ctype;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA c1, c2;
+#else
 GdkColor c1, c2;
+#endif
 MateBGPlacement placement;
 
 g_return_if_fail (MATE_IS_BG (bg));
@@ -533,15 +571,25 @@ mate_bg_new (void)
 void
 mate_bg_set_color (MateBG *bg,
 MateBGColorType type,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA *primary,
+ GdkRGBA *secondary)
+#else
 GdkColor *primary,
 GdkColor *secondary)
+#endif
 {
 g_return_if_fail (bg != NULL);
 g_return_if_fail (primary != NULL);
 
 if (bg->color_type != type ||
+#if GTK_CHECK_VERSION (3, 0, 0)
+ !gdk_rgba_equal (&bg->primary, primary) ||
+ (secondary && !gdk_rgba_equal (&bg->secondary, secondary))) {
+#else
 !gdk_color_equal (&bg->primary, primary) ||
 (secondary && !gdk_color_equal (&bg->secondary, secondary))) {
+#endif
 
 bg->color_type = type;
 bg->primary = *primary;
@@ -577,8 +625,13 @@ mate_bg_get_placement (MateBG *bg)
 void
 mate_bg_get_color (MateBG *bg,
 MateBGColorType *type,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA *primary,
+ GdkRGBA *secondary)
+#else
 GdkColor *primary,
 GdkColor *secondary)
+#endif
 {
 g_return_if_fail (bg != NULL);
 
@@ -820,9 +873,15 @@ draw_color_area (MateBG *bg,
 switch (bg->color_type) {
 case MATE_BG_COLOR_SOLID:
 /* not really a big deal to ignore the area of interest */
+#if GTK_CHECK_VERSION (3, 0, 0)
+ pixel = (((guint) bg->primary.red * 65535) >> 8) << 24 |
+ (((guint) bg->primary.green * 65535) >> 8) << 24 |
+ (((guint) bg->primary.blue * 65535) >> 8) << 24 |
+#else
 pixel = ((bg->primary.red >> 8) << 24) |
 ((bg->primary.green >> 8) << 16) |
 ((bg->primary.blue >> 8) << 8) |
+#endif
 (0xff);
 
 gdk_pixbuf_fill (dest, pixel);
@@ -1188,7 +1247,11 @@ mate_bg_create_pixmap (MateBG *bg,
 
 cr = cairo_create (surface);
 if (!bg->filename && bg->color_type == MATE_BG_COLOR_SOLID) {
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_cairo_set_source_rgba (cr, &(bg->primary));
+#else
 gdk_cairo_set_source_color (cr, &(bg->primary));
+#endif
 }
 else
 {
@@ -1217,7 +1280,11 @@ mate_bg_is_dark (MateBG *bg,
 int width,
 int height)
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA color;
+#else
 GdkColor color;
+#endif
 int intensity;
 GdkPixbuf *pixbuf;
 
@@ -1244,9 +1311,9 @@ mate_bg_is_dark (MateBG *bg,
 g_object_unref (pixbuf);
 }
 
- intensity = (color.red * 77 +
- color.green * 150 +
- color.blue * 28) >> 16;
+ intensity = ((guint) (color.red * 65535) * 77 +
+ (guint) (color.green * 65535) * 150 +
+ (guint) (color.blue * 65535) * 28) >> 16;
 
 return intensity < 160; /* biased slightly to be dark */
 }
@@ -2602,8 +2669,13 @@ pixbuf_scale_to_min (GdkPixbuf *src, int min_width, int min_height)
 }
 
 static guchar *
+#if GTK_CHECK_VERSION (3, 0, 0)
+create_gradient (const GdkRGBA *primary,
+ const GdkRGBA *secondary,
+#else
 create_gradient (const GdkColor *primary,
 const GdkColor *secondary,
+#endif
 int n_pixels)
 {
 guchar *result = g_malloc (n_pixels * 3);
@@ -2623,8 +2695,13 @@ create_gradient (const GdkColor *primary,
 static void
 pixbuf_draw_gradient (GdkPixbuf *pixbuf,
 gboolean horizontal,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA *primary,
+ GdkRGBA *secondary,
+#else
 GdkColor *primary,
 GdkColor *secondary,
+#endif
 GdkRectangle *rect)
 {
 int width;
diff --git a/libmate-desktop/mate-bg.h b/libmate-desktop/mate-bg.h
index 65152cd..1b612a6 100644
--- a/libmate-desktop/mate-bg.h
+++ b/libmate-desktop/mate-bg.h
@@ -102,8 +102,13 @@ void mate_bg_set_placement (MateBG *bg,
 MateBGPlacement placement);
 void mate_bg_set_color (MateBG *bg,
 MateBGColorType type,
+#if GTK_CHECK_VERSION(3, 0, 0)
+ GdkRGBA *primary,
+ GdkRGBA *secondary);
+#else
 GdkColor *primary,
 GdkColor *secondary);
+#endif
 void mate_bg_set_draw_background (MateBG *bg,
 gboolean draw_background);
 /* Getters */
@@ -111,8 +116,13 @@ gboolean mate_bg_get_draw_background (MateBG *bg);
 MateBGPlacement mate_bg_get_placement (MateBG *bg);
 void mate_bg_get_color (MateBG *bg,
 MateBGColorType *type,
+#if GTK_CHECK_VERSION(3, 0, 0)
+ GdkRGBA *primary,
+ GdkRGBA *secondary);
+#else
 GdkColor *primary,
 GdkColor *secondary);
+#endif
 const gchar * mate_bg_get_filename (MateBG *bg);
 
 /* Drawing and thumbnailing */
author	raveit65 <[email protected]>	2016-06-14 17:42:52 +0200
committer	raveit65 <[email protected]>	2016-07-02 10:26:46 +0200
commit	b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec (patch)
tree	5bc8fe048faed5889ea7e20d292113348290d195 /libmate-desktop
parent	0be2ba2a81e8ce1f10af6891035d1c7a5d21a586 (diff)
download	mate-desktop-b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec.tar.bz2 mate-desktop-b9b4ff6d1e0b977ce815561f1b8ea16f7ce16aec.tar.xz