tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Draft fix for syncing idle inhibitor across outputs. The idle_inhibitor surface has been moved to Client, all instances of idle inhibitor module now use one surface between them. Any time an idle inhibitor is clicked, currently it force updates ALL modules on all outputs, this needs work.

Browse Source
This commit is contained in:
Jordan Leppert
2020-10-31 16:31:27 +00:00
parent abe1fa5bd4
commit 4872091442
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bar.cpp
View File

@ -461,3 +461,15 @@ auto waybar::Bar::setupWidgets() -> void {
right_.pack_end(*module, false, false);
}
}
void waybar::Bar::updateAll() {
for (auto const& module : modules_left_) {
module->update();
}
for (auto const& module : modules_center_) {
module->update();
}
for (auto const& module : modules_right_) {
module->update();
}
}

30
src/modules/idle_inhibitor.cpp
View File

@ -6,7 +6,6 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
: ALabel(config, "idle_inhibitor", id, "{status}"),
bar_(bar),
status_("deactivated"),
idle_inhibitor_(nullptr),
pid_(-1) {
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
event_box_.signal_button_press_event().connect(
@ -15,9 +14,9 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
}
waybar::modules::IdleInhibitor::~IdleInhibitor() {
if (idle_inhibitor_ != nullptr) {
zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
idle_inhibitor_ = nullptr;
if (waybar::Client::inst()->idle_inhibitor != nullptr) {
zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor);
waybar::Client::inst()->idle_inhibitor = nullptr;
}
if (pid_ != -1) {
kill(-pid_, 9);
@ -26,6 +25,13 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
}
auto waybar::modules::IdleInhibitor::update() -> void {
// Check status
if (waybar::Client::inst()->idle_inhibitor != nullptr) {
status_ = "activated";
} else {
status_ = "deactivated";
}
label_.set_markup(
fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_))));
label_.get_style_context()->add_class(status_);
@ -39,17 +45,23 @@ auto waybar::modules::IdleInhibitor::update() -> void {
bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
if (e->button == 1) {
label_.get_style_context()->remove_class(status_);
if (idle_inhibitor_ != nullptr) {
zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
idle_inhibitor_ = nullptr;
if (waybar::Client::inst()->idle_inhibitor != nullptr) {
zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor);
waybar::Client::inst()->idle_inhibitor = nullptr;
status_ = "deactivated";
} else {
idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
waybar::Client::inst()->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(
waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
status_ = "activated";
}
click_param = status_;
}
// Make all modules update
for (auto const& bar : waybar::Client::inst()->bars) {
bar->updateAll();
}
ALabel::handleToggle(e);
return true;
}