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

Merge pull request #2540 from Syndelis/fix/hyprland-special-workspaces

This commit is contained in:
Alexis Rouillard 2023-09-25 22:33:36 +02:00 committed by GitHub
parent 16f6d9dfa0 9a3238c20b
commit 4c0347d9f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/hyprland/workspaces.cpp
View File

@ -134,6 +134,14 @@ auto Workspaces::update() -> void {
AModule::update(); AModule::update();
} }
bool isDoubleSpecial(std::string &workspace_name) {
// Hyprland's IPC sometimes reports the creation of workspaces strangely named
// `special:special:<some_name>`. This function checks for that and is used
// to avoid creating (and then removing) such workspaces.
// See hyprwm/Hyprland#3424 for more info.
return workspace_name.find("special:special:") != std::string::npos;
}
void Workspaces::onEvent(const std::string &ev) { void Workspaces::onEvent(const std::string &ev) {
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
std::string eventName(begin(ev), begin(ev) + ev.find_first_of('>')); std::string eventName(begin(ev), begin(ev) + ev.find_first_of('>'));
@ -143,15 +151,16 @@ void Workspaces::onEvent(const std::string &ev) {
active_workspace_name_ = payload; active_workspace_name_ = payload;
} else if (eventName == "destroyworkspace") { } else if (eventName == "destroyworkspace") {
workspaces_to_remove_.push_back(payload); if (!isDoubleSpecial(payload)) {
workspaces_to_remove_.push_back(payload);
}
} else if (eventName == "createworkspace") { } else if (eventName == "createworkspace") {
const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces"); const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces");
for (Json::Value workspace_json : workspaces_json) { for (Json::Value workspace_json : workspaces_json) {
std::string name = workspace_json["name"].asString(); std::string name = workspace_json["name"].asString();
if (name == payload && if (name == payload &&
(all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) && (all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) &&
(show_special() || !name.starts_with("special"))) { (show_special() || !name.starts_with("special")) && !isDoubleSpecial(payload)) {
workspaces_to_create_.push_back(workspace_json); workspaces_to_create_.push_back(workspace_json);
break; break;
} }
@ -238,8 +247,10 @@ void Workspaces::create_workspace(Json::Value &value) {
} }
void Workspaces::remove_workspace(std::string name) { void Workspaces::remove_workspace(std::string name) {
auto workspace = std::find_if(workspaces_.begin(), workspaces_.end(), auto workspace =
[&](std::unique_ptr<Workspace> &x) { return x->name() == name; }); std::find_if(workspaces_.begin(), workspaces_.end(), [&](std::unique_ptr<Workspace> &x) {
return (name.starts_with("special:") && name.substr(8) == x->name()) || name == x->name();
});
if (workspace == workspaces_.end()) { if (workspace == workspaces_.end()) {
// happens when a workspace on another monitor is destroyed // happens when a workspace on another monitor is destroyed