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

Separate query and struct

This commit is contained in:
MisterPine 2023-07-08 21:42:28 +02:00
parent 3bfeed31bc
commit c4bace504c
No known key found for this signature in database
GPG Key ID: 5481659D1D983422
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,20 @@ class Window : public waybar::ALabel, public EventHandler {
static auto parse(const Json::Value&) -> Workspace;
};
struct WindowData {
bool floating;
int monitor;
std::string class_name;
std::string initial_class_name;
std::string title;
std::string initial_title;
static auto parse(const Json::Value&) -> WindowData;
};
auto getActiveWorkspace(const std::string&) -> Workspace;
auto getActiveWorkspace() -> Workspace;
auto getWindowData(const std::string& window_id) -> WindowData;
void onEvent(const std::string&) override;
void queryActiveWorkspace();
void setClass(const std::string&, bool enable);
@ -34,7 +46,9 @@ class Window : public waybar::ALabel, public EventHandler {
std::mutex mutex_;
const Bar& bar_;
util::JsonParser parser_;
std::string last_window_address_;
std::string last_title_;
WindowData window_data_;
Workspace workspace_;
std::string solo_class_;
std::string last_solo_class_;

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

@ -14,7 +14,7 @@
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) {
: ALabel(config, "window", id, "{title}", 0, true), bar_(bar) {
modulesReady = true;
separate_outputs = config["separate-outputs"].asBool();
@ -44,6 +44,7 @@ auto Window::update() -> void {
std::lock_guard<std::mutex> lg(mutex_);
std::string window_name = waybar::util::sanitize_string(workspace_.last_window_title);
std::string window_address = workspace_.last_window;
if (window_name != last_title_) {
if (window_name.empty()) {
@ -54,10 +55,19 @@ auto Window::update() -> void {
last_title_ = window_name;
}
if (window_address != last_window_address_) {
last_window_address_ = window_address;
window_data_ = getWindowData(window_address);
}
if (!format_.empty()) {
label_.show();
label_.set_markup(fmt::format(fmt::runtime(format_),
waybar::util::rewriteString(window_name, config_["rewrite"])));
label_.set_markup(waybar::util::rewriteString(
fmt::format(fmt::runtime(format_), fmt::arg("title", window_name),
fmt::arg("initialTitle", window_data_.initial_title),
fmt::arg("class", window_data_.class_name),
fmt::arg("initialClass", window_data_.initial_class_name)),
config_["rewrite"]));
} else {
label_.hide();
}
@ -117,6 +127,25 @@ auto Window::Workspace::parse(const Json::Value& value) -> Window::Workspace {
value["lastwindowtitle"].asString()};
}
auto Window::getWindowData(const std::string& window_address) -> WindowData {
const auto clients = gIPC->getSocket1JsonReply("clients");
assert(clients.isArray());
auto window = std::find_if(clients.begin(), clients.end(), [&](Json::Value window) {
return window["address"] == window_address;
});
if (window == std::end(clients)) {
spdlog::warn("No client with address {}", window_address);
return WindowData{false, -1, "", "", "", ""};
}
return WindowData::parse(*window);
}
auto Window::WindowData::parse(const Json::Value& value) -> Window::WindowData {
return WindowData{value["floating"].asBool(), value["monitor"].asInt(),
value["class"].asString(), value["initialClass"].asString(),
value["title"].asString(), value["initialTitle"].asString()};
}
void Window::queryActiveWorkspace() {
std::lock_guard<std::mutex> lg(mutex_);