From 85ca5027f41b4c15a7c90a5ffeef3c1f5a2d2340 Mon Sep 17 00:00:00 2001
From: Harit Kapadia <haritkapadia@outlook.com>
Date: Fri, 18 Dec 2020 18:14:14 -0500
Subject: [PATCH 1/2] Fix Sway #waybar.solo CSS rule applying on split

This error occurs because of an incorrect assumption that the size of
the list of nodes that contains the focused window is the number of
windows in a workspace.

The windows in a workspace are stored as a tree by Sway, rather than a
list, so the number of windows has to be found by counting the leaves of
a workspace tree.
---
 src/modules/sway/window.cpp | 47 +++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp
index f10bf1ce..64f72521 100644
--- a/src/modules/sway/window.cpp
+++ b/src/modules/sway/window.cpp
@@ -64,29 +64,51 @@ auto Window::update() -> void {
   ALabel::update();
 }
 
-std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
-    const Json::Value& nodes, std::string& output) {
-  for (auto const& node : nodes) {
+int leafNodesInWorkspace(const Json::Value& node) {
+  auto const& nodes = node["nodes"];
+  if(nodes.empty()) {
+    if(node["type"] == "workspace")
+      return 0;
+    else
+      return 1;
+  }
+  int sum = 0;
+  for(auto const& node : nodes)
+    sum += leafNodesInWorkspace(node);
+  return sum;
+}
+
+std::tuple<std::size_t, int, std::string, std::string> gfnWithWorkspace(
+    const Json::Value& nodes, std::string& output, const Json::Value& config_,
+    const Bar& bar_, Json::Value& parentWorkspace) {
+  for(auto const& node : nodes) {
     if (node["output"].isString()) {
       output = node["output"].asString();
     }
+    // found node
     if (node["focused"].asBool() && (node["type"] == "con" || node["type"] == "floating_con")) {
       if ((!config_["all-outputs"].asBool() && output == bar_.output->name) ||
           config_["all-outputs"].asBool()) {
         auto app_id = node["app_id"].isString() ? node["app_id"].asString()
-                                                : node["window_properties"]["instance"].asString();
-        return {nodes.size(),
-                node["id"].asInt(),
-                Glib::Markup::escape_text(node["name"].asString()),
-                app_id};
+                      : node["window_properties"]["instance"].asString();
+        int nb = node.size();
+        if(parentWorkspace != 0)
+          nb = leafNodesInWorkspace(parentWorkspace);
+        return {nb,
+          node["id"].asInt(),
+          Glib::Markup::escape_text(node["name"].asString()),
+          app_id};
       }
     }
-    auto [nb, id, name, app_id] = getFocusedNode(node["nodes"], output);
+    // iterate
+    if(node["type"] == "workspace")
+      parentWorkspace = node;
+    auto [nb, id, name, app_id] = gfnWithWorkspace(node["nodes"], output, config_, bar_, parentWorkspace);
     if (id > -1 && !name.empty()) {
       return {nb, id, name, app_id};
     }
     // Search for floating node
-    std::tie(nb, id, name, app_id) = getFocusedNode(node["floating_nodes"], output);
+    std::tie(nb, id, name, app_id) = gfnWithWorkspace(node["floating_nodes"], output, config_, bar_, parentWorkspace);
     if (id > -1 && !name.empty()) {
       return {nb, id, name, app_id};
     }
@@ -94,6 +116,11 @@ std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
   return {0, -1, "", ""};
 }
 
+std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
+    const Json::Value& nodes, std::string& output) {
+  return gfnWithWorkspace(nodes, output, config_, bar_, placeholder);
+}
+
 void Window::getTree() {
   try {
     ipc_.sendCmd(IPC_GET_TREE);

From cb7baee045d41d32bd4d90f7e0237f1ec925b528 Mon Sep 17 00:00:00 2001
From: Harit Kapadia <haritkapadia@outlook.com>
Date: Fri, 18 Dec 2020 18:17:17 -0500
Subject: [PATCH 2/2] Fixed compile error

---
 src/modules/sway/window.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp
index 64f72521..e9203451 100644
--- a/src/modules/sway/window.cpp
+++ b/src/modules/sway/window.cpp
@@ -118,6 +118,7 @@ std::tuple<std::size_t, int, std::string, std::string> gfnWithWorkspace(
 
 std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
     const Json::Value& nodes, std::string& output) {
+  Json::Value placeholder = 0;
   return gfnWithWorkspace(nodes, output, config_, bar_, placeholder);
 }