From e5684c6127d2fb063a7171a35cd52e03d5187ab3 Mon Sep 17 00:00:00 2001
From: Andreas Backx <andreas@backx.org>
Date: Fri, 25 Dec 2020 23:03:01 +0000
Subject: [PATCH] Separated name and description setup and moved bar creation
 to done callback.

---
 include/client.hpp |  2 ++
 src/client.cpp     | 51 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/include/client.hpp b/include/client.hpp
index f5339420..f2eafb15 100644
--- a/include/client.hpp
+++ b/include/client.hpp
@@ -45,6 +45,8 @@ class Client {
   static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
                            const char *interface, uint32_t version);
   static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name);
+  static void handleOutputDone(void *, struct zxdg_output_v1 *);
+  static void handleOutputName(void *, struct zxdg_output_v1 *, const char *);
   static void handleOutputDescription(void *, struct zxdg_output_v1 *, const char *);
   void        handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor);
   void        handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
diff --git a/src/client.cpp b/src/client.cpp
index 627904c5..4240f096 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -60,8 +60,8 @@ void waybar::Client::handleOutput(struct waybar_output &output) {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
       .logical_position = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {},
       .logical_size = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {},
-      .done = [](void *, struct zxdg_output_v1 *) {},
-      .name = [](void *, struct zxdg_output_v1 *, const char *) {},
+      .done = &handleOutputDone,
+      .name = &handleOutputName,
       .description = &handleOutputDescription,
   };
   // owned by output->monitor; no need to destroy
@@ -75,7 +75,6 @@ bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_outp
     for (auto const &output_conf : config["output"]) {
       if (output_conf.isString() &&
           (output_conf.asString() == output.name || output_conf.asString() == output.identifier)) {
-        std::cout << output_conf.asString() << std::endl;
         return true;
       }
     }
@@ -84,7 +83,7 @@ bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_outp
     auto config_output = config["output"].asString();
     if (!config_output.empty()) {
       if (config_output.substr(0, 1) == "!") {
-        return config_output.substr(1) != output.name ||
+        return config_output.substr(1) != output.name &&
                config_output.substr(1) != output.identifier;
       }
       return config_output == output.name || config_output == output.identifier;
@@ -117,20 +116,12 @@ std::vector<Json::Value> waybar::Client::getOutputConfigs(struct waybar_output &
   return configs;
 }
 
-void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/,
-                                             const char *description) {
+void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_output*/) {
   auto client = waybar::Client::inst();
   try {
-    auto &      output = client->getOutput(data);
-    const char *open_paren = strrchr(description, '(');
-    const char *close_paren = strrchr(description, ')');
+    auto &output = client->getOutput(data);
+    spdlog::debug("Output detection done: {} ({})", output.name, output.identifier);
 
-    // Description format: "identifier (name)"
-    size_t identifier_length = open_paren - description;
-    output.identifier = std::string(description, identifier_length - 1);
-    output.name = std::string(description + identifier_length + 1, close_paren - open_paren - 1);
-
-    spdlog::debug("Output detected: {}", description);
     auto configs = client->getOutputConfigs(output);
     if (configs.empty()) {
       output.xdg_output.reset();
@@ -148,6 +139,36 @@ void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 *
   }
 }
 
+void waybar::Client::handleOutputName(void *      data, struct zxdg_output_v1 * /*xdg_output*/,
+                                      const char *name) {
+  auto client = waybar::Client::inst();
+  try {
+    auto &output = client->getOutput(data);
+    spdlog::debug("Output detected with name: {} ({} {})",
+                  name,
+                  output.monitor->get_manufacturer(),
+                  output.monitor->get_model());
+    output.name = name;
+  } catch (const std::exception &e) {
+    std::cerr << e.what() << std::endl;
+  }
+}
+
+void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/,
+                                             const char *description) {
+  auto client = waybar::Client::inst();
+  try {
+    auto &      output = client->getOutput(data);
+    const char *open_paren = strrchr(description, '(');
+
+    // Description format: "identifier (name)"
+    size_t identifier_length = open_paren - description;
+    output.identifier = std::string(description, identifier_length - 1);
+  } catch (const std::exception &e) {
+    std::cerr << e.what() << std::endl;
+  }
+}
+
 void waybar::Client::handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor) {
   auto &output = outputs_.emplace_back();
   output.monitor = monitor;