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

Add a way to exclude specific output

This commit is contained in:
Vesim 2020-02-18 22:09:37 +01:00
parent 9b0660e751
commit 4fcf06a164
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/client.cpp
View File

@ -64,21 +64,31 @@ void waybar::Client::handleOutput(struct waybar_output &output) {
} }
bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) { bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) {
bool found = true;
auto check_output = [](std::string_view config_output_name, struct waybar_output &output) {
if (!config_output_name.empty()) {
if (config_output_name.substr(0, 1) == "!") {
return config_output_name.substr(1) != output.name;
}
return config_output_name == output.name;
}
return false;
};
if (config["output"].isArray()) { if (config["output"].isArray()) {
bool in_array = false;
for (auto const &output_conf : config["output"]) { for (auto const &output_conf : config["output"]) {
if (output_conf.isString() && output_conf.asString() == output.name) { if (output_conf.isString()) {
in_array = true; if(check_output(output_conf.asString(), output)) {
break; return true;
}
} }
} }
found = in_array;
} }
if (config["output"].isString() && config["output"].asString() != output.name) { if (config["output"].isString()) {
found = false; return check_output(config["output"].asString(), output);
} }
return found;
return false;
} }
struct waybar::waybar_output &waybar::Client::getOutput(void *addr) { struct waybar::waybar_output &waybar::Client::getOutput(void *addr) {