Always compute the icon_id

Author: bynect

src/draw.c

@@ -47,7 +47,7 @@ void load_icon_themes(void)
                 char *theme = settings.icon_theme[i];
                 int theme_index = load_icon_theme(theme);
                 if (theme_index >= 0) {
-                        LOG_I("Adding theme %s", theme);
+                        LOG_I("Adding icon theme %s", theme);
                         add_default_theme(theme_index);
                         loaded_theme = true;
                 }

src/icon.c

@@ -183,11 +183,36 @@ static GdkPixbuf *icon_pixbuf_scale_to_size(GdkPixbuf *pixbuf, double dpi_scale,
         return pixbuf;
 }
 
-GdkPixbuf *get_pixbuf_from_file(const char *filename, int min_size, int max_size, double scale)
+static char *get_id_from_data(const uint8_t *data_pb, size_t width, size_t height, size_t pixelstride, size_t rowstride)
+{
+        /* To calculate a checksum of the current image, we have to remove
+         * all excess spacers, so that our checksummed memory only contains
+         * real data. */
+
+        size_t data_chk_len = pixelstride * width * height;
+        unsigned char *data_chk = g_malloc(data_chk_len);
+        size_t rowstride_short = pixelstride * width;
+
+        for (int i = 0; i < height; i++) {
+                memcpy(data_chk + (i*rowstride_short),
+                       data_pb  + (i*rowstride),
+                       rowstride_short);
+        }
+
+        char *id = g_compute_checksum_for_data(G_CHECKSUM_MD5, data_chk, data_chk_len);
+        g_free(data_chk);
+
+        return id;
+}
+
+GdkPixbuf *get_pixbuf_from_file(const char *filename, char **id, int min_size, int max_size, double scale)
 {
         GError *error = NULL;
         gint w, h;
 
+        ASSERT_OR_RET(filename, NULL);
+        ASSERT_OR_RET(id, NULL);
+
         if (!gdk_pixbuf_get_file_info (filename, &w, &h)) {
                 LOG_W("Failed to load image info for %s", STR_NN(filename));
                 return NULL;
@@ -206,6 +231,13 @@ GdkPixbuf *get_pixbuf_from_file(const char *filename, int min_size, int max_size
                 g_error_free(error);
         }
 
+        const uint8_t *data = gdk_pixbuf_get_pixels(pixbuf);
+        size_t rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+        size_t n_channels = gdk_pixbuf_get_n_channels(pixbuf);
+        size_t bits_per_sample = gdk_pixbuf_get_bits_per_sample(pixbuf);
+        size_t pixelstride = (n_channels * bits_per_sample + 7)/8;
+
+        *id = get_id_from_data(data, w, h, pixelstride, rowstride);
         return pixbuf;
 }
 
@@ -366,22 +398,9 @@ GdkPixbuf *icon_get_for_data(GVariant *data, char **id, double dpi_scale, int mi
                 return NULL;
         }
 
-        /* To calculate a checksum of the current image, we have to remove
-         * all excess spacers, so that our checksummed memory only contains
-         * real data. */
-        size_t data_chk_len = pixelstride * width * height;
-        unsigned char *data_chk = g_malloc(data_chk_len);
-        size_t rowstride_short = pixelstride * width;
-
-        for (int i = 0; i < height; i++) {
-                memcpy(data_chk + (i*rowstride_short),
-                       data_pb  + (i*rowstride),
-                       rowstride_short);
-        }
 
-        *id = g_compute_checksum_for_data(G_CHECKSUM_MD5, data_chk, data_chk_len);
+        *id = get_id_from_data(data_pb, width, height, pixelstride, rowstride);
 
-        g_free(data_chk);
         g_variant_unref(data_variant);
 
         pixbuf = icon_pixbuf_scale_to_size(pixbuf, dpi_scale, min_size, max_size);

src/icon.h

@@ -11,14 +11,16 @@ cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf);
 /** Retrieve an icon by its full filepath, scaled according to settings.
  *
  * @param filename A string representing a readable file path
+ * @param id   (necessary) A unique identifier of the returned pixbuf.
+ *             Only filled, if the return value is non-NULL.
  * @param min_size An iteger representing the desired minimum unscaled icon size.
  * @param max_size An iteger representing the desired maximum unscaled icon size.
  * @param scale An integer representing the output dpi scaling.
  *
  * @return an instance of `GdkPixbuf`
  * @retval NULL: file does not exist, not readable, etc..
  */
-GdkPixbuf *get_pixbuf_from_file(const char *filename, int min_size, int max_size, double scale);
+GdkPixbuf *get_pixbuf_from_file(const char *filename, char **id, int min_size, int max_size, double scale);
 
 
 /**

src/notification.c

@@ -60,7 +60,7 @@ void notification_print(const struct notification *n)
         printf("\traw_icon set: %s\n", (n->icon_id && !STR_EQ(n->iconname, n->icon_id)) ? "true" : "false");
         printf("\ticon_id: '%s'\n", STR_NN(n->icon_id));
         printf("\tdesktop_entry: '%s'\n", n->desktop_entry ? n->desktop_entry : "");
-        printf("\tcategory: %s\n", STR_NN(n->category));
+        printf("\tcategory: '%s'\n", STR_NN(n->category));
         printf("\ttimeout: %"G_GINT64_FORMAT"\n", n->timeout/1000);
         printf("\tstart: %"G_GINT64_FORMAT"\n", n->start);
         printf("\ttimestamp: %"G_GINT64_FORMAT"\n", n->timestamp);
@@ -77,17 +77,19 @@ void notification_print(const struct notification *n)
         g_free(grad);
 
         printf("\tfullscreen: %s\n", enum_to_string_fullscreen(n->fullscreen));
-        printf("\tformat: %s\n", STR_NN(n->format));
+        printf("\tformat: '%s'\n", STR_NN(n->format));
         printf("\tprogress: %d\n", n->progress);
-        printf("\tstack_tag: %s\n", (n->stack_tag ? n->stack_tag : ""));
+        printf("\tstack_tag: '%s'\n", (n->stack_tag ? n->stack_tag : ""));
         printf("\tid: %d\n", n->id);
         if (n->urls) {
                 char *urls = string_replace_all("\n", "\t\t\n", g_strdup(n->urls));
                 printf("\turls:\n");
                 printf("\t{\n");
-                printf("\t\t%s\n", STR_NN(urls));
+                printf("\t\t'%s'\n", STR_NN(urls));
                 printf("\t}\n");
                 g_free(urls);
+        } else {
+                printf("\turls: {}\n");
         }
         if (g_hash_table_size(n->actions) == 0) {
                 printf("\tactions: {}\n");
@@ -337,8 +339,12 @@ void notification_unref(struct notification *n)
 
 void notification_transfer_icon(struct notification *from, struct notification *to)
 {
-        if (from->iconname && to->iconname
-                        && strcmp(from->iconname, to->iconname) == 0){
+        if (from->iconname && to->iconname && STR_EQ(from->iconname, to->iconname)) {
+
+                // If possible check the icon id
+                if (from->icon_id && to->icon_id && !STR_EQ(from->icon_id, to->icon_id))
+                        return;
+
                 // Icons are the same. Transfer icon surface
                 to->icon = from->icon;
 
@@ -368,7 +374,7 @@ void notification_icon_replace_path(struct notification *n, const char *new_icon
         g_free(n->icon_path);
         n->icon_path = get_path_from_icon_name(new_icon, n->min_icon_size);
         if (n->icon_path) {
-                GdkPixbuf *pixbuf = get_pixbuf_from_file(n->icon_path,
+                GdkPixbuf *pixbuf = get_pixbuf_from_file(n->icon_path, &n->icon_id,
                                 n->min_icon_size, n->max_icon_size,
                                 draw_get_scale());
                 if (pixbuf) {

src/queues.c

@@ -193,8 +193,8 @@ int queues_notification_insert(struct notification *n)
         if (!inserted && STR_FULL(n->stack_tag) && queues_stack_by_tag(n))
                 inserted = true;
 
-        if (!inserted && settings.stack_duplicates && queues_stack_duplicate(n)){
-                if(settings.sort == SORT_TYPE_UPDATE){
+        if (!inserted && settings.stack_duplicates && queues_stack_duplicate(n)) {
+                if (settings.sort == SORT_TYPE_UPDATE) {
                         g_queue_sort(displayed, notification_cmp_data, NULL);
                 }
                 inserted = true;
@@ -203,6 +203,7 @@ int queues_notification_insert(struct notification *n)
         if (!inserted)
                 g_queue_insert_sorted(waiting, n, notification_cmp_data, NULL);
 
+        // The icon is loaded lazily
         if (!n->icon) {
                 notification_icon_replace_path(n, n->iconname);
         }

src/x11/x.c

@@ -766,7 +766,7 @@ void x_win_show(window winptr)
  */
 void x_win_hide(window winptr)
 {
-        LOG_I("X11: Hiding window");
+        LOG_I("Hiding X11 window");
         struct window_x11 *win = (struct window_x11*)winptr;
         ASSERT_OR_RET(win->visible,);
 

test/notification.c

@@ -156,6 +156,7 @@ static struct notification *notification_load_icon_with_scaling(int min_icon_siz
         n->min_icon_size = min_icon_size;
         n->max_icon_size = max_icon_size;
         notification_icon_replace_data(n, raw_icon);
+        assert(n->icon_id);
 
         g_variant_unref(raw_icon);
         g_free(path);