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

Moving idle inhibitor shared stuff out of Client and into idle_inhibitor module as static members.

pull/906/head
Jordan Leppert 2020-11-01 17:09:48 +00:00
parent c6743988d3
commit 071cb86b45
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/client.hpp
View File

@ -23,8 +23,6 @@ class Client {
struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; struct zxdg_output_manager_v1 * xdg_output_manager = nullptr;
struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
std::list<waybar::AModule*> idle_inhibitor_modules;
std::string idle_inhibitor_status = "deactivated";
std::vector<std::unique_ptr<Bar>> bars; std::vector<std::unique_ptr<Bar>> bars;

2
include/modules/idle_inhibitor.hpp
View File

@ -12,6 +12,8 @@ class IdleInhibitor : public ALabel {
IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
~IdleInhibitor(); ~IdleInhibitor();
auto update() -> void; auto update() -> void;
static std::list<waybar::AModule*> idle_inhibitor_modules;
static std::string idle_inhibitor_status;
private: private:
bool handleToggle(GdkEventButton* const& e); bool handleToggle(GdkEventButton* const& e);

15
src/modules/idle_inhibitor.cpp
View File

@ -1,6 +1,9 @@
#include "modules/idle_inhibitor.hpp" #include "modules/idle_inhibitor.hpp"
#include "util/command.hpp" #include "util/command.hpp"
std::list<waybar::AModule*> waybar::modules::IdleInhibitor::idle_inhibitor_modules;
std::string waybar::modules::IdleInhibitor::idle_inhibitor_status = "deactivated";
waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
const Json::Value& config) const Json::Value& config)
: ALabel(config, "idle_inhibitor", id, "{status}"), : ALabel(config, "idle_inhibitor", id, "{status}"),
@ -12,7 +15,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
// Add this to the Client's idle_inhibitor_modules // Add this to the Client's idle_inhibitor_modules
waybar::Client::inst()->idle_inhibitor_modules.push_back(this); waybar::modules::IdleInhibitor::idle_inhibitor_modules.push_back(this);
dp.emit(); dp.emit();
} }
@ -24,7 +27,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
} }
// Remove this from the Client's idle_inhibitor_modules // Remove this from the Client's idle_inhibitor_modules
waybar::Client::inst()->idle_inhibitor_modules.remove(this); waybar::modules::IdleInhibitor::idle_inhibitor_modules.remove(this);
if (pid_ != -1) { if (pid_ != -1) {
kill(-pid_, 9); kill(-pid_, 9);
@ -34,7 +37,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
auto waybar::modules::IdleInhibitor::update() -> void { auto waybar::modules::IdleInhibitor::update() -> void {
// Check status // Check status
std::string status = waybar::Client::inst()->idle_inhibitor_status; std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status;
if (status == "activated") { if (status == "activated") {
if (idle_inhibitor_ == nullptr) { if (idle_inhibitor_ == nullptr) {
idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
@ -59,18 +62,18 @@ auto waybar::modules::IdleInhibitor::update() -> void {
bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
if (e->button == 1) { if (e->button == 1) {
std::string status = waybar::Client::inst()->idle_inhibitor_status; std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status;
label_.get_style_context()->remove_class(status); label_.get_style_context()->remove_class(status);
if (status == "activated") { if (status == "activated") {
status = "deactivated"; status = "deactivated";
} else { } else {
status = "activated"; status = "activated";
} }
waybar::Client::inst()->idle_inhibitor_status = status; waybar::modules::IdleInhibitor::idle_inhibitor_status = status;
} }
// Make all other idle inhibitor modules update // Make all other idle inhibitor modules update
for (auto const& module : waybar::Client::inst()->idle_inhibitor_modules) { for (auto const& module : waybar::modules::IdleInhibitor::idle_inhibitor_modules) {
if (module != this) { if (module != this) {
module->update(); module->update();
} }