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

fix: ipc vs json window addr format mismatch 

feat: ignore empty windows

Co-authored-by: Gabriel Fox <Inbox@GabrielFox.Dev>
pull/2529/head
Brenno Lemos 2023-09-22 18:38:18 -03:00
parent b9d5912a4f
commit fbe544984c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,20 +296,32 @@ void Workspace::initialize_window_map(const Json::Value &clients_data) {
window_map_.clear(); window_map_.clear();
for (auto client : clients_data) { for (auto client : clients_data) {
if (client["workspace"]["id"].asInt() == id()) { 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(); WindowAddress client_address = client["address"].asString();
client_address = client_address.substr(2, client_address.length() - 2);
insert_window(client_address, client["class"].asString()); insert_window(client_address, client["class"].asString());
} }
} }
} }
void Workspace::insert_window(WindowAddress addr, std::string window_class) { void Workspace::insert_window(WindowAddress addr, std::string window_class) {
window_map_.emplace(addr, workspace_manager_.get_rewrite(window_class)); auto window_repr = workspace_manager_.get_rewrite(window_class);
if (!window_repr.empty()) {
window_map_.emplace(addr, window_repr);
}
}; };
bool Workspace::on_window_opened(WindowAddress &addr, std::string &workspace_name, bool Workspace::on_window_opened(WindowAddress &addr, std::string &workspace_name,
const Json::Value &clients_data) { const Json::Value &clients_data) {
if (workspace_name == name()) { if (workspace_name == name()) {
for (auto client : clients_data) { for (auto client : clients_data) {
// substr(2, ...) is necessary because Hyprland's JSON follows this format:
// 0x{ADDR}
// While Hyprland's IPC follows this format:
// {ADDR}
auto client_address = client["address"].asString().substr(2, addr.length()); auto client_address = client["address"].asString().substr(2, addr.length());
if (client_address == addr) { if (client_address == addr) {
std::string window_class = client["class"].asString(); std::string window_class = client["class"].asString();