d0363313b8
Hyprland IPC had fd lifecycle risks on failure/shutdown paths and used a spin-sleep listener model. I initialized fd state defensively, tightened connect/close/shutdown handling, moved to blocking read with newline framing, and added RAII-style fd cleanup in socket1 reply paths. Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
#pragma once
|
|
|
|
#include <atomic>
|
|
#include <filesystem>
|
|
#include <list>
|
|
#include <mutex>
|
|
#include <string>
|
|
#include <thread>
|
|
#include <utility>
|
|
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::hyprland {
|
|
|
|
class EventHandler {
|
|
public:
|
|
virtual void onEvent(const std::string& ev) = 0;
|
|
virtual ~EventHandler() = default;
|
|
};
|
|
|
|
/// If you want to use the Hyprland IPC, simply use IPC::inst() to get the singleton instance.
|
|
/// Do not create multiple instances.
|
|
class IPC {
|
|
protected:
|
|
IPC(); // use IPC::inst() instead.
|
|
|
|
public:
|
|
~IPC();
|
|
static IPC& inst();
|
|
|
|
void registerForIPC(const std::string& ev, EventHandler* ev_handler);
|
|
void unregisterForIPC(EventHandler* handler);
|
|
|
|
static std::string getSocket1Reply(const std::string& rq);
|
|
Json::Value getSocket1JsonReply(const std::string& rq);
|
|
static std::filesystem::path getSocketFolder(const char* instanceSig);
|
|
|
|
protected:
|
|
static std::filesystem::path socketFolder_;
|
|
|
|
private:
|
|
void socketListener();
|
|
void parseIPC(const std::string&);
|
|
|
|
std::thread ipcThread_;
|
|
std::mutex callbackMutex_;
|
|
std::mutex socketMutex_;
|
|
util::JsonParser parser_;
|
|
std::list<std::pair<std::string, EventHandler*>> callbacks_;
|
|
int socketfd_ = -1; // the hyprland socket file descriptor
|
|
pid_t socketOwnerPid_ = -1;
|
|
std::atomic<bool> running_ = true; // the ipcThread will stop running when this is false
|
|
};
|
|
}; // namespace waybar::modules::hyprland
|