refactor(tray): cleanup and fixes

src/modules/sni/host.cpp

@@ -0,0 +1,138 @@
+#include "modules/sni/host.hpp"
+
+#include <iostream>
+
+using namespace waybar::modules::SNI;
+
+Host::Host(const Json::Value &config, const std::function<void(std::unique_ptr<Item>&)>& on_add,
+  const std::function<void(std::unique_ptr<Item>&)>& on_remove)
+: bus_name_("org.kde.StatusNotifierHost-" + std::to_string(getpid()) + "-1"),
+  object_path_("/StatusNotifierHost"),
+  bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name_,
+    sigc::mem_fun(*this, &Host::busAcquired))),
+  config_(config), on_add_(on_add), on_remove_(on_remove)
+{
+}
+
+Host::~Host()
+{
+  Gio::DBus::unwatch_name(bus_name_id_);
+}
+
+void Host::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name)
+{
+  watcher_id_ = Gio::DBus::watch_name(conn, "org.kde.StatusNotifierWatcher",
+    sigc::mem_fun(*this, &Host::nameAppeared), sigc::mem_fun(*this, &Host::nameVanished));
+}
+
+void Host::nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name,
+  const Glib::ustring& name_owner)
+{
+  if (cancellable_ != nullptr) {
+    // TODO
+    return;
+  }
+  cancellable_ = g_cancellable_new();
+  sn_watcher_proxy_new(
+    conn->gobj(),
+    G_DBUS_PROXY_FLAGS_NONE,
+    "org.kde.StatusNotifierWatcher",
+    "/StatusNotifierWatcher",
+    cancellable_, &Host::proxyReady, this);
+}
+
+void Host::nameVanished(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name)
+{
+  g_cancellable_cancel(cancellable_);
+  g_clear_object(&cancellable_);
+  g_clear_object(&watcher_);
+  items_.clear();
+}
+
+void Host::proxyReady(GObject* src, GAsyncResult* res,
+  gpointer data)
+{
+  GError* error = nullptr;
+  SnWatcher* watcher = sn_watcher_proxy_new_finish(res, &error);
+  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    return;
+  }
+  auto host = static_cast<SNI::Host *>(data);
+  host->watcher_ = watcher;
+  if (error != nullptr) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    return;
+  }
+  sn_watcher_call_register_host(
+    host->watcher_, host->object_path_.c_str(), host->cancellable_,
+    &Host::registerHost, data);
+}
+
+void Host::registerHost(GObject* src, GAsyncResult* res,
+  gpointer data)
+{
+  GError* error = nullptr;
+  sn_watcher_call_register_host_finish(SN_WATCHER(src), res, &error);
+  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    return;
+  }
+  auto host = static_cast<SNI::Host *>(data);
+  if (error != nullptr) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    return; 
+  }
+  g_signal_connect(host->watcher_, "item-registered",
+    G_CALLBACK(&Host::itemRegistered), data);
+  g_signal_connect(host->watcher_, "item-unregistered",
+    G_CALLBACK(&Host::itemUnregistered), data);
+  auto items = sn_watcher_dup_registered_items(host->watcher_);
+  if (items) {
+    for (uint32_t i = 0; items[i] != nullptr; i += 1) {
+      host->addRegisteredItem(items[i]);
+    }
+  }
+  g_strfreev(items);
+}
+
+void Host::itemRegistered(SnWatcher* watcher, const gchar* service, gpointer data)
+{
+  auto host = static_cast<SNI::Host *>(data);
+  host->addRegisteredItem(service);
+}
+
+void Host::itemUnregistered(
+  SnWatcher* watcher, const gchar* service, gpointer data)
+{
+  auto host = static_cast<SNI::Host *>(data);
+  auto [bus_name, object_path] = host->getBusNameAndObjectPath(service);
+  for (auto it = host->items_.begin(); it != host->items_.end(); ++it) {
+    if ((*it)->bus_name == bus_name && (*it)->object_path == object_path) {
+      host->on_remove_(*it);
+      host->items_.erase(it);
+      break;
+    }
+  }
+}
+
+std::tuple<std::string, std::string> Host::getBusNameAndObjectPath(
+  const std::string service)
+{
+  auto it = service.find("/");
+  if (it != std::string::npos) {
+    return {service.substr(0, it), service.substr(it)};
+  }
+  return {service, "/StatusNotifierItem"};
+}
+
+void Host::addRegisteredItem(std::string service)
+{
+  auto [bus_name, object_path] = getBusNameAndObjectPath(service);
+  items_.emplace_back(new Item(bus_name, object_path, config_));
+  on_add_(items_.back());
+}