Move icon related methods to icon.c

The first step to cleaning out x.c.

src/icon.c

@@ -0,0 +1,145 @@
+#include "icon.h"
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "log.h"
+#include "notification.h"
+#include "settings.h"
+
+static bool does_file_exist(const char *filename)
+{
+        return (access(filename, F_OK) != -1);
+}
+
+static bool is_readable_file(const char *filename)
+{
+        return (access(filename, R_OK) != -1);
+}
+
+const char *get_filename_ext(const char *filename)
+{
+        const char *dot = strrchr(filename, '.');
+        if (!dot || dot == filename) return "";
+        return dot + 1;
+}
+
+static cairo_status_t read_from_buf(void *closure, unsigned char *data, unsigned int size)
+{
+        GByteArray *buf = (GByteArray *)closure;
+
+        unsigned int cpy = MIN(size, buf->len);
+        memcpy(data, buf->data, cpy);
+        g_byte_array_remove_range(buf, 0, cpy);
+
+        return CAIRO_STATUS_SUCCESS;
+}
+
+
+cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf)
+{
+        /*
+         * Export the gdk pixbuf into buffer as a png and import the png buffer
+         * via cairo again as a cairo_surface_t.
+         * It looks counterintuitive, as there is gdk_cairo_set_source_pixbuf,
+         * which does the job faster. But this would require gtk3 as a dependency
+         * for a single function call. See discussion in #334 and #376.
+         */
+        cairo_surface_t *icon_surface = NULL;
+        GByteArray *buffer;
+        char *bufstr;
+        gsize buflen;
+
+        gdk_pixbuf_save_to_buffer(pixbuf, &bufstr, &buflen, "png", NULL, NULL);
+
+        buffer = g_byte_array_new_take((guint8*)bufstr, buflen);
+        icon_surface = cairo_image_surface_create_from_png_stream(read_from_buf, buffer);
+
+        g_byte_array_free(buffer, TRUE);
+
+        return icon_surface;
+}
+
+static GdkPixbuf *get_pixbuf_from_file(const char *icon_path)
+{
+        GdkPixbuf *pixbuf = NULL;
+        if (is_readable_file(icon_path)) {
+                GError *error = NULL;
+                pixbuf = gdk_pixbuf_new_from_file(icon_path, &error);
+                if (pixbuf == NULL)
+                        g_error_free(error);
+        }
+        return pixbuf;
+}
+
+GdkPixbuf *get_pixbuf_from_path(char *icon_path)
+{
+        GdkPixbuf *pixbuf = NULL;
+        gchar *uri_path = NULL;
+        if (strlen(icon_path) > 0) {
+                if (g_str_has_prefix(icon_path, "file://")) {
+                        uri_path = g_filename_from_uri(icon_path, NULL, NULL);
+                        if (uri_path != NULL) {
+                                icon_path = uri_path;
+                        }
+                }
+                /* absolute path? */
+                if (icon_path[0] == '/' || icon_path[0] == '~') {
+                        pixbuf = get_pixbuf_from_file(icon_path);
+                }
+                /* search in icon_path */
+                if (pixbuf == NULL) {
+                        char *start = settings.icon_path,
+                             *end, *current_folder, *maybe_icon_path;
+                        do {
+                                end = strchr(start, ':');
+                                if (end == NULL) end = strchr(settings.icon_path, '\0'); /* end = end of string */
+
+                                current_folder = g_strndup(start, end - start);
+                                /* try svg */
+                                maybe_icon_path = g_strconcat(current_folder, "/", icon_path, ".svg", NULL);
+                                if (!does_file_exist(maybe_icon_path)) {
+                                        g_free(maybe_icon_path);
+                                        /* fallback to png */
+                                        maybe_icon_path = g_strconcat(current_folder, "/", icon_path, ".png", NULL);
+                                }
+                                g_free(current_folder);
+
+                                pixbuf = get_pixbuf_from_file(maybe_icon_path);
+                                g_free(maybe_icon_path);
+                                if (pixbuf != NULL) {
+                                        return pixbuf;
+                                }
+
+                                start = end + 1;
+                        } while (*(end) != '\0');
+                }
+                if (pixbuf == NULL) {
+                        LOG_W("Could not load icon: '%s'", icon_path);
+                }
+                if (uri_path != NULL) {
+                        g_free(uri_path);
+                }
+        }
+        return pixbuf;
+}
+
+GdkPixbuf *get_pixbuf_from_raw_image(const RawImage *raw_image)
+{
+        GdkPixbuf *pixbuf = NULL;
+
+        pixbuf = gdk_pixbuf_new_from_data(raw_image->data,
+                                          GDK_COLORSPACE_RGB,
+                                          raw_image->has_alpha,
+                                          raw_image->bits_per_sample,
+                                          raw_image->width,
+                                          raw_image->height,
+                                          raw_image->rowstride,
+                                          NULL,
+                                          NULL);
+
+        return pixbuf;
+}
+/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

src/icon.h

@@ -0,0 +1,14 @@
+#ifndef DUNST_ICON_H
+#define DUNST_ICON_H
+
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "notification.h"
+
+cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf);
+GdkPixbuf *get_pixbuf_from_path(char *icon_path);
+GdkPixbuf *get_pixbuf_from_raw_image(const RawImage *raw_image);
+
+#endif
+/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

src/x11/x.c

@@ -9,7 +9,6 @@
 #include <assert.h>
 #include <cairo-xlib.h>
 #include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib-object.h>
 #include <locale.h>
 #include <math.h>
@@ -26,6 +25,7 @@
 
 #include "src/dbus.h"
 #include "src/dunst.h"
+#include "src/icon.h"
 #include "src/log.h"
 #include "src/markup.h"
 #include "src/notification.h"
@@ -187,23 +187,6 @@ static bool have_dynamic_width(void)
         return (xctx.geometry.mask & WidthValue && xctx.geometry.w == 0);
 }
 
-static bool does_file_exist(const char *filename)
-{
-        return (access(filename, F_OK) != -1);
-}
-
-static bool is_readable_file(const char *filename)
-{
-        return (access(filename, R_OK) != -1);
-}
-
-const char *get_filename_ext(const char *filename)
-{
-        const char *dot = strrchr(filename, '.');
-        if (!dot || dot == filename) return "";
-        return dot + 1;
-}
-
 static dimension_t calculate_dimensions(GSList *layouts)
 {
         dimension_t dim;
@@ -287,123 +270,6 @@ static dimension_t calculate_dimensions(GSList *layouts)
         return dim;
 }
 
-static cairo_status_t read_from_buf(void *closure, unsigned char *data, unsigned int size)
-{
-        GByteArray *buf = (GByteArray *)closure;
-
-        unsigned int cpy = MIN(size, buf->len);
-        memcpy(data, buf->data, cpy);
-        g_byte_array_remove_range(buf, 0, cpy);
-
-        return CAIRO_STATUS_SUCCESS;
-}
-
-
-static cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf)
-{
-        /*
-         * Export the gdk pixbuf into buffer as a png and import the png buffer
-         * via cairo again as a cairo_surface_t.
-         * It looks counterintuitive, as there is gdk_cairo_set_source_pixbuf,
-         * which does the job faster. But this would require gtk3 as a dependency
-         * for a single function call. See discussion in #334 and #376.
-         */
-        cairo_surface_t *icon_surface = NULL;
-        GByteArray *buffer;
-        char *bufstr;
-        gsize buflen;
-
-        gdk_pixbuf_save_to_buffer(pixbuf, &bufstr, &buflen, "png", NULL, NULL);
-
-        buffer = g_byte_array_new_take((guint8*)bufstr, buflen);
-        icon_surface = cairo_image_surface_create_from_png_stream(read_from_buf, buffer);
-
-        g_byte_array_free(buffer, TRUE);
-
-        return icon_surface;
-}
-
-static GdkPixbuf *get_pixbuf_from_file(const char *icon_path)
-{
-        GdkPixbuf *pixbuf = NULL;
-        if (is_readable_file(icon_path)) {
-                GError *error = NULL;
-                pixbuf = gdk_pixbuf_new_from_file(icon_path, &error);
-                if (pixbuf == NULL)
-                        g_error_free(error);
-        }
-        return pixbuf;
-}
-
-static GdkPixbuf *get_pixbuf_from_path(char *icon_path)
-{
-        GdkPixbuf *pixbuf = NULL;
-        gchar *uri_path = NULL;
-        if (strlen(icon_path) > 0) {
-                if (g_str_has_prefix(icon_path, "file://")) {
-                        uri_path = g_filename_from_uri(icon_path, NULL, NULL);
-                        if (uri_path != NULL) {
-                                icon_path = uri_path;
-                        }
-                }
-                /* absolute path? */
-                if (icon_path[0] == '/' || icon_path[0] == '~') {
-                        pixbuf = get_pixbuf_from_file(icon_path);
-                }
-                /* search in icon_path */
-                if (pixbuf == NULL) {
-                        char *start = settings.icon_path,
-                             *end, *current_folder, *maybe_icon_path;
-                        do {
-                                end = strchr(start, ':');
-                                if (end == NULL) end = strchr(settings.icon_path, '\0'); /* end = end of string */
-
-                                current_folder = g_strndup(start, end - start);
-                                /* try svg */
-                                maybe_icon_path = g_strconcat(current_folder, "/", icon_path, ".svg", NULL);
-                                if (!does_file_exist(maybe_icon_path)) {
-                                        g_free(maybe_icon_path);
-                                        /* fallback to png */
-                                        maybe_icon_path = g_strconcat(current_folder, "/", icon_path, ".png", NULL);
-                                }
-                                g_free(current_folder);
-
-                                pixbuf = get_pixbuf_from_file(maybe_icon_path);
-                                g_free(maybe_icon_path);
-                                if (pixbuf != NULL) {
-                                        return pixbuf;
-                                }
-
-                                start = end + 1;
-                        } while (*(end) != '\0');
-                }
-                if (pixbuf == NULL) {
-                        LOG_W("Could not load icon: '%s'", icon_path);
-                }
-                if (uri_path != NULL) {
-                        g_free(uri_path);
-                }
-        }
-        return pixbuf;
-}
-
-static GdkPixbuf *get_pixbuf_from_raw_image(const RawImage *raw_image)
-{
-        GdkPixbuf *pixbuf = NULL;
-
-        pixbuf = gdk_pixbuf_new_from_data(raw_image->data,
-                                          GDK_COLORSPACE_RGB,
-                                          raw_image->has_alpha,
-                                          raw_image->bits_per_sample,
-                                          raw_image->width,
-                                          raw_image->height,
-                                          raw_image->rowstride,
-                                          NULL,
-                                          NULL);
-
-        return pixbuf;
-}
-
 static PangoLayout *create_layout(cairo_t *c)
 {
         screen_info *screen = get_active_screen();