Skip to content

Commit

Permalink
fix: delay window creation to await for hyprland to create a workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
@Syndelis
Syndelis committed Oct 16, 2023
1 parent 42741c9 commit 67c0c9a
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 47 deletions.
37 changes: 33 additions & 4 deletions include/modules/hyprland/workspaces.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <optional>
#include <regex>
#include <string>
#include <variant>
#include <vector>

#include "AModule.hpp"
Expand All @@ -25,6 +26,35 @@ namespace waybar::modules::hyprland {

class Workspaces;

class CreateWindow {
public:
CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_repr);
CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_class, std::string window_title);
CreateWindow(Json::Value& client_data);

int increment_time_spent_uncreated();
bool is_empty(Workspaces& workspace_manager);
bool repr_is_ready() const { return std::holds_alternative<Repr>(window_); }
std::string repr(Workspaces& workspace_manager);

std::string workspace_name() const { return workspace_name_; }
WindowAddress addr() const { return window_address_; }

private:

void clear_addr();

using Repr = std::string;
using ClassAndTitle = std::pair<std::string, std::string>;

std::variant<Repr, ClassAndTitle> window_;

WindowAddress window_address_;
std::string workspace_name_;
int time_spent_uncreated_ = 0;

};

class Workspace {
public:
explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
Expand All @@ -50,13 +80,11 @@ class Workspace {
void set_windows(uint value) { windows_ = value; };
void set_name(std::string value) { name_ = value; };
bool contains_window(WindowAddress addr) const { return window_map_.contains(addr); }
void insert_window(WindowAddress addr, std::string window_class, std::string window_title);
void insert_window(CreateWindow create_window_paylod);
std::string remove_window(WindowAddress addr);
void initialize_window_map(const Json::Value& clients_data);

bool on_window_opened(WindowAddress& addr, std::string& workspace_name, std::string window_repr);
bool on_window_opened(WindowAddress& addr, std::string& workspace_name, std::string& window_class,
std::string& window_title);
bool on_window_opened(CreateWindow create_window_paylod);

std::optional<std::string> on_window_closed(WindowAddress& addr);

Expand Down Expand Up @@ -149,6 +177,7 @@ class Workspaces : public AModule, public EventHandler {
std::vector<std::unique_ptr<Workspace>> workspaces_;
std::vector<Json::Value> workspaces_to_create_;
std::vector<std::string> workspaces_to_remove_;
std::vector<CreateWindow> windows_to_create_;

std::vector<std::regex> ignore_workspaces_;

Expand Down
139 changes: 96 additions & 43 deletions src/modules/hyprland/workspaces.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <charconv>
#include <memory>
#include <string>
#include <utility>
#include <variant>

#include "util/regex_collection.hpp"

Expand Down Expand Up @@ -191,6 +193,28 @@ auto Workspaces::update() -> void {
}
workspace->update(format_, workspace_icon);
}

std::vector<CreateWindow> not_created;

for (auto &window_payload : windows_to_create_) {
bool created = false;
for (auto &workspace : workspaces_) {
if (workspace->on_window_opened(window_payload)) {
created = true;
break;
}
}
if (!created) {
static const int WINDOW_CREATION_TIMEOUT = 2;
if (window_payload.increment_time_spent_uncreated() < WINDOW_CREATION_TIMEOUT) {
not_created.push_back(window_payload);
}
}
}

windows_to_create_.clear();
windows_to_create_ = not_created;

AModule::update();
}

Expand Down Expand Up @@ -297,7 +321,7 @@ void Workspaces::onEvent(const std::string &ev) {

if (!client->empty()) {
(*window_workspace)
->insert_window(payload, (*client)["class"].asString(), (*client)["title"].asString());
->insert_window({*client});
}
}
}
Expand All @@ -322,11 +346,7 @@ void Workspaces::on_window_opened(std::string payload) {

std::string window_title = payload.substr(next_comma_idx + 1, payload.length() - next_comma_idx);

for (auto &workspace : workspaces_) {
if (workspace->on_window_opened(window_address, workspace_name, window_class, window_title)) {
break;
}
}
windows_to_create_.push_back({workspace_name, window_address, window_class, window_title});
}

void Workspaces::on_window_closed(std::string addr) {
Expand Down Expand Up @@ -359,11 +379,7 @@ void Workspaces::on_window_moved(std::string payload) {
}

// ...and add it to the new workspace
for (auto &workspace : workspaces_) {
if (workspace->on_window_opened(window_address, workspace_name, window_repr)) {
break;
}
}
windows_to_create_.push_back({workspace_name, window_address, window_repr});
}

void Workspaces::update_window_count() {
Expand Down Expand Up @@ -395,28 +411,14 @@ void Workspace::initialize_window_map(const Json::Value &clients_data) {
window_map_.clear();
for (auto client : clients_data) {
if (client["workspace"]["id"].asInt() == id()) {
// substr(2, ...) is necessary because Hyprland's JSON follows this format:
// 0x{ADDR}
// While Hyprland's IPC follows this format:
// {ADDR}
WindowAddress client_address = client["address"].asString();
client_address = client_address.substr(2, client_address.length() - 2);
insert_window(client_address, client["class"].asString(), client["title"].asString());
insert_window({client});
}
}
}

void Workspace::insert_window(WindowAddress addr, std::string window_class,
std::string window_title) {
if (window_class.empty() &&
(!workspace_manager_.window_rewrite_config_uses_title() || window_title.empty())) {
return;
}

auto window_repr = workspace_manager_.get_rewrite(window_class, window_title);

if (!window_repr.empty()) {
window_map_[addr] = window_repr;
void Workspace::insert_window(CreateWindow create_window_paylod) {
if (!create_window_paylod.is_empty(workspace_manager_)) {
window_map_[create_window_paylod.addr()] = create_window_paylod.repr(workspace_manager_);
}
};

Expand All @@ -427,20 +429,9 @@ std::string Workspace::remove_window(WindowAddress addr) {
return window_repr;
}

bool Workspace::on_window_opened(WindowAddress &addr, std::string &workspace_name,
std::string window_repr) {
if (workspace_name == name()) {
window_map_[addr] = window_repr;
return true;
} else {
return false;
}
}

bool Workspace::on_window_opened(WindowAddress &addr, std::string &workspace_name,
std::string &window_class, std::string &window_title) {
if (workspace_name == name()) {
insert_window(addr, window_class, window_title);
bool Workspace::on_window_opened(CreateWindow create_window_paylod) {
if (create_window_paylod.workspace_name() == name()) {
insert_window(create_window_paylod);
return true;
} else {
return false;
Expand Down Expand Up @@ -863,4 +854,66 @@ std::string Workspaces::get_rewrite(std::string window_class, std::string window
return window_rewrite_rules_.get(window_repr_key);
}

CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_repr)
: window_(window_repr),
window_address_(window_address),
workspace_name_(workspace_name) {
clear_addr();
}

CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_class, std::string window_title)
: window_(std::make_pair(window_class, window_title)),
window_address_(window_address),
workspace_name_(workspace_name) {
clear_addr();
}

CreateWindow::CreateWindow(Json::Value& client_data) {
window_address_ = client_data["address"].asString();
workspace_name_ = client_data["workspace"]["name"].asString();
window_ = std::make_pair(client_data["class"].asString(), client_data["title"].asString());
clear_addr();
}

std::string CreateWindow::repr(Workspaces& workspace_manager) {
if (std::holds_alternative<Repr>(window_)) {
return std::get<Repr>(window_);
} else if (std::holds_alternative<ClassAndTitle>(window_)) {
auto [window_class, window_title] = std::get<ClassAndTitle>(window_);
return workspace_manager.get_rewrite(window_class, window_title);
} else {
// Unreachable
return "";
}
}

bool CreateWindow::is_empty(Workspaces& workspace_manager) {
if (std::holds_alternative<Repr>(window_)) {
return std::get<Repr>(window_).empty();
} else if (std::holds_alternative<ClassAndTitle>(window_)) {
auto [window_class, window_title] = std::get<ClassAndTitle>(window_);
return (
window_class.empty() &&
(!workspace_manager.window_rewrite_config_uses_title() || window_title.empty())
);
} else {
// Unreachable
return true;
}
}

int CreateWindow::increment_time_spent_uncreated() {
return time_spent_uncreated_++;
}

void CreateWindow::clear_addr() {
// substr(2, ...) is necessary because Hyprland's JSON follows this format:
// 0x{ADDR}
// While Hyprland's IPC follows this format:
// {ADDR}
if (window_address_.starts_with("0x")) {
window_address_ = window_address_.substr(2, window_address_.length() - 2);
}
}

} // namespace waybar::modules::hyprland

0 comments on commit 67c0c9a

Please sign in to comment.