tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-07-20 01:42:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

add man page for bluetooth, fix bluetooth race-condition

Browse Source
This commit is contained in:
Marc
2020-01-26 05:34:31 +01:00
parent e3bf6b968c
commit c045288ce4
8 changed files with 153 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/bluetooth.cpp
View File

@@ -3,20 +3,24 @@
#include <linux/rfkill.h>
#include <time.h>
#include <iostream>
waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value& config)
: ALabel(config, "bluetooth", id, "{status}", 10),
: ALabel(config, "bluetooth", id, "{icon}", 10),
status_("disabled"),
rfkill_(*(new waybar::util::Rfkill(RFKILL_TYPE_BLUETOOTH))) {
rfkill_{RFKILL_TYPE_BLUETOOTH} {
thread_ = [this] {
dp.emit();
rfkill_.waitForEvent();
};
intervall_thread_ = [this] {
auto now = std::chrono::system_clock::now();
auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count());
thread_.sleep_until(timeout - diff);
dp.emit();
};
}
auto waybar::modules::Bluetooth::update() -> void {
status_ = "enabled";
if (rfkill_.getState()) {
status_ = "disabled";
} else {
@@ -24,16 +28,18 @@ auto waybar::modules::Bluetooth::update() -> void {
}
label_.set_markup(
fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_))));
label_.get_style_context()->add_class(status_);
fmt::format(
format_,
fmt::arg("status", status_),
fmt::arg("icon", getIcon(0, status_))));
//if (tooltipEnabled()) {
//if (config_["tooltip-format"].isString()) {
//auto tooltip_format = config_["tooltip-format"].asString();
////auto tooltip_text = fmt::format(tooltip_format, localtime);
//label_.set_tooltip_text(tooltip_text);
//} else {
//label_.set_tooltip_text(status_);
//}
//}
if (tooltipEnabled()) {
if (config_["tooltip-format"].isString()) {
auto tooltip_format = config_["tooltip-format"].asString();
auto tooltip_text = fmt::format(tooltip_format, status_);
label_.set_tooltip_text(tooltip_text);
} else {
label_.set_tooltip_text(status_);
}
}
}

18
src/modules/network.cpp
View File

@@ -3,9 +3,9 @@
#include <sys/eventfd.h>
#include <fstream>
#include <cassert>
#include <linux/rfkill.h>
#include "util/format.hpp"
#include "util/rfkill.hpp"
#include <linux/rfkill.h>
namespace {
@@ -88,8 +88,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf
signal_strength_dbm_(0),
signal_strength_(0),
frequency_(0),
rfkill_(*(new waybar::util::Rfkill(RFKILL_TYPE_WLAN))) {
rfkill_{RFKILL_TYPE_WLAN} {
auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY);
if (down_octets) {
@@ -199,6 +198,7 @@ void waybar::modules::Network::createInfoSocket() {
}
void waybar::modules::Network::worker() {
// update via here not working
thread_timer_ = [this] {
{
std::lock_guard<std::mutex> lock(mutex_);
@@ -209,6 +209,16 @@ void waybar::modules::Network::worker() {
}
thread_timer_.sleep_for(interval_);
};
thread_rfkill_ = [this] {
rfkill_.waitForEvent();
{
std::lock_guard<std::mutex> lock(mutex_);
if (ifid_ > 0) {
getInfo();
dp.emit();
}
}
};
thread_ = [this] {
std::array<struct epoll_event, EPOLL_MAX> events{};
@@ -226,7 +236,7 @@ void waybar::modules::Network::worker() {
const std::string waybar::modules::Network::getNetworkState() const {
if (ifid_ == -1) {
if (rfkill_.isDisabled())
if (rfkill_.getState())
return "disabled";
return "disconnected";
}