mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Style code (#25)
This commit is contained in:
@ -1,34 +1,37 @@
|
||||
#include "modules/battery.hpp"
|
||||
|
||||
waybar::modules::Battery::Battery(Json::Value config)
|
||||
: _config(config)
|
||||
: config_(std::move(config))
|
||||
{
|
||||
try {
|
||||
for (auto &node : fs::directory_iterator(_data_dir)) {
|
||||
for (auto &node : fs::directory_iterator(data_dir_)) {
|
||||
if (fs::is_directory(node) && fs::exists(node / "capacity")
|
||||
&& fs::exists(node / "status") && fs::exists(node / "uevent"))
|
||||
_batteries.push_back(node);
|
||||
&& fs::exists(node / "status") && fs::exists(node / "uevent")) {
|
||||
batteries_.push_back(node);
|
||||
}
|
||||
}
|
||||
} catch (fs::filesystem_error &e) {
|
||||
throw std::runtime_error(e.what());
|
||||
}
|
||||
|
||||
if (!_batteries.size())
|
||||
if (batteries_.empty()) {
|
||||
throw std::runtime_error("No batteries.");
|
||||
|
||||
}
|
||||
auto fd = inotify_init();
|
||||
if (fd == -1)
|
||||
if (fd == -1) {
|
||||
throw std::runtime_error("Unable to listen batteries.");
|
||||
for (auto &bat : _batteries)
|
||||
}
|
||||
for (auto &bat : batteries_) {
|
||||
inotify_add_watch(fd, (bat / "uevent").c_str(), IN_ACCESS);
|
||||
}
|
||||
// Trigger first value
|
||||
update();
|
||||
_label.set_name("battery");
|
||||
_thread = [this, fd] {
|
||||
struct inotify_event event;
|
||||
Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
|
||||
label_.set_name("battery");
|
||||
thread_ = [this, fd] {
|
||||
struct inotify_event event = {};
|
||||
int nbytes = read(fd, &event, sizeof(event));
|
||||
if (nbytes != sizeof(event))
|
||||
if (nbytes != sizeof(event)) {
|
||||
return;
|
||||
}
|
||||
Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
|
||||
};
|
||||
}
|
||||
@ -38,45 +41,50 @@ auto waybar::modules::Battery::update() -> void
|
||||
try {
|
||||
uint16_t total = 0;
|
||||
std::string status;
|
||||
for (auto &bat : _batteries) {
|
||||
for (auto &bat : batteries_) {
|
||||
uint16_t capacity;
|
||||
std::string _status;
|
||||
std::ifstream(bat / "capacity") >> capacity;
|
||||
std::ifstream(bat / "status") >> _status;
|
||||
if (_status != "Unknown")
|
||||
if (_status != "Unknown") {
|
||||
status = _status;
|
||||
}
|
||||
total += capacity;
|
||||
}
|
||||
uint16_t capacity = total / _batteries.size();
|
||||
auto format = _config["format"]
|
||||
? _config["format"].asString() : "{capacity}%";
|
||||
_label.set_text(fmt::format(format, fmt::arg("capacity", capacity),
|
||||
fmt::arg("icon", _getIcon(capacity))));
|
||||
_label.set_tooltip_text(status);
|
||||
uint16_t capacity = total / batteries_.size();
|
||||
auto format = config_["format"]
|
||||
? config_["format"].asString() : "{capacity}%";
|
||||
label_.set_text(fmt::format(format, fmt::arg("capacity", capacity),
|
||||
fmt::arg("icon", getIcon(capacity))));
|
||||
label_.set_tooltip_text(status);
|
||||
bool charging = status == "Charging";
|
||||
if (charging)
|
||||
_label.get_style_context()->add_class("charging");
|
||||
else
|
||||
_label.get_style_context()->remove_class("charging");
|
||||
auto critical = _config["critical"] ? _config["critical"].asUInt() : 15;
|
||||
if (capacity <= critical && !charging)
|
||||
_label.get_style_context()->add_class("warning");
|
||||
else
|
||||
_label.get_style_context()->remove_class("warning");
|
||||
if (charging) {
|
||||
label_.get_style_context()->add_class("charging");
|
||||
} else {
|
||||
label_.get_style_context()->remove_class("charging");
|
||||
}
|
||||
auto critical = config_["critical"] ? config_["critical"].asUInt() : 15;
|
||||
if (capacity <= critical && !charging) {
|
||||
label_.get_style_context()->add_class("warning");
|
||||
} else {
|
||||
label_.get_style_context()->remove_class("warning");
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
std::string waybar::modules::Battery::_getIcon(uint16_t percentage)
|
||||
std::string waybar::modules::Battery::getIcon(uint16_t percentage)
|
||||
{
|
||||
if (!_config["format-icons"] || !_config["format-icons"].isArray()) return "";
|
||||
auto size = _config["format-icons"].size();
|
||||
if (!config_["format-icons"] || !config_["format-icons"].isArray()) {
|
||||
return "";
|
||||
}
|
||||
auto size = config_["format-icons"].size();
|
||||
auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
|
||||
return _config["format-icons"][idx].asString();
|
||||
return config_["format-icons"][idx].asString();
|
||||
}
|
||||
|
||||
waybar::modules::Battery::operator Gtk::Widget &()
|
||||
{
|
||||
return _label;
|
||||
return label_;
|
||||
}
|
||||
|
Reference in New Issue
Block a user