make sni asynchronous :( cleanup )

Author: ianyfan

swaybar/tray/host.c

@@ -11,8 +11,10 @@
 
 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);
+	struct swaybar_sni *sni = create_sni(id, tray);
+	if (sni) {
+		list_add(tray->items, sni);
+	}
 }
 
 static int handle_sni_registered(sd_bus_message *msg, void *data,

swaybar/tray/item.c

@@ -18,26 +18,28 @@
 
 // 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;
-	}
+static bool sni_ready(struct swaybar_sni *sni) {
+	return sni->status && (sni->status[0] == 'N' ?
+			sni->attention_icon_name || sni->attention_icon_pixmap :
+			sni->icon_name || sni->icon_pixmap);
+}
+
+static void set_sni_dirty(struct swaybar_sni *sni) {
+	sni->min_size = sni->max_size = 0; // invalidate previous icon
+	set_bar_dirty(sni->tray->bar);
+}
 
-	ret = sd_bus_message_enter_container(msg, 'a', "(iiay)");
+static int read_pixmap(sd_bus_message *msg, struct swaybar_sni *sni,
+		const char *prop, list_t **dest) {
+	int 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;
+		return ret;
 	}
 
 	list_t *pixmaps = create_list();
 	if (!pixmaps) {
-		return;
+		return -12; // -ENOMEM
 	}
 
 	while (!sd_bus_message_at_end(msg, 0)) {
@@ -46,6 +48,7 @@ static void sni_get_pixmap(struct swaybar_sni *sni, char *prop, list_t **dest) {
 			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) {
@@ -71,67 +74,108 @@ static void sni_get_pixmap(struct swaybar_sni *sni, char *prop, list_t **dest) {
 	}
 	*dest = pixmaps;
 
-	sd_bus_message_unref(msg);
-	return;
+	return ret;
 cleanup:
-	sd_bus_message_unref(msg);
 	list_free_items_and_destroy(pixmaps);
+	return ret;
 }
 
-static void sni_get_property(struct swaybar_sni *sni, char *prop, char *type,
-		void *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, type);
+struct get_property_data {
+	struct swaybar_sni *sni;
+	const char *prop;
+	const char *type;
+	void *dest;
+};
+
+static int get_property_callback(sd_bus_message *msg, void *data,
+		sd_bus_error *error) {
+	struct get_property_data *d = data;
+	struct swaybar_sni *sni = d->sni;
+	const char *prop = d->prop;
+	const char *type = d->type;
+	void *dest = d->dest;
+
+	int ret = 0;
+	if (sd_bus_message_is_method_error(msg, NULL)) {
+		sd_bus_error err = *sd_bus_message_get_error(msg);
+		wlr_log(WLR_DEBUG, "Failed to get property %s: %s", prop, err.message);
+		goto cleanup;
+	}
+
+	ret = sd_bus_message_enter_container(msg, 'v', type);
 	if (ret < 0) {
-		wlr_log(WLR_DEBUG, "Failed to get property %s: %s", prop, error.message);
-		sd_bus_error_free(&error);
+		wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+		goto cleanup;
+	}
+
+	if (!type) {
+		ret = read_pixmap(msg, sni, prop, dest);
+		if (ret < 0) {
+			goto cleanup;
+		}
 	} else {
 		ret = sd_bus_message_read(msg, type, dest);
 		if (ret < 0) {
-			wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop, strerror(-ret));
+			wlr_log(WLR_DEBUG, "Failed to read property %s: %s", prop,
+					strerror(-ret));
+			goto cleanup;
 		} else if (*type == 's' || *type == 'o') {
 			char **str = dest;
 			*str = strdup(*str);
 		}
-		sd_bus_message_unref(msg);
 	}
+
+	if (sni_ready(sni)) {
+		set_sni_dirty(sni);
+	}
+
+cleanup:
+	free(data);
+	return ret;
 }
 
-static void set_sni_dirty(struct swaybar_sni *sni) {
-	sni->min_size = sni->max_size = 0; // invalidate previous icon
-	set_bar_dirty(sni->tray->bar);
+static void sni_get_property_async(struct swaybar_sni *sni, const char *prop,
+		const char *type, void *dest) {
+	struct get_property_data *data = malloc(sizeof(struct get_property_data));
+	data->sni = sni;
+	data->prop = prop;
+	data->type = type;
+	data->dest = dest;
+	int ret = sd_bus_call_method_async(sni->tray->bus, NULL, sni->service,
+			sni->path, "org.freedesktop.DBus.Properties", "Get",
+			get_property_callback, data, "ss", sni->interface, prop);
+	if (ret < 0) {
+		wlr_log(WLR_DEBUG, "Failed to get property %s: %s", prop, strerror(-ret));
+	}
 }
 
 static int handle_new_icon(sd_bus_message *msg, void *data, sd_bus_error *error) {
 	struct swaybar_sni *sni = data;
+	wlr_log(WLR_DEBUG, "%s has new IconName", sni->watcher_id);
+
 	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);
+	sni->icon_name = NULL;
+	sni_get_property_async(sni, "IconName", "s", &sni->icon_name);
 
-	if (sni->status[0] != 'N') {
-		set_sni_dirty(sni);
-	}
+	list_free_items_and_destroy(sni->icon_pixmap);
+	sni->icon_pixmap = NULL;
+	sni_get_property_async(sni, "IconPixmap", NULL, &sni->icon_pixmap);
 
 	return 0;
 }
 
 static int handle_new_attention_icon(sd_bus_message *msg, void *data,
 		sd_bus_error *error) {
 	struct swaybar_sni *sni = data;
+	wlr_log(WLR_DEBUG, "%s has new AttentionIconName", sni->watcher_id);
+
 	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);
+	sni->attention_icon_name = NULL;
+	sni_get_property_async(sni, "AttentionIconName", "s", &sni->attention_icon_name);
 
-	if (sni->status[0] == 'N') {
-		set_sni_dirty(sni);
-	}
+	list_free_items_and_destroy(sni->attention_icon_pixmap);
+	sni->attention_icon_pixmap = NULL;
+	sni_get_property_async(sni, "AttentionIconPixmap", NULL, &sni->attention_icon_pixmap);
 
 	return 0;
 }
@@ -145,7 +189,7 @@ static int handle_new_status(sd_bus_message *msg, void *data, sd_bus_error *erro
 		struct swaybar_sni *sni = data;
 		free(sni->status);
 		sni->status = strdup(status);
-		wlr_log(WLR_DEBUG, "%s has new Status='%s'", sni->watcher_id, status);
+		wlr_log(WLR_DEBUG, "%s has new Status '%s'", sni->watcher_id, status);
 		set_sni_dirty(sni);
 	}
 	return ret;
@@ -181,18 +225,13 @@ struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray) {
 
 	// Ignored: Category, Id, Title, WindowId, OverlayIconName,
 	//          OverlayIconPixmap, 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);
-
-	wlr_log(WLR_DEBUG, "Properties: Status='%s' IconName='%s' "
-			"AttentionIconName='%s' ItemIsMenu=%s Menu='%s'",
-			sni->status, sni->icon_name, sni->attention_icon_name,
-			sni->item_is_menu ? "true" : "false", sni->menu);
+	sni_get_property_async(sni, "Status", "s", &sni->status);
+	sni_get_property_async(sni, "IconName", "s", &sni->icon_name);
+	sni_get_property_async(sni, "IconPixmap", NULL, &sni->icon_pixmap);
+	sni_get_property_async(sni, "AttentionIconName", "s", &sni->attention_icon_name);
+	sni_get_property_async(sni, "AttentionIconPixmap", NULL, &sni->attention_icon_pixmap);
+	sni_get_property_async(sni, "ItemIsMenu", "b", &sni->item_is_menu);
+	sni_get_property_async(sni, "Menu", "o", &sni->menu);
 
 	sni_match_signal(sni, "NewIcon", handle_new_icon);
 	sni_match_signal(sni, "NewAttentionIcon", handle_new_attention_icon);
@@ -292,43 +331,12 @@ static enum hotspot_event_handling icon_hotspot_callback(
 	return HOTSPOT_PROCESS;
 }
 
-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 false;
-		}
-	}
-
-	if (sni->status[0] == 'N') { // NeedsAttention
-		if (!sni->attention_icon_name) {
-			sni_get_property(sni, "AttentionIconName", "s", &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);
-		}
-		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) {
+	if ((ideal_size < sni->min_size || ideal_size > sni->max_size) && sni_ready(sni)) {
 		bool icon_found = false;
 		char *icon_name = sni->status[0] == 'N' ?
 			sni->attention_icon_name : sni->icon_name;
@@ -367,6 +375,7 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
 		}
 	}
 	if (!sni->icon) {
+		// TODO fallback
 		return 0;
 	}