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

hyprland/window: .solo class accounts for hidden & fullscreen windows

pull/2270/head
gardenapple 2023-07-02 20:58:42 +03:00
parent 91588fb8bb
commit cdece498c1
No known key found for this signature in database
GPG Key ID: 30A642B65B1529FE
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/hyprland/window.hpp
View File

@ -40,6 +40,7 @@ class Window : public waybar::ALabel, public EventHandler {
std::string last_solo_class_; std::string last_solo_class_;
bool solo_; bool solo_;
bool all_floating_; bool all_floating_;
bool hidden_;
bool fullscreen_; bool fullscreen_;
}; };

40
src/modules/hyprland/window.cpp
View File

@ -64,8 +64,9 @@ auto Window::update() -> void {
setClass("empty", workspace_.windows == 0); setClass("empty", workspace_.windows == 0);
setClass("solo", solo_); setClass("solo", solo_);
setClass("fullscreen", fullscreen_);
setClass("floating", all_floating_); setClass("floating", all_floating_);
setClass("hidden", hidden_);
setClass("fullscreen", fullscreen_);
if (!last_solo_class_.empty() && solo_class_ != last_solo_class_) { if (!last_solo_class_.empty() && solo_class_ != last_solo_class_) {
if (bar_.window.get_style_context()->has_class(last_solo_class_)) { if (bar_.window.get_style_context()->has_class(last_solo_class_)) {
@ -126,36 +127,43 @@ void Window::queryActiveWorkspace() {
} }
if (workspace_.windows > 0) { if (workspace_.windows > 0) {
const auto clients = gIPC->getSocket1Reply("j/clients"); const auto clients = gIPC->getSocket1JsonReply("clients");
Json::Value json = parser_.parse(clients); assert(clients.isArray());
assert(json.isArray()); auto active_window = std::find_if(clients.begin(), clients.end(), [&](Json::Value window) {
auto active_window = std::find_if(json.begin(), json.end(), [&](Json::Value window) {
return window["address"] == workspace_.last_window; return window["address"] == workspace_.last_window;
}); });
if (active_window == std::end(json)) { if (active_window == std::end(clients)) {
return; return;
} }
if (workspace_.windows == 1 && !(*active_window)["floating"].asBool()) {
solo_class_ = (*active_window)["class"].asString();
} else {
solo_class_ = "";
}
std::vector<Json::Value> workspace_windows; std::vector<Json::Value> workspace_windows;
std::copy_if(json.begin(), json.end(), std::back_inserter(workspace_windows), std::copy_if(clients.begin(), clients.end(), std::back_inserter(workspace_windows),
[&](Json::Value window) { [&](Json::Value window) {
return window["workspace"]["id"] == workspace_.id && window["mapped"].asBool(); return window["workspace"]["id"] == workspace_.id && window["mapped"].asBool();
}); });
solo_ = 1 == std::count_if(workspace_windows.begin(), workspace_windows.end(), solo_ = 1 == std::count_if(workspace_windows.begin(), workspace_windows.end(),
[&](Json::Value window) { return !window["floating"].asBool(); }); [&](Json::Value window) { return !window["floating"].asBool() && !window["hidden"].asBool(); });
all_floating_ = std::all_of(workspace_windows.begin(), workspace_windows.end(), all_floating_ = std::all_of(workspace_windows.begin(), workspace_windows.end(),
[&](Json::Value window) { return window["floating"].asBool(); }); [&](Json::Value window) { return window["floating"].asBool() && !window["hidden"].asBool(); });
hidden_ = std::any_of(workspace_windows.begin(), workspace_windows.end(),
[&](Json::Value window) { return window["hidden"].asBool(); });
fullscreen_ = (*active_window)["fullscreen"].asBool(); fullscreen_ = (*active_window)["fullscreen"].asBool();
if (fullscreen_) {
solo_ = true;
}
if (solo_) {
solo_class_ = (*active_window)["class"].asString();
} else {
solo_class_ = "";
}
} else { } else {
solo_class_ = "";
solo_ = false;
all_floating_ = false; all_floating_ = false;
hidden_ = false;
fullscreen_ = false; fullscreen_ = false;
solo_ = false;
solo_class_ = "";
} }
} }