From f101a303bd777219aaa3548da3531ec63dc95dd9 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Tue, 27 Dec 2016 04:15:01 +0100
Subject: [PATCH] fix(bar): Only initialize config values when using
 --print-wmname

---
 include/components/bar.hpp |  4 ++--
 src/components/bar.cpp     | 11 ++++++++---
 src/main.cpp               |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index 07722081..76f30b11 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -36,10 +36,10 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
             public signal_receiver<SIGN_PRIORITY_BAR, sig_ui::tick, sig_ui::shade_window, sig_ui::unshade_window, sig_ui::dim_window> {
  public:
   using make_type = unique_ptr<bar>;
-  static make_type make();
+  static make_type make(bool only_initialize_values = false);
 
   explicit bar(connection&, signal_emitter&, const config&, const logger&, unique_ptr<screen>&&,
-      unique_ptr<tray_manager>&&, unique_ptr<parser>&&, unique_ptr<taskqueue>&&);
+      unique_ptr<tray_manager>&&, unique_ptr<parser>&&, unique_ptr<taskqueue>&&, bool only_initialize_values);
   ~bar();
 
   void parse(string&& data) const;
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index aca0a601..76c7c71f 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -35,7 +35,7 @@ using namespace wm_util;
 /**
  * Create instance
  */
-bar::make_type bar::make() {
+bar::make_type bar::make(bool only_initialize_values) {
   // clang-format off
   return factory_util::unique<bar>(
         connection::make(),
@@ -45,7 +45,8 @@ bar::make_type bar::make() {
         screen::make(),
         tray_manager::make(),
         parser::make(),
-        taskqueue::make());
+        taskqueue::make(),
+        only_initialize_values);
   // clang-format on
 }
 
@@ -56,7 +57,7 @@ bar::make_type bar::make() {
  */
 bar::bar(connection& conn, signal_emitter& emitter, const config& config, const logger& logger,
     unique_ptr<screen>&& screen, unique_ptr<tray_manager>&& tray_manager, unique_ptr<parser>&& parser,
-    unique_ptr<taskqueue>&& taskqueue)
+    unique_ptr<taskqueue>&& taskqueue, bool only_initialize_values)
     : m_connection(conn)
     , m_sig(emitter)
     , m_conf(config)
@@ -144,6 +145,10 @@ bar::bar(connection& conn, signal_emitter& emitter, const config& config, const
   m_opts.separator = string_util::trim(m_conf.get<string>(bs, "separator", ""), '"');
   m_opts.locale = m_conf.get<string>(bs, "locale", "");
 
+  if (only_initialize_values) {
+    return;
+  }
+
   // Load values used to adjust the struts atom
   m_opts.strut.top = m_conf.get<int>("global/wm", "margin-top", 0);
   m_opts.strut.bottom = m_conf.get<int>("global/wm", "margin-bottom", 0);
diff --git a/src/main.cpp b/src/main.cpp
index fa03d860..06c1e34c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -110,7 +110,7 @@ int main(int argc, char** argv) {
       return EXIT_SUCCESS;
     }
     if (cli->has("print-wmname")) {
-      std::cout << bar::make()->settings().wmname << std::endl;
+      std::cout << bar::make(true)->settings().wmname << std::endl;
       return EXIT_SUCCESS;
     }