From 015409acaf25aa70bc1c76ad73b8e997740e5b53 Mon Sep 17 00:00:00 2001
From: herlev <>
Date: Thu, 13 Oct 2022 23:41:56 +0200
Subject: [PATCH] Allow hyprland/window to show active window on a per monitor
 basis

---
 include/modules/hyprland/window.hpp |  3 +++
 src/modules/hyprland/window.cpp     | 36 ++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/include/modules/hyprland/window.hpp b/include/modules/hyprland/window.hpp
index e8446551..3eb90774 100644
--- a/include/modules/hyprland/window.hpp
+++ b/include/modules/hyprland/window.hpp
@@ -17,8 +17,11 @@ public:
   auto update() -> void;
 
 private:
+  uint getActiveWorkspaceID(std::string);
+  std::string getLastWindowTitle(uint);
   void onEvent(const std::string&);
 
+  bool separate_outputs;
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
diff --git a/src/modules/hyprland/window.cpp b/src/modules/hyprland/window.cpp
index c2923335..461cb6c3 100644
--- a/src/modules/hyprland/window.cpp
+++ b/src/modules/hyprland/window.cpp
@@ -1,14 +1,18 @@
 #include "modules/hyprland/window.hpp"
 
 #include <spdlog/spdlog.h>
+#include <optional>
 
 #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>();
@@ -35,9 +39,39 @@ auto Window::update() -> void {
   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;
+  });
+  assert(workspace != std::end(json));
+  return (*workspace)["lastwindowtitle"].as<std::string>();
+}
+
 void Window::onEvent(const std::string& ev) {
   std::lock_guard<std::mutex> lg(mutex_);
-  auto windowName = ev.substr(ev.find_first_of(',') + 1).substr(0, 256);
+
+  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);
+  }
 
   auto replaceAll = [](std::string str, const std::string& from,
                        const std::string& to) -> std::string {