sni: support pixmaps

Author: ianyfan

include/swaybar/tray/item.h

@@ -5,9 +5,15 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "swaybar/tray/tray.h"
+#include "list.h"
 
 struct swaybar_output;
 
+struct swaybar_pixmap {
+	int size;
+	unsigned char pixels[];
+};
+
 struct swaybar_sni {
 	// icon properties
 	struct swaybar_tray *tray;
@@ -23,7 +29,9 @@ struct swaybar_sni {
 
 	char *status;
 	char *icon_name;
+	list_t *icon_pixmap; // struct pixmap *
 	char *attention_icon_name;
+	list_t *attention_icon_pixmap; // struct pixmap *
 	bool item_is_menu;
 	char *menu;
 };

swaybar/tray/item.c

@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <cairo.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "swaybar/bar.h"
@@ -11,11 +12,72 @@
 #include "swaybar/tray/tray.h"
 #include "background-image.h"
 #include "cairo.h"
+#include "list.h"
 #include "log.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 // TODO implement menu, and use IconThemePath
 
+static void sni_get_pixmap(struct swaybar_sni *sni, char *prop, list_t **dest) {
+	sd_bus_error error = SD_BUS_ERROR_NULL;
+	sd_bus_message *msg;
+	int ret = sd_bus_get_property(sni->tray->bus, sni->service, sni->path,
+			sni->interface, prop, &error, &msg, "a(iiay)");
+	if (ret < 0) {
+		wlr_log(WLR_DEBUG, "Failed to get property %s: %s", prop, error.message);
+		sd_bus_error_free(&error);
+		return;
+	}
+
+	ret = sd_bus_message_enter_container(msg, 'a', "(iiay)");
+	if (ret < 0) {
+		wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+		return;
+	}
+
+	list_t *pixmaps = create_list();
+	if (!pixmaps) {
+		return;
+	}
+
+	while (!sd_bus_message_at_end(msg, 0)) {
+		ret = sd_bus_message_enter_container(msg, 'r', "iiay");
+		if (ret < 0) {
+			wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+			goto cleanup;
+		}
+		int size;
+		ret = sd_bus_message_read(msg, "ii", NULL, &size);
+		if (ret < 0) {
+			wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+			goto cleanup;
+		}
+
+		const void *pixels;
+		size_t npixels;
+		ret = sd_bus_message_read_array(msg, 'y', &pixels, &npixels);
+		if (ret < 0) {
+			wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+			goto cleanup;
+		}
+
+		struct swaybar_pixmap *pixmap =
+			malloc(sizeof(struct swaybar_pixmap) + npixels);
+		pixmap->size = size;
+		memcpy(pixmap->pixels, pixels, npixels);
+		list_add(pixmaps, pixmap);
+
+		sd_bus_message_exit_container(msg);
+	}
+	*dest = pixmaps;
+
+	sd_bus_message_unref(msg);
+	return;
+cleanup:
+	sd_bus_message_unref(msg);
+	list_free_items_and_destroy(pixmaps);
+}
+
 static void sni_get_property(struct swaybar_sni *sni, char *prop, char *type,
 		void *dest) {
 	sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -46,6 +108,8 @@ static int handle_new_icon(sd_bus_message *msg, void *data, sd_bus_error *error)
 	struct swaybar_sni *sni = data;
 	free(sni->icon_name);
 	sni_get_property(sni, "IconName", "s", &sni->icon_name);
+	list_free_items_and_destroy(sni->icon_pixmap);
+	sni_get_pixmap(sni, "IconPixmap", &sni->icon_pixmap);
 	wlr_log(WLR_DEBUG, "%s has new IconName='%s'", sni->watcher_id, sni->icon_name);
 
 	if (sni->status[0] != 'N') {
@@ -60,6 +124,8 @@ static int handle_new_attention_icon(sd_bus_message *msg, void *data,
 	struct swaybar_sni *sni = data;
 	free(sni->attention_icon_name);
 	sni_get_property(sni, "AttentionIconName", "s", &sni->attention_icon_name);
+	list_free_items_and_destroy(sni->attention_icon_pixmap);
+	sni_get_pixmap(sni, "IconPixmap", &sni->attention_icon_pixmap);
 	wlr_log(WLR_DEBUG, "%s has new AttentionIconName='%s'", sni->watcher_id,
 			sni->attention_icon_name);
 
@@ -118,7 +184,9 @@ struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray) {
 	//          AttentionIconPixap, AttentionMovieName, ToolTip
 	sni_get_property(sni, "Status", "s", &sni->status);
 	sni_get_property(sni, "IconName", "s", &sni->icon_name);
+	sni_get_pixmap(sni, "IconPixmap", &sni->icon_pixmap);
 	sni_get_property(sni, "AttentionIconName", "s", &sni->attention_icon_name);
+	sni_get_pixmap(sni, "AttentionIconPixmap", &sni->attention_icon_pixmap);
 	sni_get_property(sni, "ItemIsMenu", "b", &sni->item_is_menu);
 	sni_get_property(sni, "Menu", "o", &sni->menu);
 
@@ -144,6 +212,7 @@ void destroy_sni(struct swaybar_sni *sni) {
 	free(sni->path);
 	free(sni->status);
 	free(sni->icon_name);
+	free(sni->icon_pixmap);
 	free(sni->attention_icon_name);
 	free(sni->menu);
 	free(sni);
@@ -224,35 +293,46 @@ static enum hotspot_event_handling icon_hotspot_callback(
 	return HOTSPOT_PROCESS;
 }
 
-static char *get_icon_name(struct swaybar_sni *sni) {
+static bool sni_ready(struct swaybar_sni *sni) { // TODO remove
 	if (!sni->status) {
 		sni_get_property(sni, "Status", "s", &sni->status);
 		if (!sni->status) {
-			return NULL;
+			return false;
 		}
 	}
 
 	if (sni->status[0] == 'N') { // NeedsAttention
 		if (!sni->attention_icon_name) {
 			sni_get_property(sni, "AttentionIconName", "s", &sni->attention_icon_name);
 		}
-		return sni->attention_icon_name;
+		if (!sni->attention_icon_name && !sni->attention_icon_pixmap) {
+			sni_get_pixmap(sni, "AttentionIconPixmap", &sni->attention_icon_pixmap);
+		}
+		return sni->attention_icon_name || sni->attention_icon_pixmap;
 	} else {
 		if (!sni->icon_name) {
 			sni_get_property(sni, "IconName", "s", &sni->icon_name);
 		}
-		return sni->icon_name;
+		if (!sni->icon_name && !sni->icon_pixmap) {
+			sni_get_pixmap(sni, "IconPixmap", &sni->icon_pixmap);
+		}
+		return sni->icon_name || sni->icon_pixmap;
 	}
 }
 
 uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
 		struct swaybar_sni *sni) {
+	if (!sni_ready(sni)) {
+		return 0;
+	}
 	uint32_t height = output->height * output->scale;
 	int padding = output->bar->config->tray_padding;
 	int ideal_size = height - 2*padding;
 
 	if (ideal_size < sni->min_size || ideal_size > sni->max_size) {
-		char *icon_name = get_icon_name(sni);
+		bool icon_found = false;
+		char *icon_name = sni->status[0] == 'N' ?
+			sni->attention_icon_name : sni->icon_name;
 		if (icon_name) {
 			char *icon_path = find_icon(sni->tray->themes, sni->tray->basedirs,
 					icon_name, ideal_size, output->bar->config->icon_theme,
@@ -261,6 +341,29 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
 				cairo_surface_destroy(sni->icon);
 				sni->icon = load_background_image(icon_path);
 				free(icon_path);
+				icon_found = true;
+			}
+		}
+		if (!icon_found) {
+			list_t *pixmaps = sni->status[0] == 'N' ?
+				sni->attention_icon_pixmap : sni->icon_pixmap;
+			if (pixmaps) {
+				unsigned smallest_error = -1; // UINT_MAX
+				int idx = -1;
+				for (int i = 0; i < pixmaps->length; ++i) {
+					struct swaybar_pixmap *pixmap = pixmaps->items[i];
+					unsigned error = (ideal_size - pixmap->size) *
+						(ideal_size < pixmap->size ? -1 : 1);
+					if (error < smallest_error) {
+						smallest_error = error;
+						idx = i;
+					}
+				}
+				struct swaybar_pixmap *pixmap = pixmaps->items[idx];
+				cairo_surface_destroy(sni->icon);
+				sni->icon = cairo_image_surface_create_for_data(pixmap->pixels,
+						CAIRO_FORMAT_ARGB32, pixmap->size, pixmap->size,
+						cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, pixmap->size));
 			}
 		}
 	}