Support unified KDE & XDG host and item

Author: ianyfan

include/swaybar/tray/host.h

@@ -0,0 +1,9 @@
+#ifndef _SWAYBAR_TRAY_HOST_H
+#define _SWAYBAR_TRAY_HOST_H
+
+#include "swaybar/tray/tray.h"
+
+char *start_host(char *protocol, struct swaybar_tray *tray);
+void stop_host(char *host, struct swaybar_tray *tray);
+
+#endif

include/swaybar/tray/host_kde.h

@@ -0,0 +1,36 @@
+#ifndef _SWAYBAR_TRAY_ITEM_H
+#define _SWAYBAR_TRAY_ITEM_H
+
+#include <cairo.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include "swaybar/tray/tray.h"
+
+struct swaybar_output;
+
+struct swaybar_sni {
+	// icon properties
+	struct swaybar_tray *tray;
+	cairo_surface_t *icon;
+	int min_size;
+	int max_size;
+
+	// dbus properties
+	char *watcher_id;
+	char *service;
+	char *path;
+	char *interface;
+
+	char *status;
+	char *icon_name;
+	char *attention_icon_name;
+	bool item_is_menu;
+	char *menu;
+};
+
+struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray);
+void destroy_sni(struct swaybar_sni *sni);
+uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
+		struct swaybar_sni *sni);
+
+#endif

include/swaybar/tray/item.h

@@ -13,7 +13,6 @@
 
 struct swaybar;
 struct swaybar_output;
-struct swaybar_host_kde;
 struct swaybar_watcher;
 
 struct swaybar_tray {
@@ -22,7 +21,9 @@ struct swaybar_tray {
 	int fd;
 	sd_bus *bus;
 
-	struct swaybar_host_kde *host_kde;
+	char *host_kde;
+	char *host_xdg;
+	list_t *items; // struct swaybar_sni *
 	struct swaybar_watcher *watcher_kde;
 	struct swaybar_watcher *watcher_xdg;
 

include/swaybar/tray/item_kde.h

@@ -1,7 +1,7 @@
 tray_files = get_option('enable-tray') ? [
-	'tray/host_kde.c',
+	'tray/host.c',
 	'tray/icon.c',
-	'tray/item_kde.c',
+	'tray/item.c',
 	'tray/tray.c',
 	'tray/watcher.c'
 ] : []

include/swaybar/tray/tray.h

@@ -0,0 +1,130 @@
+#define _POSIX_C_SOURCE 200809L
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "swaybar/bar.h"
+#include "swaybar/tray/host.h"
+#include "swaybar/tray/item.h"
+#include "swaybar/tray/tray.h"
+#include "log.h"
+
+static void add_sni(struct swaybar_tray *tray, char *id) {
+	wlr_log(WLR_DEBUG, "Registering Status Notifier Item '%s'", id);
+	list_add(tray->items, create_sni(id, tray));
+	set_bar_dirty(tray->bar);
+}
+
+static int handle_sni_registered(sd_bus_message *msg, void *data,
+		sd_bus_error *error) {
+	char *id;
+	int ret = sd_bus_message_read(msg, "s", &id);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to parse register SNI message: %s", strerror(-ret));
+	}
+
+	struct swaybar_tray *tray = data;
+	add_sni(tray, id);
+
+	return ret;
+}
+
+static int cmp_sni_id(const void *item, const void *cmp_to) {
+	const struct swaybar_sni *sni = item;
+	return strcmp(sni->watcher_id, cmp_to);
+}
+
+static int handle_sni_unregistered(sd_bus_message *msg, void *data,
+		sd_bus_error *error) {
+	char *id;
+	int ret = sd_bus_message_read(msg, "s", &id);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to parse unregister SNI message: %s", strerror(-ret));
+	}
+
+	struct swaybar_tray *tray = data;
+	int idx = list_seq_find(tray->items, cmp_sni_id, id);
+	if (idx != -1) {
+		wlr_log(WLR_DEBUG, "Unregistering Status Notifier Item '%s'", id);
+		list_del(tray->items, idx);
+		set_bar_dirty(tray->bar);
+	}
+	return ret;
+}
+
+char *start_host(char *protocol, struct swaybar_tray *tray) {
+	size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
+	char *watcher_interface = malloc(len);
+	snprintf(watcher_interface, len, "org.%s.StatusNotifierWatcher", protocol);
+	static const char *watcher_path = "/StatusNotifierWatcher";
+
+	sd_bus_slot *register_slot = NULL;
+	int ret = sd_bus_match_signal(tray->bus, &register_slot, watcher_interface,
+			watcher_path, watcher_interface, "StatusNotifierItemRegistered",
+			handle_sni_registered, tray);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to subscribe to registering events: %s",
+				strerror(-ret));
+		goto error;
+	}
+	ret = sd_bus_match_signal(tray->bus, NULL, watcher_interface,
+			watcher_path, watcher_interface, "StatusNotifierItemUnregistered",
+			handle_sni_unregistered, tray);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to subscribe to unregistering events: %s",
+				strerror(-ret));
+		goto error;
+	}
+	sd_bus_slot_set_floating(register_slot, 1);
+
+	pid_t pid = getpid();
+	size_t name_len = snprintf(NULL, 0, "org.%s.StatusNotifierHost-%d",
+			protocol, pid) + 1;
+	char *host = malloc(name_len);
+	snprintf(host, name_len, "org.%s.StatusNotifierHost-%d", protocol, pid);
+	ret = sd_bus_request_name(tray->bus, host, 0);
+	if (ret < 0) {
+		wlr_log(WLR_DEBUG, "Failed to acquire service name: %s", strerror(-ret));
+		goto error;
+	}
+
+	// this is called asynchronously in case the watcher is owned by this process
+	ret = sd_bus_call_method_async(tray->bus, NULL, watcher_interface,
+			watcher_path, watcher_interface, "RegisterStatusNotifierHost",
+			NULL, NULL, "s", host);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to send register call: %s", strerror(-ret));
+		goto error;
+	}
+
+	struct swaybar_watcher *watcher = protocol[0] == 'f' ?
+		tray->watcher_xdg : tray->watcher_kde;
+	if (!watcher) {
+		// this tray did not initialize watcher, so need to get existing items
+		sd_bus_error error = SD_BUS_ERROR_NULL;
+		char **ids;
+		ret = sd_bus_get_property_strv(tray->bus, watcher_interface, watcher_path,
+				watcher_interface, "RegisteredStatusNotifierItems", &error, &ids);
+		if (ret < 0) {
+			wlr_log(WLR_ERROR, "Failed to get registered items from watcher: %s",
+					error.message);
+			sd_bus_error_free(&error);
+		} else if (ids) {
+			for (char **id = ids; *id; ++id) {
+				add_sni(tray, *id);
+			}
+		}
+	}
+
+	wlr_log(WLR_DEBUG, "Registered %s", host);
+	return host;
+error:
+	sd_bus_slot_unref(register_slot);
+	free(host);
+	return NULL;
+}
+
+void stop_host(char *name, struct swaybar_tray *tray) {
+	sd_bus_release_name(tray->bus, name);
+	free(name);
+}