mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Merge pull request #8 from Alexays/master
Merge Alexays:master into marcplustwo:master
This commit is contained in:
commit
8a5c3af949
2
Makefile
2
Makefile
@ -1,6 +1,6 @@
|
|||||||
.PHONY: build build-debug run clean default install
|
.PHONY: build build-debug run clean default install
|
||||||
|
|
||||||
default: run
|
default: build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
meson build
|
meson build
|
||||||
|
19
README.md
19
README.md
@ -62,7 +62,24 @@ libmpdclient [MPD module]
|
|||||||
On Ubuntu 19.10 you can install all the relevant dependencies using this command:
|
On Ubuntu 19.10 you can install all the relevant dependencies using this command:
|
||||||
|
|
||||||
```
|
```
|
||||||
sudo apt install libgtkmm-3.0-dev libjsoncpp-dev libinput-dev libsigc++-2.0-dev libpulse-dev libnl-3-dev libdbusmenu-gtk3-dev libnl-genl-3-dev libfmt-dev clang-tidy libmpdclient-dev libwayland-dev libgtk-3-dev gobject-introspection libgirepository1.0-dev scdoc
|
sudo apt install \
|
||||||
|
clang-tidy \
|
||||||
|
gobject-introspection \
|
||||||
|
libdbusmenu-gtk3-dev \
|
||||||
|
libfmt-dev \
|
||||||
|
libgirepository1.0-dev \
|
||||||
|
libgtk-3-dev \
|
||||||
|
libgtkmm-3.0-dev \
|
||||||
|
libinput-dev \
|
||||||
|
libjsoncpp-dev \
|
||||||
|
libmpdclient-dev \
|
||||||
|
libnl-3-dev \
|
||||||
|
libnl-genl-3-dev \
|
||||||
|
libpulse-dev \
|
||||||
|
libsigc++-2.0-dev \
|
||||||
|
libspdlog-dev \
|
||||||
|
libwayland-dev \
|
||||||
|
scdoc
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,8 +17,7 @@ class Memory : public ALabel {
|
|||||||
static inline const std::string data_dir_ = "/proc/meminfo";
|
static inline const std::string data_dir_ = "/proc/meminfo";
|
||||||
void parseMeminfo();
|
void parseMeminfo();
|
||||||
|
|
||||||
unsigned long memtotal_;
|
std::unordered_map<std::string, unsigned long> meminfo_;
|
||||||
unsigned long memfree_;
|
|
||||||
|
|
||||||
util::SleeperThread thread_;
|
util::SleeperThread thread_;
|
||||||
};
|
};
|
||||||
|
@ -37,12 +37,14 @@ class Pulseaudio : public ALabel {
|
|||||||
std::string form_factor_;
|
std::string form_factor_;
|
||||||
std::string desc_;
|
std::string desc_;
|
||||||
std::string monitor_;
|
std::string monitor_;
|
||||||
|
std::string default_sink_name_;
|
||||||
// SOURCE
|
// SOURCE
|
||||||
uint32_t source_idx_{0};
|
uint32_t source_idx_{0};
|
||||||
uint16_t source_volume_;
|
uint16_t source_volume_;
|
||||||
bool source_muted_;
|
bool source_muted_;
|
||||||
std::string source_port_name_;
|
std::string source_port_name_;
|
||||||
std::string source_desc_;
|
std::string source_desc_;
|
||||||
|
std::string default_source_name_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace waybar::modules
|
} // namespace waybar::modules
|
||||||
|
@ -72,7 +72,10 @@ inline struct res exec(std::string cmd) {
|
|||||||
if (!fp) return {-1, ""};
|
if (!fp) return {-1, ""};
|
||||||
auto output = command::read(fp);
|
auto output = command::read(fp);
|
||||||
auto stat = command::close(fp, pid);
|
auto stat = command::close(fp, pid);
|
||||||
return {WEXITSTATUS(stat), output};
|
if (WIFEXITED(stat)) {
|
||||||
|
return {WEXITSTATUS(stat), output};
|
||||||
|
}
|
||||||
|
return {-1, output};
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int32_t forkExec(std::string cmd) {
|
inline int32_t forkExec(std::string cmd) {
|
||||||
@ -88,6 +91,7 @@ inline int32_t forkExec(std::string cmd) {
|
|||||||
// Child executes the command
|
// Child executes the command
|
||||||
if (!pid) {
|
if (!pid) {
|
||||||
setpgid(pid, pid);
|
setpgid(pid, pid);
|
||||||
|
signal(SIGCHLD, SIG_DFL);
|
||||||
execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
|
execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
|
||||||
exit(0);
|
exit(0);
|
||||||
} else {
|
} else {
|
||||||
|
@ -33,6 +33,12 @@ Addressed by *custom/<name>*
|
|||||||
You can update it manually with a signal. If no *interval* is defined,
|
You can update it manually with a signal. If no *interval* is defined,
|
||||||
it is assumed that the out script loops it self.
|
it is assumed that the out script loops it self.
|
||||||
|
|
||||||
|
*restart-interval*: ++
|
||||||
|
typeof: integer ++
|
||||||
|
The restart interval (in seconds).
|
||||||
|
Can't be used with the *interval* option, so only with continuous scripts.
|
||||||
|
Once the script exit, it'll be re-executed after the *restart-interval*.
|
||||||
|
|
||||||
*signal*: ++
|
*signal*: ++
|
||||||
typeof: integer ++
|
typeof: integer ++
|
||||||
The signal number used to update the module.
|
The signal number used to update the module.
|
||||||
|
@ -75,6 +75,7 @@ Additional to workspace name matching, the following *format-icons* can be set.
|
|||||||
- *default*: Will be shown, when no string matches is found.
|
- *default*: Will be shown, when no string matches is found.
|
||||||
- *urgent*: Will be shown, when workspace is flagged as urgent
|
- *urgent*: Will be shown, when workspace is flagged as urgent
|
||||||
- *focused*: Will be shown, when workspace is focused
|
- *focused*: Will be shown, when workspace is focused
|
||||||
|
- *persistent*: Will be shown, when workspace is persistent one.
|
||||||
|
|
||||||
# PERSISTENT WORKSPACES
|
# PERSISTENT WORKSPACES
|
||||||
|
|
||||||
|
@ -20,6 +20,14 @@ Addressed by *temperature*
|
|||||||
typeof: string ++
|
typeof: string ++
|
||||||
The temperature path to use, e.g. */sys/class/hwmon/hwmon2/temp1_input* instead of one in */sys/class/thermal/*.
|
The temperature path to use, e.g. */sys/class/hwmon/hwmon2/temp1_input* instead of one in */sys/class/thermal/*.
|
||||||
|
|
||||||
|
*hwmon-path-abs*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The path of the hwmon-directory of the device, e.g. */sys/devices/pci0000:00/0000:00:18.3/hwmon*. (Note that the subdirectory *hwmon/hwmon#*, where *#* is a number is not part of the path!) Has to be used together with *input-filename*.
|
||||||
|
|
||||||
|
*input-filename*: ++
|
||||||
|
typeof: string ++
|
||||||
|
The temperature filename of your *hwmon-path-abs*, e.g. *temp1_input*
|
||||||
|
|
||||||
*critical-threshold*: ++
|
*critical-threshold*: ++
|
||||||
typeof: integer ++
|
typeof: integer ++
|
||||||
The threshold before it is considered critical (Celsius).
|
The threshold before it is considered critical (Celsius).
|
||||||
|
@ -25,7 +25,7 @@ else
|
|||||||
cpp_link_args += ['-lstdc++fs']
|
cpp_link_args += ['-lstdc++fs']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
git = find_program('git', required: false)
|
git = find_program('git', native: true, required: false)
|
||||||
|
|
||||||
if not git.found()
|
if not git.found()
|
||||||
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
|
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
|
Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
|
||||||
Documentation=https://github.com/Alexays/Waybar/wiki/
|
Documentation=https://github.com/Alexays/Waybar/wiki/
|
||||||
PartOf=wayland-session.target
|
PartOf=wayland-session.target
|
||||||
|
After=wayland-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=dbus
|
Type=dbus
|
||||||
|
@ -175,6 +175,11 @@ void waybar::Bar::initGtkLayerShell() {
|
|||||||
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right);
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right);
|
||||||
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top);
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top);
|
||||||
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom);
|
gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom);
|
||||||
|
|
||||||
|
if (width_ > 1 && height_ > 1) {
|
||||||
|
/* configure events are not emitted if the bar is using initial size */
|
||||||
|
setExclusiveZone(width_, height_);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -49,19 +49,24 @@ void waybar::modules::Custom::continuousWorker() {
|
|||||||
thread_ = [&] {
|
thread_ = [&] {
|
||||||
char* buff = nullptr;
|
char* buff = nullptr;
|
||||||
size_t len = 0;
|
size_t len = 0;
|
||||||
|
bool restart = false;
|
||||||
if (getline(&buff, &len, fp_) == -1) {
|
if (getline(&buff, &len, fp_) == -1) {
|
||||||
int exit_code = 1;
|
int exit_code = 1;
|
||||||
if (fp_) {
|
if (fp_) {
|
||||||
exit_code = WEXITSTATUS(util::command::close(fp_, pid_));
|
exit_code = WEXITSTATUS(util::command::close(fp_, pid_));
|
||||||
fp_ = nullptr;
|
fp_ = nullptr;
|
||||||
}
|
}
|
||||||
thread_.stop();
|
|
||||||
if (exit_code != 0) {
|
if (exit_code != 0) {
|
||||||
output_ = {exit_code, ""};
|
output_ = {exit_code, ""};
|
||||||
dp.emit();
|
dp.emit();
|
||||||
spdlog::error("{} stopped unexpectedly, is it endless?", name_);
|
spdlog::error("{} stopped unexpectedly, is it endless?", name_);
|
||||||
}
|
}
|
||||||
return;
|
if (config_["restart-interval"].isUInt()) {
|
||||||
|
restart = true;
|
||||||
|
} else {
|
||||||
|
thread_.stop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
std::string output = buff;
|
std::string output = buff;
|
||||||
|
|
||||||
@ -71,6 +76,14 @@ void waybar::modules::Custom::continuousWorker() {
|
|||||||
}
|
}
|
||||||
output_ = {0, output};
|
output_ = {0, output};
|
||||||
dp.emit();
|
dp.emit();
|
||||||
|
if (restart) {
|
||||||
|
pid_ = -1;
|
||||||
|
fp_ = util::command::open(cmd, pid_);
|
||||||
|
if (!fp_) {
|
||||||
|
throw std::runtime_error("Unable to open " + cmd);
|
||||||
|
}
|
||||||
|
thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt()));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,11 +10,23 @@ waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config
|
|||||||
|
|
||||||
auto waybar::modules::Memory::update() -> void {
|
auto waybar::modules::Memory::update() -> void {
|
||||||
parseMeminfo();
|
parseMeminfo();
|
||||||
if (memtotal_ > 0 && memfree_ >= 0) {
|
|
||||||
auto total_ram_gigabytes = memtotal_ / std::pow(1024, 2);
|
unsigned long memtotal = meminfo_["MemTotal"];
|
||||||
int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
|
unsigned long memfree;
|
||||||
auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
|
if (meminfo_.count("MemAvailable")) {
|
||||||
auto available_ram_gigabytes = memfree_ / std::pow(1024, 2);
|
// New kernels (3.4+) have an accurate available memory field.
|
||||||
|
memfree = meminfo_["MemAvailable"];
|
||||||
|
} else {
|
||||||
|
// Old kernel; give a best-effort approximation of available memory.
|
||||||
|
memfree = meminfo_["MemFree"] + meminfo_["Buffers"] + meminfo_["Cached"] +
|
||||||
|
meminfo_["SReclaimable"] - meminfo_["Shmem"];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (memtotal > 0 && memfree >= 0) {
|
||||||
|
auto total_ram_gigabytes = memtotal / std::pow(1024, 2);
|
||||||
|
int used_ram_percentage = 100 * (memtotal - memfree) / memtotal;
|
||||||
|
auto used_ram_gigabytes = (memtotal - memfree) / std::pow(1024, 2);
|
||||||
|
auto available_ram_gigabytes = memfree / std::pow(1024, 2);
|
||||||
|
|
||||||
getState(used_ram_percentage);
|
getState(used_ram_percentage);
|
||||||
label_.set_markup(fmt::format(format_,
|
label_.set_markup(fmt::format(format_,
|
||||||
@ -33,7 +45,6 @@ auto waybar::modules::Memory::update() -> void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void waybar::modules::Memory::parseMeminfo() {
|
void waybar::modules::Memory::parseMeminfo() {
|
||||||
int64_t memfree = -1, membuffer = -1, memcache = -1, memavail = -1;
|
|
||||||
std::ifstream info(data_dir_);
|
std::ifstream info(data_dir_);
|
||||||
if (!info.is_open()) {
|
if (!info.is_open()) {
|
||||||
throw std::runtime_error("Can't open " + data_dir_);
|
throw std::runtime_error("Can't open " + data_dir_);
|
||||||
@ -44,23 +55,9 @@ void waybar::modules::Memory::parseMeminfo() {
|
|||||||
if (posDelim == std::string::npos) {
|
if (posDelim == std::string::npos) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string name = line.substr(0, posDelim);
|
std::string name = line.substr(0, posDelim);
|
||||||
int64_t value = std::stol(line.substr(posDelim + 1));
|
int64_t value = std::stol(line.substr(posDelim + 1));
|
||||||
|
meminfo_[name] = value;
|
||||||
if (name.compare("MemTotal") == 0) {
|
|
||||||
memtotal_ = value;
|
|
||||||
} else if (name.compare("MemAvailable") == 0) {
|
|
||||||
memavail = value;
|
|
||||||
} else if (name.compare("MemFree") == 0) {
|
|
||||||
memfree = value;
|
|
||||||
} else if (name.compare("Buffers") == 0) {
|
|
||||||
membuffer = value;
|
|
||||||
} else if (name.compare("Cached") == 0) {
|
|
||||||
memcache = value;
|
|
||||||
}
|
|
||||||
if (memtotal_ > 0 && (memavail >= 0 || (memfree > -1 && membuffer > -1 && memcache > -1))) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
memfree_ = memavail >= 0 ? memavail : memfree + membuffer + memcache;
|
|
||||||
}
|
}
|
||||||
|
@ -134,15 +134,15 @@ void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success, voi
|
|||||||
*/
|
*/
|
||||||
void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i,
|
void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i,
|
||||||
int /*eol*/, void *data) {
|
int /*eol*/, void *data) {
|
||||||
if (i != nullptr) {
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
auto self = static_cast<waybar::modules::Pulseaudio *>(data);
|
if (i != nullptr && pa->default_source_name_ == i->name) {
|
||||||
auto source_volume = static_cast<float>(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM};
|
auto source_volume = static_cast<float>(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM};
|
||||||
self->source_volume_ = std::round(source_volume * 100.0F);
|
pa->source_volume_ = std::round(source_volume * 100.0F);
|
||||||
self->source_idx_ = i->index;
|
pa->source_idx_ = i->index;
|
||||||
self->source_muted_ = i->mute != 0;
|
pa->source_muted_ = i->mute != 0;
|
||||||
self->source_desc_ = i->description;
|
pa->source_desc_ = i->description;
|
||||||
self->source_port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
|
pa->source_port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
|
||||||
self->dp.emit();
|
pa->dp.emit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -150,9 +150,9 @@ void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const p
|
|||||||
* Called when the requested sink information is ready.
|
* Called when the requested sink information is ready.
|
||||||
*/
|
*/
|
||||||
void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i,
|
void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i,
|
||||||
int /*eol*/, void * data) {
|
int /*eol*/, void *data) {
|
||||||
if (i != nullptr) {
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
if (i != nullptr && pa->default_sink_name_ == i->name) {
|
||||||
pa->pa_volume_ = i->volume;
|
pa->pa_volume_ = i->volume;
|
||||||
float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM};
|
float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM};
|
||||||
pa->sink_idx_ = i->index;
|
pa->sink_idx_ = i->index;
|
||||||
@ -174,6 +174,10 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_
|
|||||||
*/
|
*/
|
||||||
void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i,
|
void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i,
|
||||||
void *data) {
|
void *data) {
|
||||||
|
auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
|
||||||
|
pa->default_sink_name_ = i->default_sink_name;
|
||||||
|
pa->default_source_name_ = i->default_source_name;
|
||||||
|
|
||||||
pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data);
|
pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data);
|
||||||
pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data);
|
pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data);
|
||||||
}
|
}
|
||||||
@ -211,7 +215,11 @@ auto waybar::modules::Pulseaudio::update() -> void {
|
|||||||
} else {
|
} else {
|
||||||
label_.get_style_context()->remove_class("bluetooth");
|
label_.get_style_context()->remove_class("bluetooth");
|
||||||
}
|
}
|
||||||
if (muted_ ) {
|
if (muted_) {
|
||||||
|
// Check muted bluetooth format exist, otherwise fallback to default muted format
|
||||||
|
if (format_name != "format" && !config_[format_name + "-muted"].isString()) {
|
||||||
|
format_name = "format";
|
||||||
|
}
|
||||||
format_name = format_name + "-muted";
|
format_name = format_name + "-muted";
|
||||||
label_.get_style_context()->add_class("muted");
|
label_.get_style_context()->add_class("muted");
|
||||||
} else {
|
} else {
|
||||||
|
@ -205,6 +205,8 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
|
|||||||
if (config_["format-icons"][key].isString() && node[key].asBool()) {
|
if (config_["format-icons"][key].isString() && node[key].asBool()) {
|
||||||
return config_["format-icons"][key].asString();
|
return config_["format-icons"][key].asString();
|
||||||
}
|
}
|
||||||
|
} else if (config_["format_icons"]["persistent"].isString() && node["target_output"].isString()) {
|
||||||
|
return config_["format-icons"]["persistent"].asString();
|
||||||
} else if (config_["format-icons"][key].isString()) {
|
} else if (config_["format-icons"][key].isString()) {
|
||||||
return config_["format-icons"][key].asString();
|
return config_["format-icons"][key].asString();
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
#include "modules/temperature.hpp"
|
#include "modules/temperature.hpp"
|
||||||
|
#include <filesystem>
|
||||||
|
|
||||||
waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
|
waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "temperature", id, "{temperatureC}°C", 10) {
|
: ALabel(config, "temperature", id, "{temperatureC}°C", 10) {
|
||||||
if (config_["hwmon-path"].isString()) {
|
if (config_["hwmon-path"].isString()) {
|
||||||
file_path_ = config_["hwmon-path"].asString();
|
file_path_ = config_["hwmon-path"].asString();
|
||||||
|
} else if (config_["hwmon-path-abs"].isString() && config_["input-filename"].isString()) {
|
||||||
|
file_path_ = (*std::filesystem::directory_iterator(config_["hwmon-path-abs"].asString())).path().u8string() + "/" + config_["input-filename"].asString();
|
||||||
} else {
|
} else {
|
||||||
auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
|
auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
|
||||||
file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
|
file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
|
||||||
|
Loading…
Reference in New Issue
Block a user