mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
90f206f92a
The hyprland/window widget had an assertion ensuring that the output from hyprctl matched the currently selected workspace id. However this assertion fails if workspaces are switched too quickly, causing the selected workspace to differ in id from the one in hyprctl, failing this assertion which then crashes the entire program. This fix simply changes this assertion into an if statement, and if a mismatch is found, empty string is returned as the window name.
90 lines
2.4 KiB
C++
90 lines
2.4 KiB
C++
#include "modules/hyprland/window.hpp"
|
|
|
|
#include <spdlog/spdlog.h>
|
|
|
|
#include <util/sanitize_str.hpp>
|
|
|
|
#include "modules/hyprland/backend.hpp"
|
|
#include "util/command.hpp"
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::hyprland {
|
|
|
|
Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
|
|
: ALabel(config, "window", id, "{}", 0, true), bar_(bar) {
|
|
modulesReady = true;
|
|
separate_outputs = config["separate-outputs"].as<bool>();
|
|
|
|
if (!gIPC.get()) {
|
|
gIPC = std::make_unique<IPC>();
|
|
}
|
|
|
|
label_.hide();
|
|
ALabel::update();
|
|
|
|
// register for hyprland ipc
|
|
gIPC->registerForIPC("activewindow", [&](const std::string& ev) { this->onEvent(ev); });
|
|
}
|
|
|
|
auto Window::update() -> void {
|
|
// fix ampersands
|
|
std::lock_guard<std::mutex> lg(mutex_);
|
|
|
|
if (!format_.empty()) {
|
|
label_.show();
|
|
label_.set_markup(fmt::format(format_, lastView));
|
|
} else {
|
|
label_.hide();
|
|
}
|
|
|
|
ALabel::update();
|
|
}
|
|
|
|
uint Window::getActiveWorkspaceID(std::string monitorName) {
|
|
auto cmd = waybar::util::command::exec("hyprctl monitors -j");
|
|
assert(cmd.exit_code == 0);
|
|
Json::Value json = parser_.parse(cmd.out);
|
|
assert(json.isArray());
|
|
auto monitor = std::find_if(json.begin(), json.end(),
|
|
[&](Json::Value monitor) { return monitor["name"] == monitorName; });
|
|
assert(monitor != std::end(json));
|
|
return (*monitor)["activeWorkspace"]["id"].as<uint>();
|
|
}
|
|
|
|
std::string Window::getLastWindowTitle(uint workspaceID) {
|
|
auto cmd = waybar::util::command::exec("hyprctl workspaces -j");
|
|
assert(cmd.exit_code == 0);
|
|
Json::Value json = parser_.parse(cmd.out);
|
|
assert(json.isArray());
|
|
auto workspace = std::find_if(json.begin(), json.end(), [&](Json::Value workspace) {
|
|
return workspace["id"].as<uint>() == workspaceID;
|
|
});
|
|
|
|
if (workspace != std::end(json)) {
|
|
return "";
|
|
}
|
|
return (*workspace)["lastwindowtitle"].as<std::string>();
|
|
}
|
|
|
|
void Window::onEvent(const std::string& ev) {
|
|
std::lock_guard<std::mutex> lg(mutex_);
|
|
|
|
std::string windowName;
|
|
if (separate_outputs) {
|
|
windowName = getLastWindowTitle(getActiveWorkspaceID(this->bar_.output->name));
|
|
} else {
|
|
windowName = ev.substr(ev.find_first_of(',') + 1).substr(0, 256);
|
|
}
|
|
|
|
windowName = waybar::util::sanitize_string(windowName);
|
|
|
|
if (windowName == lastView) return;
|
|
|
|
lastView = windowName;
|
|
|
|
spdlog::debug("hyprland window onevent with {}", windowName);
|
|
|
|
dp.emit();
|
|
}
|
|
|
|
} // namespace waybar::modules::hyprland
|