c34b1b6a19
Cache signal value during module construction to avoid accessing JSON config in signal handler context. This prevents crashes when signal field is missing or not an integer type. - Custom module: Cache signal_ value in constructor - Image module: Cache signal_ value in constructor - Both modules: Use cached value in refresh() method Co-authored-by: Alexays <13947260+Alexays@users.noreply.github.com>
51 lines
1.1 KiB
C++
51 lines
1.1 KiB
C++
#pragma once
|
|
|
|
#include <fmt/format.h>
|
|
|
|
#include <csignal>
|
|
#include <string>
|
|
|
|
#include "ALabel.hpp"
|
|
#include "util/command.hpp"
|
|
#include "util/json.hpp"
|
|
#include "util/sleeper_thread.hpp"
|
|
|
|
namespace waybar::modules {
|
|
|
|
class Custom : public ALabel {
|
|
public:
|
|
Custom(const std::string&, const std::string&, const Json::Value&, const std::string&);
|
|
virtual ~Custom();
|
|
auto update() -> void override;
|
|
void refresh(int /*signal*/) override;
|
|
|
|
private:
|
|
void delayWorker();
|
|
void continuousWorker();
|
|
void waitingWorker();
|
|
void parseOutputRaw();
|
|
void parseOutputJson();
|
|
void handleEvent();
|
|
bool handleScroll(GdkEventScroll* e) override;
|
|
bool handleToggle(GdkEventButton* const& e) override;
|
|
|
|
const std::string name_;
|
|
const std::string output_name_;
|
|
std::string text_;
|
|
std::string id_;
|
|
std::string alt_;
|
|
std::string tooltip_;
|
|
const bool tooltip_format_enabled_;
|
|
std::vector<std::string> class_;
|
|
int percentage_;
|
|
FILE* fp_;
|
|
int pid_;
|
|
util::command::res output_;
|
|
util::JsonParser parser_;
|
|
int signal_; // Cached signal value to avoid JSON access in signal handler
|
|
|
|
util::SleeperThread thread_;
|
|
};
|
|
|
|
} // namespace waybar::modules
|