Austin Horstman
64f70caa46
#5158 (6672e924) moved connectToSocket() off the constructing thread and
into the detached IPC worker's own try/catch, so a missing NIRI_SOCKET no
longer throws out of IPC::IPC(). That was needed to fix #5117 (the worker
should reconnect instead of dying when an established stream drops), but
it also meant the very first connection attempt can never fail anymore.
Factory::makeModule()/Bar::getModules() rely on that constructor throwing
to disable a module it can't construct. With niri/workspaces and
niri/window always constructing successfully now, they get added to every
bar regardless of which compositor is actually running, showing up as a
permanently-empty widget next to the real workspace modules under
Hyprland/Sway.
Restore the old semantics for the first connection: connectToSocket() runs
synchronously in IPC::IPC() again, so a missing socket still throws and
the module gets disabled as before. Only a drop *after* that succeeds
falls into the retrying reconnect loop, preserving the #5117 fix.
57 lines
1.5 KiB
C++
57 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <atomic>
|
|
#include <list>
|
|
#include <mutex>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::niri {
|
|
|
|
class EventHandler {
|
|
public:
|
|
virtual void onEvent(const Json::Value& ev) = 0;
|
|
virtual ~EventHandler() = default;
|
|
};
|
|
|
|
class IPC {
|
|
public:
|
|
IPC();
|
|
~IPC();
|
|
|
|
void registerForIPC(const std::string& ev, EventHandler* ev_handler);
|
|
void unregisterForIPC(EventHandler* handler);
|
|
|
|
static Json::Value send(const Json::Value& request);
|
|
|
|
// The data members are only safe to access while dataMutex_ is locked.
|
|
std::lock_guard<std::mutex> lockData() { return std::lock_guard(dataMutex_); }
|
|
const std::vector<Json::Value>& workspaces() const { return workspaces_; }
|
|
const std::vector<Json::Value>& windows() const { return windows_; }
|
|
const std::vector<std::string>& keyboardLayoutNames() const { return keyboardLayoutNames_; }
|
|
unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }
|
|
|
|
private:
|
|
void startIPC(int initial_socketfd);
|
|
static int connectToSocket();
|
|
void parseIPC(const std::string&);
|
|
|
|
std::mutex dataMutex_;
|
|
std::vector<Json::Value> workspaces_;
|
|
std::vector<Json::Value> windows_;
|
|
std::vector<std::string> keyboardLayoutNames_;
|
|
unsigned keyboardLayoutCurrent_;
|
|
|
|
util::JsonParser parser_;
|
|
std::mutex callbackMutex_;
|
|
std::list<std::pair<std::string, EventHandler*>> callbacks_;
|
|
|
|
std::atomic<bool> running_{true};
|
|
};
|
|
|
|
inline std::unique_ptr<IPC> gIPC;
|
|
|
|
}; // namespace waybar::modules::niri
|