Alex
5181f84648
Store the retry timeout connection in a Host member and disconnect it in ~Host, so a Host destroyed within the retry window no longer invokes the timeout callback on freed memory. Cap the retries (MAX_RETRIES) so a watcher that never reappears no longer spins forever every 200ms; reset the counter on success and when the watcher name vanishes.
56 lines
1.8 KiB
C++
56 lines
1.8 KiB
C++
#pragma once
|
|
|
|
#include <dbus-status-notifier-watcher.h>
|
|
#include <giomm.h>
|
|
#include <glibmm/refptr.h>
|
|
#include <json/json.h>
|
|
|
|
#include <tuple>
|
|
|
|
#include "bar.hpp"
|
|
#include "modules/sni/item.hpp"
|
|
|
|
namespace waybar::modules::SNI {
|
|
|
|
class Host {
|
|
public:
|
|
Host(const std::size_t id, const Json::Value&, const Bar&,
|
|
const std::function<void(std::unique_ptr<Item>&)>&,
|
|
const std::function<void(std::unique_ptr<Item>&)>&, const std::function<void()>&);
|
|
~Host();
|
|
|
|
private:
|
|
void busAcquired(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
|
|
void nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring,
|
|
const Glib::ustring&);
|
|
void nameVanished(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
|
|
static void proxyReady(GObject*, GAsyncResult*, gpointer);
|
|
static void registerHost(GObject*, GAsyncResult*, gpointer);
|
|
static void itemRegistered(SnWatcher*, const gchar*, gpointer);
|
|
static void itemUnregistered(SnWatcher*, const gchar*, gpointer);
|
|
void itemReady(Item&);
|
|
void itemInvalidated(Item&);
|
|
void removeItem(std::vector<std::unique_ptr<Item>>::iterator);
|
|
void clearItems();
|
|
|
|
std::tuple<std::string, std::string> getBusNameAndObjectPath(const std::string);
|
|
void addRegisteredItem(const std::string& service);
|
|
|
|
std::vector<std::unique_ptr<Item>> items_;
|
|
const std::string bus_name_;
|
|
const std::string object_path_;
|
|
std::size_t bus_name_id_;
|
|
std::size_t watcher_id_;
|
|
GCancellable* cancellable_ = nullptr;
|
|
SnWatcher* watcher_ = nullptr;
|
|
sigc::connection retry_connection_;
|
|
unsigned retry_count_ = 0;
|
|
const Json::Value& config_;
|
|
const Bar& bar_;
|
|
const std::function<void(std::unique_ptr<Item>&)> on_add_;
|
|
const std::function<void(std::unique_ptr<Item>&)> on_remove_;
|
|
const std::function<void()> on_update_;
|
|
};
|
|
|
|
} // namespace waybar::modules::SNI
|