Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exec runs after on-* events

Browse Source
This commit is contained in:
Ruan E. Formigoni
2022-11-10 02:36:54 -03:00
parent 781da93f3d
commit 38af4a6f16
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AModule.hpp
View File

@ -25,6 +25,7 @@ class AModule : public IModule {
SCROLL_DIR getScrollDir(GdkEventScroll *e); SCROLL_DIR getScrollDir(GdkEventScroll *e);
bool tooltipEnabled(); bool tooltipEnabled();
std::vector<int> pid_children_;
const std::string name_; const std::string name_;
const Json::Value &config_; const Json::Value &config_;
Gtk::EventBox event_box_; Gtk::EventBox event_box_;
@ -33,7 +34,6 @@ class AModule : public IModule {
virtual bool handleScroll(GdkEventScroll *); virtual bool handleScroll(GdkEventScroll *);
private: private:
std::vector<int> pid_;
gdouble distance_scrolled_y_; gdouble distance_scrolled_y_;
gdouble distance_scrolled_x_; gdouble distance_scrolled_x_;
static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{ static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{

10
src/AModule.cpp
View File

@ -35,7 +35,7 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
} }
AModule::~AModule() { AModule::~AModule() {
for (const auto& pid : pid_) { for (const auto& pid : pid_children_) {
if (pid != -1) { if (pid != -1) {
killpg(pid, SIGTERM); killpg(pid, SIGTERM);
} }
@ -45,7 +45,7 @@ AModule::~AModule() {
auto AModule::update() -> void { auto AModule::update() -> void {
// Run user-provided update handler if configured // Run user-provided update handler if configured
if (config_["on-update"].isString()) { if (config_["on-update"].isString()) {
pid_.push_back(util::command::forkExec(config_["on-update"].asString())); pid_children_.push_back(util::command::forkExec(config_["on-update"].asString()));
} }
} }
@ -62,7 +62,7 @@ bool AModule::handleToggle(GdkEventButton* const& e) {
} }
if (!format.empty()) { if (!format.empty()) {
pid_.push_back(util::command::forkExec(format)); pid_children_.push_back(util::command::forkExec(format));
} }
dp.emit(); dp.emit();
return true; return true;
@ -123,9 +123,9 @@ AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
bool AModule::handleScroll(GdkEventScroll* e) { bool AModule::handleScroll(GdkEventScroll* e) {
auto dir = getScrollDir(e); auto dir = getScrollDir(e);
if (dir == SCROLL_DIR::UP && config_["on-scroll-up"].isString()) { if (dir == SCROLL_DIR::UP && config_["on-scroll-up"].isString()) {
pid_.push_back(util::command::forkExec(config_["on-scroll-up"].asString())); pid_children_.push_back(util::command::forkExec(config_["on-scroll-up"].asString()));
} else if (dir == SCROLL_DIR::DOWN && config_["on-scroll-down"].isString()) { } else if (dir == SCROLL_DIR::DOWN && config_["on-scroll-down"].isString()) {
pid_.push_back(util::command::forkExec(config_["on-scroll-down"].asString())); pid_children_.push_back(util::command::forkExec(config_["on-scroll-down"].asString()));
} }
dp.emit(); dp.emit();
return true; return true;

3
src/modules/custom.cpp
View File

@ -27,6 +27,9 @@ waybar::modules::Custom::~Custom() {
void waybar::modules::Custom::delayWorker() { void waybar::modules::Custom::delayWorker() {
thread_ = [this] { thread_ = [this] {
std::for_each(this->pid_children_.cbegin(), this->pid_children_.cend(),
[](int i){ wait(&i); });
bool can_update = true; bool can_update = true;
if (config_["exec-if"].isString()) { if (config_["exec-if"].isString()) {
output_ = util::command::execNoRead(config_["exec-if"].asString()); output_ = util::command::execNoRead(config_["exec-if"].asString());