From 9b28ba7a5eabcc61d5d9891fa8cab3285a371788 Mon Sep 17 00:00:00 2001
From: Maxim Kolesnikov <indev.src@gmail.com>
Date: Mon, 4 Apr 2022 17:49:13 +0700
Subject: [PATCH 01/32] fix(script): clear output when exec-if fails (#2675)

Fixes #2674
---
 CHANGELOG.md                   | 2 ++
 src/adapters/script_runner.cpp | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f4936cd..160aadbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- `custom/script`: Output clearing when `exec-if` fails ([`#2674`](https://github.com/polybar/polybar/issues/2674))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/src/adapters/script_runner.cpp b/src/adapters/script_runner.cpp
index 23a791f4..c1742199 100644
--- a/src/adapters/script_runner.cpp
+++ b/src/adapters/script_runner.cpp
@@ -45,7 +45,10 @@ script_runner::interval script_runner::process() {
 }
 
 void script_runner::clear_output() {
-  set_output("");
+  auto changed = set_output("");
+  if (changed) {
+    m_on_update(m_data);
+  }
 }
 
 void script_runner::stop() {

From 7d9227cb0855d0cb559612ff50faf8fd17d6dba3 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Thu, 7 Apr 2022 15:24:14 +0200
Subject: [PATCH 02/32] fix(battery): polling-interval not working (#2677)

Fixes #2649
---
 CHANGELOG.md            | 1 +
 src/modules/battery.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 160aadbe..56cf2b64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Fixed
 - `custom/script`: Output clearing when `exec-if` fails ([`#2674`](https://github.com/polybar/polybar/issues/2674))
+- `internal/battery`: `poll-interval` not working ([`#2649`](https://github.com/polybar/polybar/issues/2649), [`#2677`](https://github.com/polybar/polybar/pull/2677))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 7b8c4163..729f8a02 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -199,7 +199,7 @@ namespace modules {
       if (chrono::duration_cast<decltype(m_interval)>(now - m_lastpoll) > m_interval) {
         m_lastpoll = now;
         m_log.info("%s: Polling values (inotify fallback)", name());
-        read(*m_capacity_reader);
+        on_event(nullptr);
       }
     }
 

From 146c1ac1d7c7f98279f6fae19466ded73c2186e7 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Thu, 7 Apr 2022 15:33:56 +0200
Subject: [PATCH 03/32] fix(ipc): Fallback folder not being user-specific
 (#2684)

If two users start a bar with IPC and don't have XDG_RUNTIME_DIR set,
polybar will create the fallback directory `/tmp/polybar`.
However, that directory is only accessible by the user that created it
and so polybar running under the second user will fail to open its
socket there.

We add the UID to the fallback directory to prevent this.

Fixes #2683
---
 CHANGELOG.md                  | 1 +
 include/ipc/ipc.hpp           | 4 +---
 src/components/controller.cpp | 2 --
 src/ipc/util.cpp              | 9 ++++++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56cf2b64..b25bcdb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - `custom/script`: Output clearing when `exec-if` fails ([`#2674`](https://github.com/polybar/polybar/issues/2674))
 - `internal/battery`: `poll-interval` not working ([`#2649`](https://github.com/polybar/polybar/issues/2649), [`#2677`](https://github.com/polybar/polybar/pull/2677))
+- ipc: Polybar failing to open IPC channel after another user already ran polybar, if `XDG_RUNTIME_DIR` is not set ([`#2683`](https://github.com/polybar/polybar/issues/2683), [`#2684`](https://github.com/polybar/polybar/pull/2684))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/include/ipc/ipc.hpp b/include/ipc/ipc.hpp
index 0ba8af1b..7e2e0068 100644
--- a/include/ipc/ipc.hpp
+++ b/include/ipc/ipc.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <uv.h>
-
 #include <set>
 
 #include "common.hpp"
@@ -94,6 +92,6 @@ namespace ipc {
     void receive_data(string buf);
     void receive_eof();
   };
-}  // namespace ipc
+} // namespace ipc
 
 POLYBAR_NS_END
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index ec856766..77681e1c 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -1,7 +1,5 @@
 #include "components/controller.hpp"
 
-#include <uv.h>
-
 #include <csignal>
 #include <utility>
 
diff --git a/src/ipc/util.cpp b/src/ipc/util.cpp
index b93cd36e..0a1d2315 100644
--- a/src/ipc/util.cpp
+++ b/src/ipc/util.cpp
@@ -1,6 +1,7 @@
 #include "ipc/util.hpp"
 
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "errors.hpp"
 #include "utils/env.hpp"
@@ -12,8 +13,14 @@ POLYBAR_NS
 namespace ipc {
 
   static constexpr auto SUFFIX = ".sock";
+  static constexpr auto XDG_RUNTIME_DIR = "XDG_RUNTIME_DIR";
 
   string get_runtime_path() {
+    if (env_util::has(XDG_RUNTIME_DIR)) {
+      return env_util::get("XDG_RUNTIME_DIR") + "/polybar";
+    } else {
+      return "/tmp/polybar-" + to_string(getuid());
+    }
     return env_util::get("XDG_RUNTIME_DIR", "/tmp") + "/polybar";
   }
 
@@ -59,6 +66,6 @@ namespace ipc {
       return -1;
     }
   }
-}  // namespace ipc
+} // namespace ipc
 
 POLYBAR_NS_END

From ab206a5f8e3423ae3f634a7c639e2da0aeb9777d Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Mon, 11 Apr 2022 21:30:24 +0200
Subject: [PATCH 04/32] fix: No overlines/underlines being drawn when using
 offsets (#2685)

---
 CHANGELOG.md                    |  1 +
 include/components/renderer.hpp |  2 +-
 src/components/renderer.cpp     | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b25bcdb0..6f2524d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `custom/script`: Output clearing when `exec-if` fails ([`#2674`](https://github.com/polybar/polybar/issues/2674))
 - `internal/battery`: `poll-interval` not working ([`#2649`](https://github.com/polybar/polybar/issues/2649), [`#2677`](https://github.com/polybar/polybar/pull/2677))
 - ipc: Polybar failing to open IPC channel after another user already ran polybar, if `XDG_RUNTIME_DIR` is not set ([`#2683`](https://github.com/polybar/polybar/issues/2683), [`#2684`](https://github.com/polybar/polybar/pull/2684))
+- No overlines/underlines being drawn when using offsets ([`#2685`](https://github.com/polybar/polybar/pull/2685))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/include/components/renderer.hpp b/include/components/renderer.hpp
index 5dfc998a..c399b7e8 100644
--- a/include/components/renderer.hpp
+++ b/include/components/renderer.hpp
@@ -72,7 +72,7 @@ class renderer : public renderer_interface,
   void fill_overline(rgba color, double x, double w);
   void fill_underline(rgba color, double x, double w);
   void fill_borders();
-  void draw_offset(rgba color, double x, double w);
+  void draw_offset(const tags::context& ctxt, rgba color, double x, double w);
 
   double block_x(alignment a) const;
   double block_y(alignment a) const;
diff --git a/src/components/renderer.cpp b/src/components/renderer.cpp
index 4da65ec9..493f5ef6 100644
--- a/src/components/renderer.cpp
+++ b/src/components/renderer.cpp
@@ -728,8 +728,12 @@ void renderer::render_text(const tags::context& ctxt, const string&& contents) {
   }
 }
 
-void renderer::draw_offset(rgba color, double x, double w) {
-  if (w > 0 && color != m_bar.background) {
+void renderer::draw_offset(const tags::context& ctxt, rgba color, double x, double w) {
+  if (w <= 0) {
+    return;
+  }
+
+  if (color != m_bar.background) {
     m_log.trace_x("renderer: offset(x=%f, w=%f)", x, w);
     m_context->save();
     *m_context << m_comp_bg;
@@ -739,6 +743,14 @@ void renderer::draw_offset(rgba color, double x, double w) {
     m_context->fill();
     m_context->restore();
   }
+
+  if (ctxt.has_underline()) {
+    fill_underline(ctxt.get_ul(), x, w);
+  }
+
+  if (ctxt.has_overline()) {
+    fill_overline(ctxt.get_ol(), x, w);
+  }
 }
 
 void renderer::render_offset(const tags::context& ctxt, const extent_val offset) {
@@ -746,7 +758,7 @@ void renderer::render_offset(const tags::context& ctxt, const extent_val offset)
 
   int offset_width = units_utils::extent_to_pixel(offset, m_bar.dpi_x);
   rgba bg = ctxt.get_bg();
-  draw_offset(bg, m_blocks[m_align].x, offset_width);
+  draw_offset(ctxt, bg, m_blocks[m_align].x, offset_width);
   increase_x(offset_width);
 }
 

From 4f923ededc32c4aab627d840dacd1cbec61afb18 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Wed, 13 Apr 2022 10:47:01 +0200
Subject: [PATCH 05/32] doc: Fix menu module action migration example (#2687)

The label-open was missing, making the snippet not work as-is.
In addition, backgrounding programs is no longer necessary

Ref #2686
---
 doc/user/actions.rst | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/user/actions.rst b/doc/user/actions.rst
index 850a8c4a..24c6089f 100644
--- a/doc/user/actions.rst
+++ b/doc/user/actions.rst
@@ -406,20 +406,22 @@ Below you can see an example of a menu module:
   [module/apps]
   type = custom/menu
 
+  label-open = Apps
+
   menu-0-0 = Browsers
   menu-0-0-exec = menu-open-1
   menu-0-1 = Multimedia
   menu-0-1-exec = menu-open-2
 
   menu-1-0 = Firefox
-  menu-1-0-exec = firefox &
+  menu-1-0-exec = firefox
   menu-1-1 = Chromium
-  menu-1-1-exec = chromium &
+  menu-1-1-exec = chromium
 
   menu-2-0 = Gimp
-  menu-2-0-exec = gimp &
+  menu-2-0-exec = gimp
   menu-2-1 = Scrot
-  menu-2-1-exec = scrot &
+  menu-2-1-exec = scrot
 
 This module uses two actions: ``menu-open-1`` and ``menu-open-2``.
 These are actions with data, the data specifies which level of the menu should
@@ -437,17 +439,19 @@ likely not use ``apps``, but the name of your module.
   [module/apps]
   type = custom/menu
 
+  label-open = Apps
+
   menu-0-0 = Browsers
   menu-0-0-exec = #apps.open.1
   menu-0-1 = Multimedia
   menu-0-1-exec = #apps.open.2
 
   menu-1-0 = Firefox
-  menu-1-0-exec = firefox &
+  menu-1-0-exec = firefox
   menu-1-1 = Chromium
-  menu-1-1-exec = chromium &
+  menu-1-1-exec = chromium
 
   menu-2-0 = Gimp
-  menu-2-0-exec = gimp &
+  menu-2-0-exec = gimp
   menu-2-1 = Scrot
-  menu-2-1-exec = scrot &
+  menu-2-1-exec = scrot

From b5292791ef065c860cf2fc842ade1694acd2df31 Mon Sep 17 00:00:00 2001
From: Mathis Weber <83180705+Zaphoood@users.noreply.github.com>
Date: Mon, 25 Apr 2022 03:59:40 -0700
Subject: [PATCH 06/32] fix: check if double click action associated (#2695)

When a module is clicked, only wait for the double click interval if a
double click action is associated with that module. Otherwise trigger
the click right away.

Fixes: #2663
---
 CHANGELOG.md               |  3 +++
 include/components/bar.hpp |  3 ++-
 src/components/bar.cpp     | 22 +++++++++-------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce7c11e..6fabbcd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `custom/text`: Loads the `format` setting, which supports the `<label>` tag, if the deprecated `content` is not defined ([`#1331`](https://github.com/polybar/polybar/issues/1331), [`#2673`](https://github.com/polybar/polybar/pull/2673), [`#2676`](https://github.com/polybar/polybar/pull/2676))
 - Added experimental support for positioning the tray like a module
 
+### Fixed
+- Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
+
 ## [3.6.2] - 2022-04-03
 ### Fixed
 - `format-offset` being ignored ([`#2643`](https://github.com/polybar/polybar/pull/2643))
diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index 9cb68f1a..f35648de 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdlib>
+#include <set>
 
 #include "common.hpp"
 #include "components/eventloop.hpp"
@@ -104,7 +105,7 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
   string m_cursor{};
 
   string m_lastinput{};
-  bool m_dblclicks{false};
+  std::set<mousebtn> m_dblclicks;
 
   eventloop::TimerHandle& m_leftclick_timer{m_loop.handle<eventloop::TimerHandle>()};
   eventloop::TimerHandle& m_middleclick_timer{m_loop.handle<eventloop::TimerHandle>()};
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 2c06674f..28a85c1e 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -415,19 +415,12 @@ void bar::parse(string&& data, bool force) {
 
   m_renderer->end();
 
-  const auto check_dblclicks = [&]() -> bool {
-    if (m_action_ctxt->has_double_click()) {
-      return true;
+  m_dblclicks.clear();
+  for (auto&& action : m_opts.actions) {
+    if (static_cast<int>(action.button) >= static_cast<int>(mousebtn::DOUBLE_LEFT)) {
+      m_dblclicks.insert(action.button);
     }
-
-    for (auto&& action : m_opts.actions) {
-      if (static_cast<int>(action.button) >= static_cast<int>(mousebtn::DOUBLE_LEFT)) {
-        return true;
-      }
-    }
-    return false;
-  };
-  m_dblclicks = check_dblclicks();
+  }
 }
 
 /**
@@ -818,9 +811,12 @@ void bar::handle(const evt::button_press& evt) {
     }
   };
 
+  mousebtn double_btn = mousebtn_get_double(btn);
+  bool has_dblclick = m_dblclicks.count(double_btn) || m_action_ctxt->has_action(double_btn, pos) != tags::NO_ACTION;
+
   // If there are no double click handlers defined we can
   // just by-pass the click timer handling
-  if (!m_dblclicks) {
+  if (!has_dblclick) {
     trigger_click(btn, pos);
   } else if (btn == mousebtn::LEFT) {
     check_double(m_leftclick_timer, btn, pos);

From bc9dda266f57f7ae3a2300a9418d94c3fe62c466 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Mon, 25 Apr 2022 17:46:53 +0200
Subject: [PATCH 07/32] fix(xworkspaces): Update on _NET_DESKTOP_VIEWPORT
 (#2698)

Fixes #2693
---
 CHANGELOG.md                | 4 +++-
 src/modules/xworkspaces.cpp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f2524d2..05f97753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `format-offset` being ignored ([`#2643`](https://github.com/polybar/polybar/pull/2643))
 - Negative struts (`margin-bottom`, `margin-top`) being ignored ([`#2642`](https://github.com/polybar/polybar/issues/2642), [`#2644`](https://github.com/polybar/polybar/pull/2644))
 - Positioning in awesomeWM ([`#2651`](https://github.com/polybar/polybar/pull/2651))
-- `internal/xworkspaces`: The module sometimes crashed polybar when windows were closed. ([`#2655`](https://github.com/polybar/polybar/pull/2655))
+- `internal/xworkspaces`:
+  - The module sometimes crashed polybar when windows were closed. ([`#2655`](https://github.com/polybar/polybar/pull/2655))
+  - Updates of `_NET_DESKTOP_VIEWPORT` being ignored ([`#2693`](https://github.com/polybar/polybar/issues/2693), [`#2698`](https://github.com/polybar/polybar/pull/2698))
 - Mouseover error when only one cursor is defined ([`#2656`](https://github.com/polybar/polybar/pull/2656))
 - `custom/script`: Timing inconsistencies ([`#2650`](https://github.com/polybar/polybar/issues/2650), first described at [`#2630`](https://github.com/polybar/polybar/pull/2630))
 
diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp
index dd64c44c..9ed49dba 100644
--- a/src/modules/xworkspaces.cpp
+++ b/src/modules/xworkspaces.cpp
@@ -111,7 +111,8 @@ namespace modules {
     if (evt->atom == m_ewmh->_NET_CLIENT_LIST || evt->atom == m_ewmh->_NET_WM_DESKTOP) {
       rebuild_clientlist();
       rebuild_desktop_states();
-    } else if (evt->atom == m_ewmh->_NET_DESKTOP_NAMES || evt->atom == m_ewmh->_NET_NUMBER_OF_DESKTOPS) {
+    } else if (evt->atom == m_ewmh->_NET_DESKTOP_NAMES || evt->atom == m_ewmh->_NET_NUMBER_OF_DESKTOPS ||
+               evt->atom == m_ewmh->_NET_DESKTOP_VIEWPORT) {
       m_desktop_names = get_desktop_names();
       rebuild_desktops();
       rebuild_clientlist();

From 6a2d7b5dde8884f2bf2e5e9e24f8d8806e9ef38e Mon Sep 17 00:00:00 2001
From: marxlaml <44244974+marxlaml@users.noreply.github.com>
Date: Wed, 27 Apr 2022 20:53:06 +0300
Subject: [PATCH 08/32] feat(backlight): Add `scroll-interval` (#2700)

Closes #2696

* Added `scroll-interval` option to `internal/backlight`

* Added PR to CHANGELOG.md

* Fixed indentation
---
 CHANGELOG.md                  | 1 +
 include/modules/backlight.hpp | 1 +
 src/modules/backlight.cpp     | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fabbcd8..b67c749e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `custom/script`: Repeat interval for script failure (`interval-fail`) and `exec-if` (`interval-if`) ([`#943`](https://github.com/polybar/polybar/issues/943), [`#2606`](https://github.com/polybar/polybar/issues/2606), [`#2630`](https://github.com/polybar/polybar/pull/2630))
 - `custom/text`: Loads the `format` setting, which supports the `<label>` tag, if the deprecated `content` is not defined ([`#1331`](https://github.com/polybar/polybar/issues/1331), [`#2673`](https://github.com/polybar/polybar/pull/2673), [`#2676`](https://github.com/polybar/polybar/pull/2676))
 - Added experimental support for positioning the tray like a module
+- `internal/backlight`: `scroll-interval` option ([`#2696`](https://github.com/polybar/polybar/issues/2696), [`#2700`](https://github.com/polybar/polybar/pull/2700))
 
 ### Fixed
 - Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
diff --git a/include/modules/backlight.hpp b/include/modules/backlight.hpp
index 17a46903..0c86215e 100644
--- a/include/modules/backlight.hpp
+++ b/include/modules/backlight.hpp
@@ -48,6 +48,7 @@ namespace modules {
     string m_path_backlight;
     float m_max_brightness;
     bool m_scroll{false};
+    int m_scroll_interval{5};
     bool m_use_actual_brightness{true};
 
     brightness_handle m_val;
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 8603ade7..59c3fd5a 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -33,6 +33,8 @@ namespace modules {
     // Get flag to check if we should add scroll handlers for changing value
     m_scroll = m_conf.get(name(), "enable-scroll", m_scroll);
 
+    m_scroll_interval = m_conf.get(name(), "scroll-interval", m_scroll_interval);
+
     // Add formats and elements
     m_formatter->add(DEFAULT_FORMAT, TAG_LABEL, {TAG_LABEL, TAG_BAR, TAG_RAMP});
 
@@ -120,11 +122,11 @@ namespace modules {
   }
 
   void backlight_module::action_inc() {
-    change_value(5);
+    change_value(m_scroll_interval);
   }
 
   void backlight_module::action_dec() {
-    change_value(-5);
+    change_value(-m_scroll_interval);
   }
 
   void backlight_module::change_value(int value_mod) {

From efbd8e394f52d38ba23845c369ab7afc74b60536 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Wed, 27 Apr 2022 21:09:59 +0200
Subject: [PATCH 09/32] fix(bar): Update struts when hiding (#2702)

When the bar is hidden, the struts should be 0 so that WMs can resize
their windows and not leave a gap.

Ref #2701
---
 CHANGELOG.md           |  1 +
 src/components/bar.cpp | 71 ++++++++++++++++++++++--------------------
 src/x11/window.cpp     |  6 ++--
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05f97753..c3ee2e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `internal/battery`: `poll-interval` not working ([`#2649`](https://github.com/polybar/polybar/issues/2649), [`#2677`](https://github.com/polybar/polybar/pull/2677))
 - ipc: Polybar failing to open IPC channel after another user already ran polybar, if `XDG_RUNTIME_DIR` is not set ([`#2683`](https://github.com/polybar/polybar/issues/2683), [`#2684`](https://github.com/polybar/polybar/pull/2684))
 - No overlines/underlines being drawn when using offsets ([`#2685`](https://github.com/polybar/polybar/pull/2685))
+- Update struts (`_NET_WM_STRUT_PARTIAL`) when hiding the bar ([`#2702`](https://github.com/polybar/polybar/pull/2702))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index b2efa93c..7a08f67a 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -440,10 +440,11 @@ void bar::hide() {
 
   try {
     m_log.info("Hiding bar window");
+    m_visible = false;
+    reconfigure_struts();
     m_sig.emit(visibility_change{false});
     m_connection.unmap_window_checked(m_opts.window);
     m_connection.flush();
-    m_visible = false;
   } catch (const exception& err) {
     m_log.err("Failed to unmap bar window (err=%s", err.what());
   }
@@ -556,42 +557,46 @@ void bar::reconfigure_pos() {
  * Reconfigure window strut values
  */
 void bar::reconfigure_struts() {
-  auto geom = m_connection.get_geometry(m_screen->root());
-  int h = m_opts.size.h + m_opts.offset.y;
+  window win{m_connection, m_opts.window};
+  if (m_visible) {
+    auto geom = m_connection.get_geometry(m_screen->root());
+    int h = m_opts.size.h + m_opts.offset.y;
 
-  // Apply user-defined margins
-  if (m_opts.bottom) {
-    h += m_opts.strut.top;
-  } else {
-    h += m_opts.strut.bottom;
-  }
-
-  h = std::max(h, 0);
-
-  int correction = 0;
-
-  // Only apply correction if any space is requested
-  if (h > 0) {
-    /*
-     * Strut coordinates have to be relative to root window and not any monitor.
-     * If any monitor is not aligned at the top or bottom
-     */
+    // Apply user-defined margins
     if (m_opts.bottom) {
-      /*
-       * For bottom-algined bars, the correction is the number of pixels between
-       * the root window's bottom edge and the monitor's bottom edge
-       */
-      correction = geom->height - (m_opts.monitor->y + m_opts.monitor->h);
+      h += m_opts.strut.top;
     } else {
-      // For top-aligned bars, we simply add the monitor's y-position
-      correction = m_opts.monitor->y;
+      h += m_opts.strut.bottom;
     }
 
-    correction = std::max(correction, 0);
-  }
+    h = std::max(h, 0);
 
-  window win{m_connection, m_opts.window};
-  win.reconfigure_struts(m_opts.size.w, h + correction, m_opts.pos.x, m_opts.bottom);
+    int correction = 0;
+
+    // Only apply correction if any space is requested
+    if (h > 0) {
+      /*
+       * Strut coordinates have to be relative to root window and not any monitor.
+       * If any monitor is not aligned at the top or bottom
+       */
+      if (m_opts.bottom) {
+        /*
+         * For bottom-algined bars, the correction is the number of pixels between
+         * the root window's bottom edge and the monitor's bottom edge
+         */
+        correction = geom->height - (m_opts.monitor->y + m_opts.monitor->h);
+      } else {
+        // For top-aligned bars, we simply add the monitor's y-position
+        correction = m_opts.monitor->y;
+      }
+
+      correction = std::max(correction, 0);
+    }
+    win.reconfigure_struts(m_opts.size.w, h + correction, m_opts.pos.x, m_opts.bottom);
+  } else {
+    // Set struts to 0 for invisible bars
+    win.reconfigure_struts(0, 0, 0, m_opts.bottom);
+  }
 }
 
 /**
@@ -634,6 +639,8 @@ void bar::broadcast_visibility() {
 }
 
 void bar::map_window() {
+  m_visible = true;
+
   /**
    * First reconfigures the window so that WMs that discard some information
    * when unmapping have the correct window properties (geometry etc).
@@ -648,8 +655,6 @@ void bar::map_window() {
    * mapping. Additionally updating the window position after mapping seems to fix that.
    */
   reconfigure_pos();
-
-  m_visible = true;
 }
 
 void bar::trigger_click(mousebtn btn, int pos) {
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 0c31505a..601cc003 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -57,14 +57,16 @@ window window::reconfigure_pos(short int x, short int y) {
 window window::reconfigure_struts(uint32_t w, uint32_t strut, uint32_t x, bool bottom) {
   std::array<uint32_t, 12> values{};
 
+  uint32_t end_x = std::max<int>(0, x + w - 1);
+
   if (bottom) {
     values[to_integral(strut::BOTTOM)] = strut;
     values[to_integral(strut::BOTTOM_START_X)] = x;
-    values[to_integral(strut::BOTTOM_END_X)] = x + w - 1;
+    values[to_integral(strut::BOTTOM_END_X)] = end_x;
   } else {
     values[to_integral(strut::TOP)] = strut;
     values[to_integral(strut::TOP_START_X)] = x;
-    values[to_integral(strut::TOP_END_X)] = x + w - 1;
+    values[to_integral(strut::TOP_END_X)] = end_x;
   }
 
   connection().change_property_checked(

From f9fc02e69cf85d75347d75b51be851da3a791ff5 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Sat, 30 Apr 2022 23:03:00 +0200
Subject: [PATCH 10/32] Add backup directive to PKGBUILD (#2704)

This way changes to the default config made by users are preserved if
polybar ever changes the default config

Ref: https://aur.archlinux.org/packages/polybar-git#comment-863283
---
 contrib/polybar-git.aur/PKGBUILD | 1 +
 contrib/polybar.aur/PKGBUILD     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-git.aur/PKGBUILD
index 9663eb4e..8e4835ca 100644
--- a/contrib/polybar-git.aur/PKGBUILD
+++ b/contrib/polybar-git.aur/PKGBUILD
@@ -14,6 +14,7 @@ depends=("libuv" "cairo" "xcb-util-image" "xcb-util-wm" "xcb-util-xrm"
 optdepends=("i3-wm: i3 module support")
 makedepends=("cmake" "git" "python" "pkg-config" "python-sphinx"
              "python-packaging" "i3-wm")
+backup=("etc/polybar/config.ini")
 provides=("polybar")
 conflicts=("polybar")
 source=("${_pkgname}::git+${url}.git")
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
index 0445d6bc..a6b2341f 100644
--- a/contrib/polybar.aur/PKGBUILD
+++ b/contrib/polybar.aur/PKGBUILD
@@ -12,6 +12,7 @@ depends=("libuv" "cairo" "xcb-util-image" "xcb-util-wm" "xcb-util-xrm"
          "jsoncpp" "curl")
 optdepends=("i3-wm: i3 module support")
 makedepends=("cmake" "python" "pkg-config" "python-sphinx" "python-packaging" "i3-wm")
+backup=("etc/polybar/config.ini")
 conflicts=("polybar-git")
 source=(${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 sha256sums=('73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0')

From 423cc1720fe9f9dbf71dff877768b69014c17e9c Mon Sep 17 00:00:00 2001
From: Mathis Weber <83180705+Zaphoood@users.noreply.github.com>
Date: Mon, 2 May 2022 12:54:03 +0200
Subject: [PATCH 11/32] fs: fallback if no mountpoints specified (#2705)

Ref #2572
---
 CHANGELOG.md       | 3 +++
 src/modules/fs.cpp | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b67c749e..fd6313a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added experimental support for positioning the tray like a module
 - `internal/backlight`: `scroll-interval` option ([`#2696`](https://github.com/polybar/polybar/issues/2696), [`#2700`](https://github.com/polybar/polybar/pull/2700))
 
+### Changed
+- `internal/fs`: Use `/` as a fallback if no mountpoints are specified ([`#2572`](https://github.com/polybar/polybar/issues/2572), [`#2705`](https://github.com/polybar/polybar/pull/2705))
+
 ### Fixed
 - Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
 
diff --git a/src/modules/fs.cpp b/src/modules/fs.cpp
index e13ef443..ad1ac250 100644
--- a/src/modules/fs.cpp
+++ b/src/modules/fs.cpp
@@ -27,7 +27,11 @@ namespace modules {
    * setting up required components
    */
   fs_module::fs_module(const bar_settings& bar, string name_) : timer_module<fs_module>(bar, move(name_)) {
-    m_mountpoints = m_conf.get_list(name(), "mount");
+    m_mountpoints = m_conf.get_list(name(), "mount", {});
+    if (m_mountpoints.empty()) {
+      m_log.info("%s: No mountpoints specified, using fallback \"/\"", name());
+      m_mountpoints.emplace_back("/");
+    }
     m_remove_unmounted = m_conf.get(name(), "remove-unmounted", m_remove_unmounted);
     m_perc_used_warn = m_conf.get(name(), "warn-percentage", 90);
     m_fixed = m_conf.get(name(), "fixed-values", m_fixed);

From f653c3a7381294f383b65685a92d585a2e990ee9 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Wed, 4 May 2022 08:58:53 +0200
Subject: [PATCH 12/32] fix(pulse): Hanging during connection setup (#2709)

If context_state_callback is called before we call
pa_threaded_mainloop_wait in the main thread, the signal is lost and we
wait forever.

Fixes #2707
Ref #2699
Ref #2697
---
 CHANGELOG.md                    |  1 +
 include/adapters/pulseaudio.hpp |  6 ++++++
 src/adapters/pulseaudio.cpp     | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3ee2e7b..8aa1c047 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - ipc: Polybar failing to open IPC channel after another user already ran polybar, if `XDG_RUNTIME_DIR` is not set ([`#2683`](https://github.com/polybar/polybar/issues/2683), [`#2684`](https://github.com/polybar/polybar/pull/2684))
 - No overlines/underlines being drawn when using offsets ([`#2685`](https://github.com/polybar/polybar/pull/2685))
 - Update struts (`_NET_WM_STRUT_PARTIAL`) when hiding the bar ([`#2702`](https://github.com/polybar/polybar/pull/2702))
+- `internal/pulseaudio`: Hanging during startup ([`#2707`](https://github.com/polybar/polybar/issues/2707), [`#2709`](https://github.com/polybar/polybar/pull/2709))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
diff --git a/include/adapters/pulseaudio.hpp b/include/adapters/pulseaudio.hpp
index a5d23426..1ee10b52 100644
--- a/include/adapters/pulseaudio.hpp
+++ b/include/adapters/pulseaudio.hpp
@@ -2,6 +2,7 @@
 
 #include <pulse/pulseaudio.h>
 
+#include <atomic>
 #include <queue>
 
 #include "common.hpp"
@@ -58,6 +59,11 @@ class pulseaudio {
 
   const logger& m_log;
 
+  /**
+   * Has context_state_callback signalled the mainloop during connection.
+   */
+  std::atomic_bool m_state_callback_signal{false};
+
   // used for temporary callback results
   int success{0};
   pa_cvolume cv{};
diff --git a/src/adapters/pulseaudio.cpp b/src/adapters/pulseaudio.cpp
index 1a6a15b8..8404cceb 100644
--- a/src/adapters/pulseaudio.cpp
+++ b/src/adapters/pulseaudio.cpp
@@ -24,6 +24,8 @@ pulseaudio::pulseaudio(const logger& logger, string&& sink_name, bool max_volume
 
   pa_context_set_state_callback(m_context, context_state_callback, this);
 
+  m_state_callback_signal = false;
+
   if (pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0) {
     pa_context_disconnect(m_context);
     pa_context_unref(m_context);
@@ -42,7 +44,17 @@ pulseaudio::pulseaudio(const logger& logger, string&& sink_name, bool max_volume
 
   m_log.trace("pulseaudio: started mainloop");
 
-  pa_threaded_mainloop_wait(m_mainloop);
+  /*
+   * Only wait for signal from the context state callback, if it has not
+   * already signalled the mainloop since pa_context_connect was called,
+   * otherwise, we would wait forever.
+   *
+   * The while loop ensures spurious wakeups are handled.
+   */
+  while (!m_state_callback_signal) {
+    pa_threaded_mainloop_wait(m_mainloop);
+  }
+
   if (pa_context_get_state(m_context) != PA_CONTEXT_READY) {
     pa_threaded_mainloop_unlock(m_mainloop);
     pa_threaded_mainloop_stop(m_mainloop);
@@ -310,6 +322,7 @@ void pulseaudio::context_state_callback(pa_context* context, void* userdata) {
     case PA_CONTEXT_READY:
     case PA_CONTEXT_TERMINATED:
     case PA_CONTEXT_FAILED:
+      This->m_state_callback_signal = true;
       pa_threaded_mainloop_signal(This->m_mainloop, 0);
       break;
 

From a962a2658d2cdb33b2e653e4946cc5204ee11899 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 4 May 2022 09:01:28 +0200
Subject: [PATCH 13/32] Version 3.6.3

---
 CHANGELOG.md | 10 ++++++----
 version.txt  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa1c047..68708ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [3.6.3] - 2022-05-04
 ### Fixed
 - `custom/script`: Output clearing when `exec-if` fails ([`#2674`](https://github.com/polybar/polybar/issues/2674))
 - `internal/battery`: `poll-interval` not working ([`#2649`](https://github.com/polybar/polybar/issues/2649), [`#2677`](https://github.com/polybar/polybar/pull/2677))
@@ -16,15 +18,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - No overlines/underlines being drawn when using offsets ([`#2685`](https://github.com/polybar/polybar/pull/2685))
 - Update struts (`_NET_WM_STRUT_PARTIAL`) when hiding the bar ([`#2702`](https://github.com/polybar/polybar/pull/2702))
 - `internal/pulseaudio`: Hanging during startup ([`#2707`](https://github.com/polybar/polybar/issues/2707), [`#2709`](https://github.com/polybar/polybar/pull/2709))
+- `internal/xworkspaces`: Updates of `_NET_DESKTOP_VIEWPORT` being ignored ([`#2693`](https://github.com/polybar/polybar/issues/2693), [`#2698`](https://github.com/polybar/polybar/pull/2698))
 
 ## [3.6.2] - 2022-04-03
 ### Fixed
 - `format-offset` being ignored ([`#2643`](https://github.com/polybar/polybar/pull/2643))
 - Negative struts (`margin-bottom`, `margin-top`) being ignored ([`#2642`](https://github.com/polybar/polybar/issues/2642), [`#2644`](https://github.com/polybar/polybar/pull/2644))
 - Positioning in awesomeWM ([`#2651`](https://github.com/polybar/polybar/pull/2651))
-- `internal/xworkspaces`:
-  - The module sometimes crashed polybar when windows were closed. ([`#2655`](https://github.com/polybar/polybar/pull/2655))
-  - Updates of `_NET_DESKTOP_VIEWPORT` being ignored ([`#2693`](https://github.com/polybar/polybar/issues/2693), [`#2698`](https://github.com/polybar/polybar/pull/2698))
+- `internal/xworkspaces`: The module sometimes crashed polybar when windows were closed. ([`#2655`](https://github.com/polybar/polybar/pull/2655))
 - Mouseover error when only one cursor is defined ([`#2656`](https://github.com/polybar/polybar/pull/2656))
 - `custom/script`: Timing inconsistencies ([`#2650`](https://github.com/polybar/polybar/issues/2650), first described at [`#2630`](https://github.com/polybar/polybar/pull/2630))
 
@@ -181,7 +182,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Empty color values are no longer treated as invalid and no longer produce an error.
 
-[Unreleased]: https://github.com/polybar/polybar/compare/3.6.2...HEAD
+[Unreleased]: https://github.com/polybar/polybar/compare/3.6.3...HEAD
+[3.6.3]: https://github.com/polybar/polybar/releases/tag/3.6.3
 [3.6.2]: https://github.com/polybar/polybar/releases/tag/3.6.2
 [3.6.1]: https://github.com/polybar/polybar/releases/tag/3.6.1
 [3.6.0]: https://github.com/polybar/polybar/releases/tag/3.6.0
diff --git a/version.txt b/version.txt
index dded6f39..da99c325 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 # Polybar version information
 # Update this on every release
 # This is used to create the version string if a git repo is not available
-3.6.2
+3.6.3

From 46358792e0dd75a5e41b71102ed5bac2c161f571 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 4 May 2022 11:09:55 +0200
Subject: [PATCH 14/32] fix(build): Changes in inotify module

---
 src/modules/battery.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index ea7aa13e..2c262287 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -199,7 +199,7 @@ namespace modules {
       if (chrono::duration_cast<decltype(m_interval)>(now - m_lastpoll) > m_interval) {
         m_lastpoll = now;
         m_log.info("%s: Polling values (inotify fallback)", name());
-        on_event(nullptr);
+        on_event({});
       }
     }
 

From 80bcf55844653c3e36c621c26431e90c358f41ea Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Wed, 4 May 2022 11:39:06 +0200
Subject: [PATCH 15/32] Update PKGBUILD for 3.6.3 (#2711)

---
 contrib/polybar-git.aur/PKGBUILD | 2 +-
 contrib/polybar.aur/PKGBUILD     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-git.aur/PKGBUILD
index 8e4835ca..5be72e4e 100644
--- a/contrib/polybar-git.aur/PKGBUILD
+++ b/contrib/polybar-git.aur/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Patrick Ziegler <p.ziegler96@gmail.com>
 _pkgname=polybar
 pkgname="${_pkgname}-git"
-pkgver=3.6.2
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="A fast and easy-to-use status bar"
 # aarch64 is not officially supported by polybar, it is only listed here for convenience
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
index a6b2341f..7ffb758e 100644
--- a/contrib/polybar.aur/PKGBUILD
+++ b/contrib/polybar.aur/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Patrick Ziegler <p.ziegler96@gmail.com>
 pkgname=polybar
-pkgver=3.6.2
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="A fast and easy-to-use status bar"
 # aarch64 is not officially supported by polybar, it is only listed here for convenience
@@ -15,7 +15,7 @@ makedepends=("cmake" "python" "pkg-config" "python-sphinx" "python-packaging" "i
 backup=("etc/polybar/config.ini")
 conflicts=("polybar-git")
 source=(${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0')
+sha256sums=('f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5')
 _dir="${pkgname}-${pkgver}"
 
 prepare() {

From f0dbb4cc637f8808b2f5f638ea6940aaa7d4dc50 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Wed, 4 May 2022 21:31:25 +0200
Subject: [PATCH 16/32] Add darkmode banner (#2712)

Ref #2706
---
 README.md                        |   3 ++-
 doc/_static/banner-dark-mode.png | Bin 0 -> 10513 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 doc/_static/banner-dark-mode.png

diff --git a/README.md b/README.md
index b7fb5902..b37d7296 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 <p align="center">
-  <img src="doc/_static/banner.png" alt="Polybar">
+  <img src="doc/_static/banner.png#gh-light-mode-only" alt="Polybar">
+  <img src="doc/_static/banner-dark-mode.png#gh-dark-mode-only" alt="Polybar">
 </p>
 
 <p align="center">
diff --git a/doc/_static/banner-dark-mode.png b/doc/_static/banner-dark-mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..94bd9546f441531bbac842b12e10ab90e6442c8f
GIT binary patch
literal 10513
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

literal 0
HcmV?d00001


From 8a4fc1f4f776ae778c1382a42e234f00a7116624 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 9 May 2022 14:17:13 +0100
Subject: [PATCH 17/32] Update Arch Linux installation instructions (#2717)

polybar is now available in official repos
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b37d7296..d51acb4f 100644
--- a/README.md
+++ b/README.md
@@ -98,9 +98,9 @@ repository for stable users, you need to enable [backports](https://wiki.debian.
 If you are using **Ubuntu** 20.10 (Groovy Gorilla) or later, you can install polybar
 using `sudo apt install polybar`.
 
-If you are using **Arch Linux**, you can install the AUR package
-[polybar](https://aur.archlinux.org/packages/polybar/) to get the latest
-version, or [polybar-git](https://aur.archlinux.org/packages/polybar-git/) for
+If you are using **Arch Linux**, you can install the package from `community` repo
+[polybar](https://archlinux.org/packages/community/x86_64/polybar/) to get the latest
+version, or from AUR [polybar-git](https://aur.archlinux.org/packages/polybar-git/) for
 the most up-to-date (unstable) changes.
 
 If you are using **Manjaro**, you can install [polybar](https://software.manjaro.org/package/polybar) to get the latest stable release using `sudo pacman -S polybar`.

From 1f55eaf73d558833344f560e9ae6b23edabaf465 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Mon, 9 May 2022 16:36:54 +0200
Subject: [PATCH 18/32] Adapt to official Arch Linux package (#2719)

Now that polybar is in the official repos, we only need the polybar-git
PKGBUILD.
---
 README.md                    | 10 ++++++----
 contrib/polybar.aur/PKGBUILD | 35 -----------------------------------
 doc/dev/release-workflow.rst |  4 ++--
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 contrib/polybar.aur/PKGBUILD

diff --git a/README.md b/README.md
index d51acb4f..60de502a 100644
--- a/README.md
+++ b/README.md
@@ -98,10 +98,12 @@ repository for stable users, you need to enable [backports](https://wiki.debian.
 If you are using **Ubuntu** 20.10 (Groovy Gorilla) or later, you can install polybar
 using `sudo apt install polybar`.
 
-If you are using **Arch Linux**, you can install the package from `community` repo
-[polybar](https://archlinux.org/packages/community/x86_64/polybar/) to get the latest
-version, or from AUR [polybar-git](https://aur.archlinux.org/packages/polybar-git/) for
-the most up-to-date (unstable) changes.
+If you are using **Arch Linux**, you can install
+[polybar](https://archlinux.org/packages/community/x86_64/polybar/) to get the
+latest stable release using `sudo pacman -S polybar`. The latest unstable
+changes are also available in the
+[`polybar-git`](https://aur.archlinux.org/packages/polybar-git) package in the
+AUR.
 
 If you are using **Manjaro**, you can install [polybar](https://software.manjaro.org/package/polybar) to get the latest stable release using `sudo pacman -S polybar`.
 
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
deleted file mode 100644
index 7ffb758e..00000000
--- a/contrib/polybar.aur/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Patrick Ziegler <p.ziegler96@gmail.com>
-pkgname=polybar
-pkgver=3.6.3
-pkgrel=1
-pkgdesc="A fast and easy-to-use status bar"
-# aarch64 is not officially supported by polybar, it is only listed here for convenience
-arch=("i686" "x86_64" "aarch64")
-url="https://github.com/polybar/polybar"
-license=("MIT")
-depends=("libuv" "cairo" "xcb-util-image" "xcb-util-wm" "xcb-util-xrm"
-         "xcb-util-cursor" "alsa-lib" "libpulse" "libmpdclient" "libnl"
-         "jsoncpp" "curl")
-optdepends=("i3-wm: i3 module support")
-makedepends=("cmake" "python" "pkg-config" "python-sphinx" "python-packaging" "i3-wm")
-backup=("etc/polybar/config.ini")
-conflicts=("polybar-git")
-source=(${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5')
-_dir="${pkgname}-${pkgver}"
-
-prepare() {
-  mkdir -p "${_dir}/build"
-}
-
-build() {
-  cd "${_dir}/build" || exit 1
-  # Force cmake to use system python (to detect xcbgen)
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ..
-  cmake --build .
-}
-
-package() {
-  cmake --build "${_dir}/build" --target install -- DESTDIR="${pkgdir}"
-  install -Dm644 "${_dir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/doc/dev/release-workflow.rst b/doc/dev/release-workflow.rst
index 8fd4dd2e..b051c262 100644
--- a/doc/dev/release-workflow.rst
+++ b/doc/dev/release-workflow.rst
@@ -217,8 +217,8 @@ After-Release Checklist
   release automatically creates a release archive, uploads it to the release,
   and adds a 'Download' section to the release body.
   If this fails for some reason, it should be triggered manually.
-* Create a PR that updates the AUR ``PKGBUILD`` files for the ``polybar`` and
-  ``polybar-git`` packages (push after the release archive is uploaded).
+* Create a PR that updates the AUR ``PKGBUILD`` file for the ``polybar-git``
+  package (push after the release archive is uploaded).
 * Close the `GitHub Milestone <https://github.com/polybar/polybar/milestones>`_
   for the new release and move open issues (if any) to a later release.
 * Activate the version on `Read the Docs

From 1ee11f7c9e72719f62981167a24fe7239774fa69 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Mon, 9 May 2022 17:00:14 +0200
Subject: [PATCH 19/32] Adapt release workflow to produce signed releases
 (#2720)

---
 README.md                    |  7 ++++++
 doc/dev/release-workflow.rst | 41 +++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 60de502a..376b133e 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ for their desktop environment, without the need of having a black belt in shell
   * [Sponsors](#sponsors)
   * [Backers](#backers)
 * [License](#license)
+* [Signatures](#signatures)
 
 ## Introduction
 
@@ -236,3 +237,9 @@ Polybar accepts donations through [open collective](https://opencollective.com/p
 ## License
 
 Polybar is licensed under the MIT license. [See LICENSE for more information](https://github.com/polybar/polybar/blob/master/LICENSE).
+
+## Signatures
+
+Release archives and tags are signed by a maintainer using GPG. Currently
+everything is signed by [Patrick Ziegler](https://www.patrickziegler.ch/gpg)
+with fingerprint `1D5791352D51A228D4DDDBA4521E5E03AEBCA1A7`
diff --git a/doc/dev/release-workflow.rst b/doc/dev/release-workflow.rst
index b051c262..f6ba8d52 100644
--- a/doc/dev/release-workflow.rst
+++ b/doc/dev/release-workflow.rst
@@ -114,9 +114,16 @@ as follows:
 * A draft PR is opened for the release branch. This PR MUST NOT be merged in
   GitHub's interface, it is only here for review, merging happens at the
   commandline.
-* A `draft release`_ is created in GitHub's release publishing tools
-* After approval, the GitHub release publishing tool is used to publish the
-  release and tag the tip of the release branch (the release commit).
+* After approval, a signed git tag is created locally at the tip of the release
+  branch and pushed:
+
+.. code-block:: shell
+
+  git tag -s X.Y.Z <release-branch>
+  git push --tags
+
+* A `draft release`_ targetting the new tag is created in GitHub's release
+  publishing tools and published.
 * After the tag is created, the release branch is manually merged into
   ``master``.
   Here it is vitally important that the history of the release branch does not
@@ -193,8 +200,8 @@ Draft Release
 
 On `GitHub <https://github.com/polybar/polybar/releases/new>`_ a new release
 should be drafted.
-The release targets the tip of the release branch (the release commit), the
-name of the release and the tag is simply the release number.
+The release targets the git tag that was just pushed, the name of the release
+and the tag is simply the release number.
 
 The content of the release message should contain the changelog copied from
 ``CHANGELOG.md`` under the heading ``## Changelog``.
@@ -205,6 +212,7 @@ The generated list of PRs can be removed.
 After-Release Checklist
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+* Verify the release archive (see `Verify Release`_)
 * Make sure all the new functionality is documented on the wiki
 * Mark deprecated features appropriately (see `Deprecations`_)
 * Remove all unreleased notes from the wiki (not for patch releases)
@@ -212,11 +220,6 @@ After-Release Checklist
   <https://github.com/polybar/polybar/issues/1971>`_. Mention any dependency
   changes and any changes to the build workflow. Also mention any new files are
   created by the installation.
-* Confirm that the release archive was added to the release.
-  We have a GitHub action workflow called 'Release Workflow' that on every
-  release automatically creates a release archive, uploads it to the release,
-  and adds a 'Download' section to the release body.
-  If this fails for some reason, it should be triggered manually.
 * Create a PR that updates the AUR ``PKGBUILD`` file for the ``polybar-git``
   package (push after the release archive is uploaded).
 * Close the `GitHub Milestone <https://github.com/polybar/polybar/milestones>`_
@@ -226,6 +229,24 @@ After-Release Checklist
   previous versions for the same minor release (e.g. for 3.5.4, deactivate all
   other 3.5.X versions).
 
+Verify Release
+~~~~~~~~~~~~~~
+
+Confirm that the release archive was added to the release.
+We have a GitHub action workflow called 'Release Workflow' that on every
+release automatically creates a release archive, uploads it to the release,
+and adds a 'Download' section to the release body.
+If this fails for some reason, it should be triggered manually.
+
+Afterwards, download the archive, verify its hash, and sign it:
+
+.. code-block:: shell
+
+  gpg --armor --detach-sign polybar-X.Y.Z.tar.gz
+
+Finally, upload the generated ``polybar-X.Y.Z.tar.gz.asc`` to the GitHub
+release.
+
 Deprecations
 ~~~~~~~~~~~~
 

From 0331a5fda419050b7eb019e0adb8fa2b102005ae Mon Sep 17 00:00:00 2001
From: Maxim Kolesnikov <indev.src@gmail.com>
Date: Sun, 12 Jun 2022 21:31:11 +0700
Subject: [PATCH 20/32] fix: error reporting for deprecated config values
 (#2725)

---
 CHANGELOG.md                  | 1 +
 include/components/config.hpp | 5 +++++
 src/components/bar.cpp        | 7 +------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8955e4e5..09d47585 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
+- Error reporting for deprecated config values ([`#2724`](https://github.com/polybar/polybar/issues/2724))
 
 ## [3.6.3] - 2022-05-04
 ### Fixed
diff --git a/include/components/config.hpp b/include/components/config.hpp
index 33936fdd..b3a894e6 100644
--- a/include/components/config.hpp
+++ b/include/components/config.hpp
@@ -226,6 +226,11 @@ class config {
     } catch (const key_error& err) {
       return get<T>(section, newkey, fallback);
     }
+    catch (const std::exception& err) {
+      m_log.err("Invalid value for \"%s.%s\", using fallback key \"%s.%s\" (reason: %s)",
+                section, old, section, newkey, err.what());
+      return get<T>(section, newkey, fallback);
+    }
   }
 
   /**
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index aaabc391..04633556 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -131,12 +131,7 @@ bar::bar(connection& conn, signal_emitter& emitter, const config& config, const
   m_log.info("Loaded monitor %s (%ix%i+%i+%i)", m_opts.monitor->name, m_opts.monitor->w, m_opts.monitor->h,
       m_opts.monitor->x, m_opts.monitor->y);
 
-  try {
-    m_opts.override_redirect = m_conf.get<bool>(bs, "dock");
-    m_conf.warn_deprecated(bs, "dock", "override-redirect");
-  } catch (const key_error& err) {
-    m_opts.override_redirect = m_conf.get(bs, "override-redirect", m_opts.override_redirect);
-  }
+  m_opts.override_redirect = m_conf.deprecated(bs, "dock", "override-redirect", m_opts.override_redirect);
 
   m_opts.dimvalue = m_conf.get(bs, "dim-value", 1.0);
   m_opts.dimvalue = math_util::cap(m_opts.dimvalue, 0.0, 1.0);

From ca06be1d0e890952bba0cde3153f3ad5353f4479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franklin=20Tim=C3=B3teo?= <franklindev@disroot.org>
Date: Sun, 12 Jun 2022 14:28:18 -0300
Subject: [PATCH 21/32] Updated instructions for installing on Debian (#2732)

Current version backports is bullseye.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 376b133e..01ab9a19 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ list of available polybar packages.
 If you are using **Debian** (bullseye/11/stable) or later, you can install [polybar](https://tracker.debian.org/pkg/polybar)
 using `sudo apt install polybar`. Newer releases of polybar are sometimes provided in the [backports](https://wiki.debian.org/Backports)
 repository for stable users, you need to enable [backports](https://wiki.debian.org/Backports) and then install using
-`sudo apt -t buster-backports install polybar`.
+`sudo apt -t bullseye-backports install polybar`.
 
 If you are using **Ubuntu** 20.10 (Groovy Gorilla) or later, you can install polybar
 using `sudo apt install polybar`.

From 6a43758b5bd5ab86acb33d5f4cc1d68db0c6f589 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Tue, 14 Jun 2022 15:35:49 +0200
Subject: [PATCH 22/32] tray is no longer pushed off the bar (#2727)

---
 src/x11/tray_manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 55f37348..6d270563 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -1167,7 +1167,9 @@ bool tray_manager::on(const signals::ui::update_background&) {
 }
 
 bool tray_manager::on(const signals::ui_tray::tray_pos_change& evt) {
-  m_opts.orig_x = m_bar_opts.inner_area(true).x + evt.cast();
+  m_opts.orig_x =
+      m_bar_opts.inner_area(true).x + std::max(0, std::min(evt.cast(), (int)(m_bar_opts.size.w - calculate_w())));
+
   reconfigure_window();
 
   return true;

From 86f2baa5500c2f74f910286924e56584f4ef3669 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Wed, 15 Jun 2022 11:09:13 +0200
Subject: [PATCH 23/32] tray: remove tray-position = adaptive (#2726)

The tray is automatically started if there is a tray module. In addition, `tray-position` and the tray module conflict.

Ref #2689
---
 include/components/bar.hpp        |  2 +-
 include/components/controller.hpp |  1 +
 include/x11/tray_manager.hpp      |  7 +++---
 src/components/bar.cpp            | 13 +++++-----
 src/components/controller.cpp     |  9 ++++++-
 src/x11/tray_manager.cpp          | 41 +++++++++++++++++--------------
 6 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index f35648de..60331e54 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -43,7 +43,7 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
 
   const bar_settings& settings() const;
 
-  void start();
+  void start(const string& tray_module_name);
 
   void parse(string&& data, bool force = false);
 
diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index 24efa360..0eec49c0 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -100,6 +100,7 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eve
   eventloop::loop& m_loop;
   unique_ptr<bar> m_bar;
   bool m_has_ipc;
+  string m_tray_module_name;
 
   /**
    * @brief Async handle to notify the eventloop
diff --git a/include/x11/tray_manager.hpp b/include/x11/tray_manager.hpp
index 471b233e..2c230cc1 100644
--- a/include/x11/tray_manager.hpp
+++ b/include/x11/tray_manager.hpp
@@ -39,8 +39,10 @@ class connection;
 class background_manager;
 class bg_slice;
 
+enum class tray_postition { NONE = 0, LEFT, CENTER, RIGHT, MODULE };
+
 struct tray_settings {
-  alignment align{alignment::NONE};
+  tray_postition tray_position{tray_postition::NONE};
   bool running{false};
   int rel_x{0};
   int rel_y{0};
@@ -61,7 +63,6 @@ struct tray_settings {
   rgba foreground{};
   bool transparent{false};
   bool detached{false};
-  bool adaptive{false};
 };
 
 class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify, evt::client_message,
@@ -80,7 +81,7 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
 
   const tray_settings settings() const;
 
-  void setup();
+  void setup(const string& tray_module_name);
   void activate();
   void activate_delayed(chrono::duration<double, std::milli> delay = 1s);
   void deactivate(bool clear_selection = true);
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 04633556..b3f9695d 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -388,13 +388,14 @@ void bar::parse(string&& data, bool force) {
 
   auto rect = m_opts.inner_area();
 
-  if (m_tray && !m_tray->settings().detached && m_tray->settings().configured_slots && !m_tray->settings().adaptive) {
-    auto trayalign = m_tray->settings().align;
+  if (m_tray && !m_tray->settings().detached && m_tray->settings().configured_slots &&
+      m_tray->settings().tray_position != tray_postition::MODULE) {
+    auto tray_pos = m_tray->settings().tray_position;
     auto traywidth = m_tray->settings().configured_w;
-    if (trayalign == alignment::LEFT) {
+    if (tray_pos == tray_postition::LEFT) {
       rect.x += traywidth;
       rect.width -= traywidth;
-    } else if (trayalign == alignment::RIGHT) {
+    } else if (tray_pos == tray_postition::RIGHT) {
       rect.width -= traywidth;
     }
   }
@@ -872,7 +873,7 @@ void bar::handle(const evt::configure_notify&) {
   m_sig.emit(signals::ui::update_geometry{});
 }
 
-void bar::start() {
+void bar::start(const string& tray_module_name) {
   m_log.trace("bar: Create renderer");
   m_renderer = renderer::make(m_opts, *m_action_ctxt);
   m_opts.window = m_renderer->window();
@@ -900,7 +901,7 @@ void bar::start() {
   m_renderer->end();
 
   m_log.trace("bar: Setup tray manager");
-  m_tray->setup();
+  m_tray->setup(tray_module_name);
 
   broadcast_visibility();
 }
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 77681e1c..96b7b51d 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -267,7 +267,7 @@ void controller::read_events(bool confwatch) {
     }
 
     if (!m_writeback) {
-      m_bar->start();
+      m_bar->start(m_tray_module_name);
     }
 
     /*
@@ -593,6 +593,13 @@ size_t controller::setup_modules(alignment align) {
     try {
       auto type = m_conf.get("module/" + module_name, "type");
 
+      if (type == tray_module::TYPE) {
+        if (!m_tray_module_name.empty()) {
+          throw module_error("Multiple trays defined. Using tray `" + m_tray_module_name + "`");
+        }
+        m_tray_module_name = module_name;
+      }
+
       if (type == ipc_module::TYPE && !m_has_ipc) {
         throw application_error("Inter-process messaging needs to be enabled");
       }
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 6d270563..a466bd41 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -67,25 +67,26 @@ tray_manager::~tray_manager() {
   deactivate();
 }
 
-void tray_manager::setup() {
+void tray_manager::setup(const string& tray_module_name) {
   const config& conf = config::make();
   auto bs = conf.section();
-  string position;
+  string position = conf.get(bs, "tray-position", "none"s);
 
-  try {
-    position = conf.get(bs, "tray-position");
-  } catch (const key_error& err) {
-    return m_log.info("Disabling tray manager (reason: missing `tray-position`)");
+  if (!position.empty() && position != "none" && !tray_module_name.empty()) {
+    m_log.warn(
+        "The tray position is manually defined (`tray-position`) and also set by the tray module (%s). `tray-position` "
+        "will be ignored",
+        tray_module_name);
   }
 
-  if (position == "left") {
-    m_opts.align = alignment::LEFT;
+  if (!tray_module_name.empty()) {
+    m_opts.tray_position = tray_postition::MODULE;
+  } else if (position == "left") {
+    m_opts.tray_position = tray_postition::LEFT;
   } else if (position == "right") {
-    m_opts.align = alignment::RIGHT;
+    m_opts.tray_position = tray_postition::RIGHT;
   } else if (position == "center") {
-    m_opts.align = alignment::CENTER;
-  } else if (position == "adaptive") {
-    m_opts.adaptive = true;
+    m_opts.tray_position = tray_postition::CENTER;
   } else if (position != "none") {
     return m_log.err("Disabling tray manager (reason: Invalid position \"" + position + "\")");
   } else {
@@ -119,18 +120,20 @@ void tray_manager::setup() {
 
   auto inner_area = m_bar_opts.inner_area(true);
 
-  switch (m_opts.align) {
-    case alignment::NONE:
+  switch (m_opts.tray_position) {
+    case tray_postition::NONE:
       break;
-    case alignment::LEFT:
+    case tray_postition::LEFT:
       m_opts.orig_x = inner_area.x;
       break;
-    case alignment::CENTER:
+    case tray_postition::CENTER:
       m_opts.orig_x = inner_area.x + inner_area.width / 2 - m_opts.width / 2;
       break;
-    case alignment::RIGHT:
+    case tray_postition::RIGHT:
       m_opts.orig_x = inner_area.x + inner_area.width;
       break;
+    case tray_postition::MODULE:
+      break;
   }
 
   if (conf.has(bs, "tray-transparent")) {
@@ -801,9 +804,9 @@ void tray_manager::process_docking_request(xcb_window_t win) {
  */
 int tray_manager::calculate_x(unsigned int width) const {
   auto x = m_opts.orig_x;
-  if (m_opts.align == alignment::RIGHT) {
+  if (m_opts.tray_position == tray_postition::RIGHT) {
     x -= ((m_opts.width + m_opts.spacing) * m_clients.size() + m_opts.spacing);
-  } else if (m_opts.align == alignment::CENTER) {
+  } else if (m_opts.tray_position == tray_postition::CENTER) {
     x -= (width / 2) - (m_opts.width / 2);
   }
   return x;

From b2c5d8e0e228031844f28ecd91fb841f11842fb2 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Thu, 16 Jun 2022 12:53:49 +0200
Subject: [PATCH 24/32] tray: implement hiding functionality (#2723)

* tray hiding works

* clang-format

* Implemented suggestions
---
 include/events/signal.hpp     |  3 ++
 include/events/signal_fwd.hpp |  3 +-
 include/x11/tray_manager.hpp  | 13 +++++----
 src/components/renderer.cpp   |  3 ++
 src/x11/tray_manager.cpp      | 52 ++++++++++++++++++++---------------
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/include/events/signal.hpp b/include/events/signal.hpp
index f54f0684..3df6388b 100644
--- a/include/events/signal.hpp
+++ b/include/events/signal.hpp
@@ -110,6 +110,9 @@ namespace signals {
     struct tray_pos_change : public detail::value_signal<tray_pos_change, int> {
       using base_type::base_type;
     };
+    struct tray_visibility : public detail::value_signal<tray_visibility, bool> {
+      using base_type::base_type;
+    };
   } // namespace ui_tray
 } // namespace signals
 
diff --git a/include/events/signal_fwd.hpp b/include/events/signal_fwd.hpp
index 0e422b21..59e60169 100644
--- a/include/events/signal_fwd.hpp
+++ b/include/events/signal_fwd.hpp
@@ -38,7 +38,8 @@ namespace signals {
     struct mapped_clients;
     struct tray_width_change;
     struct tray_pos_change;
-  }
+    struct tray_visibility;
+  } // namespace ui_tray
 } // namespace signals
 
 POLYBAR_NS_END
diff --git a/include/x11/tray_manager.hpp b/include/x11/tray_manager.hpp
index 2c230cc1..7a7ebcbc 100644
--- a/include/x11/tray_manager.hpp
+++ b/include/x11/tray_manager.hpp
@@ -65,11 +65,12 @@ struct tray_settings {
   bool detached{false};
 };
 
-class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify, evt::client_message,
-                         evt::configure_request, evt::resize_request, evt::selection_clear, evt::property_notify,
-                         evt::reparent_notify, evt::destroy_notify, evt::map_notify, evt::unmap_notify>,
-                     public signal_receiver<SIGN_PRIORITY_TRAY, signals::ui::visibility_change, signals::ui::dim_window,
-                         signals::ui::update_background, signals::ui_tray::tray_pos_change> {
+class tray_manager
+    : public xpp::event::sink<evt::expose, evt::visibility_notify, evt::client_message, evt::configure_request,
+          evt::resize_request, evt::selection_clear, evt::property_notify, evt::reparent_notify, evt::destroy_notify,
+          evt::map_notify, evt::unmap_notify>,
+      public signal_receiver<SIGN_PRIORITY_TRAY, signals::ui::visibility_change, signals::ui::dim_window,
+          signals::ui::update_background, signals::ui_tray::tray_pos_change, signals::ui_tray::tray_visibility> {
  public:
   using make_type = unique_ptr<tray_manager>;
   static make_type make(const bar_settings& settings);
@@ -122,6 +123,7 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
   void remove_client(shared_ptr<tray_client>& client, bool reconfigure = true);
   void remove_client(xcb_window_t win, bool reconfigure = true);
   unsigned int mapped_clients() const;
+  bool change_visibility(bool visible);
 
   void handle(const evt::expose& evt) override;
   void handle(const evt::visibility_notify& evt) override;
@@ -139,6 +141,7 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
   bool on(const signals::ui::dim_window& evt) override;
   bool on(const signals::ui::update_background& evt) override;
   bool on(const signals::ui_tray::tray_pos_change& evt) override;
+  bool on(const signals::ui_tray::tray_visibility& evt) override;
 
  private:
   connection& m_connection;
diff --git a/src/components/renderer.cpp b/src/components/renderer.cpp
index 474cf389..ed354257 100644
--- a/src/components/renderer.cpp
+++ b/src/components/renderer.cpp
@@ -828,6 +828,9 @@ void renderer::apply_tray_position(const tags::context& context) {
     int absolute_x = static_cast<int>(
         block_x(context.get_relative_tray_position().first) + context.get_relative_tray_position().second);
     m_sig.emit(signals::ui_tray::tray_pos_change{absolute_x});
+    m_sig.emit(signals::ui_tray::tray_visibility{true});
+  } else {
+    m_sig.emit(signals::ui_tray::tray_visibility{false});
   }
 }
 
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index a466bd41..98405559 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -914,6 +914,29 @@ unsigned int tray_manager::mapped_clients() const {
   return mapped_clients;
 }
 
+bool tray_manager::change_visibility(bool visible) {
+  unsigned int clients{mapped_clients()};
+
+  m_log.trace("tray: visibility_change (state=%i, activated=%i, mapped=%i, hidden=%i)", visible,
+      static_cast<bool>(m_activated), static_cast<bool>(m_mapped), static_cast<bool>(m_hidden));
+
+  m_hidden = !visible;
+
+  if (!m_activated) {
+    return false;
+  } else if (!m_hidden && !m_mapped && clients) {
+    m_connection.map_window(m_tray);
+  } else if ((!clients || m_hidden) && m_mapped) {
+    m_connection.unmap_window(m_tray);
+  } else if (m_mapped && !m_hidden && clients) {
+    redraw_window();
+  }
+
+  m_connection.flush();
+
+  return true;
+}
+
 /**
  * Event callback : XCB_EXPOSE
  */
@@ -1024,7 +1047,8 @@ void tray_manager::handle(const evt::property_notify& evt) {
   }
 
   // React an wallpaper change, if bar has transparency
-  if (m_opts.transparent && (evt->atom == _XROOTPMAP_ID || evt->atom == _XSETROOT_ID || evt->atom == ESETROOT_PMAP_ID)) {
+  if (m_opts.transparent &&
+      (evt->atom == _XROOTPMAP_ID || evt->atom == _XSETROOT_ID || evt->atom == ESETROOT_PMAP_ID)) {
     redraw_window(true);
     return;
   }
@@ -1132,27 +1156,7 @@ void tray_manager::handle(const evt::unmap_notify& evt) {
  * toggle the tray window whenever the visibility of the bar window changes.
  */
 bool tray_manager::on(const signals::ui::visibility_change& evt) {
-  bool visible{evt.cast()};
-  unsigned int clients{mapped_clients()};
-
-  m_log.trace("tray: visibility_change (state=%i, activated=%i, mapped=%i, hidden=%i)", visible,
-      static_cast<bool>(m_activated), static_cast<bool>(m_mapped), static_cast<bool>(m_hidden));
-
-  m_hidden = !visible;
-
-  if (!m_activated) {
-    return false;
-  } else if (!m_hidden && !m_mapped && clients) {
-    m_connection.map_window(m_tray);
-  } else if ((!clients || m_hidden) && m_mapped) {
-    m_connection.unmap_window(m_tray);
-  } else if (m_mapped && !m_hidden && clients) {
-    redraw_window();
-  }
-
-  m_connection.flush();
-
-  return true;
+  return change_visibility(evt.cast());
 }
 
 bool tray_manager::on(const signals::ui::dim_window& evt) {
@@ -1178,4 +1182,8 @@ bool tray_manager::on(const signals::ui_tray::tray_pos_change& evt) {
   return true;
 }
 
+bool tray_manager::on(const signals::ui_tray::tray_visibility& evt) {
+  return change_visibility(evt.cast());
+}
+
 POLYBAR_NS_END

From f3e27a205efd9d4409ecba0f6cd79652ceef2fd2 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Thu, 16 Jun 2022 12:54:38 +0200
Subject: [PATCH 25/32] backlight: auto-detect default card (#2728)

* auto-detect a default backlight

* Implemented suggestions

* added changelog

* Implemented suggestions

* Fix changelog formatting

Co-authored-by: patrick96 <p.ziegler96@gmail.com>
---
 CHANGELOG.md              |  1 +
 src/modules/backlight.cpp | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09d47585..0f3309e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - `internal/fs`: Use `/` as a fallback if no mountpoints are specified ([`#2572`](https://github.com/polybar/polybar/issues/2572), [`#2705`](https://github.com/polybar/polybar/pull/2705))
+- `internal/backlight`: Detect backlight if none specified ([`#2572`](https://github.com/polybar/polybar/issues/2572), [`#2728`](https://github.com/polybar/polybar/pull/2728))
 
 ### Fixed
 - Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 59c3fd5a..4e4c47da 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -27,9 +27,28 @@ namespace modules {
       : inotify_module<backlight_module>(bar, move(name_)) {
     m_router->register_action(EVENT_DEC, [this]() { action_dec(); });
     m_router->register_action(EVENT_INC, [this]() { action_inc(); });
+    auto card = m_conf.get(name(), "card", ""s);
+    if (card.empty()) {
+      vector<string> backlight_card_names = file_util::list_files(string_util::replace(PATH_BACKLIGHT, "%card%", ""));
+      backlight_card_names.erase(std::remove_if(backlight_card_names.begin(), backlight_card_names.end(),
+                                     [&](const string& card) -> bool {
+                                       auto dir = string_util::replace(PATH_BACKLIGHT, "%card%", card);
+                                       return !(file_util::is_file(dir + "/actual_brightness") &&
+                                                file_util::is_file(dir + "/brightness") &&
+                                                file_util::is_file(dir + "/max_brightness"));
+                                     }),
+          backlight_card_names.end());
 
-    auto card = m_conf.get(name(), "card");
-
+      if (backlight_card_names.empty()) {
+        throw module_error("no viable default backlight found");
+      }
+      card = backlight_card_names.at(0);
+      if (backlight_card_names.size() > 1) {
+        m_log.warn("%s: multiple backlights found, using %s", name(), card);
+      } else {
+        m_log.info("%s: no backlight specified, using `%s`", name(), card);
+      }
+    }
     // Get flag to check if we should add scroll handlers for changing value
     m_scroll = m_conf.get(name(), "enable-scroll", m_scroll);
 

From a42e5330894a18fce7d3e99f702ca52fa1010bf8 Mon Sep 17 00:00:00 2001
From: sysek <42250185+sysek@users.noreply.github.com>
Date: Thu, 23 Jun 2022 06:38:04 +0200
Subject: [PATCH 26/32] doc: change openSUSE description (#2749)

* change openSUSE description

* Update README.md

Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com>
---
 README.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 01ab9a19..3f4e13bb 100644
--- a/README.md
+++ b/README.md
@@ -116,14 +116,11 @@ If you are using **Slackware**, polybar is available from the [SlackBuilds](http
 
 If you are using **Source Mage GNU/Linux**, polybar spell is available in test grimoire and can be installed via `cast polybar`.
 
-If you are using **openSUSE Tumbleweed**, polybar is available from the
+If you are using **openSUSE Leap** or **openSUSE Tumbleweed**, polybar is available from the
 [official
-repositories](https://build.opensuse.org/package/show/openSUSE%3AFactory/polybar)
+repositories](https://build.opensuse.org/package/show/X11:Utilities/polybar)
 and can be installed via `zypper install polybar`.
-
-If you are using **openSUSE Leap**, polybar is available from
-[OBS](https://build.opensuse.org/package/show/X11:Utilities/polybar/).
-The package is available for openSUSE Leap 15.1 and above.
+The package is available for openSUSE Leap 15.3 and above.
 
 If you are using **FreeBSD**, [polybar](https://svnweb.freebsd.org/ports/head/x11/polybar/) can be installed using `pkg install polybar`. Make sure you are using the `latest` package branch.
 

From 9f4e88c07d07056e351109ee11f718c9df3e98e8 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Sat, 9 Jul 2022 08:45:09 +0200
Subject: [PATCH 27/32] fix: tray isn't visible when a module updates (#2742)

---
 src/x11/tray_manager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 98405559..eba3560e 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -1183,7 +1183,11 @@ bool tray_manager::on(const signals::ui_tray::tray_pos_change& evt) {
 }
 
 bool tray_manager::on(const signals::ui_tray::tray_visibility& evt) {
-  return change_visibility(evt.cast());
+  if (m_opts.tray_position == tray_postition::MODULE) {
+    return change_visibility(evt.cast());
+  } else {
+    return true;
+  }
 }
 
 POLYBAR_NS_END

From a20f76d7e57d6edbc8ec443021c435a346d10d54 Mon Sep 17 00:00:00 2001
From: raffael0 <43984260+raffael0@users.noreply.github.com>
Date: Sat, 9 Jul 2022 09:09:55 +0200
Subject: [PATCH 28/32] fix: tray flickers due to excessive
 redrawing/visibility changing (#2747)

Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com>
---
 src/x11/tray_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index eba3560e..442a0601 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -1183,7 +1183,7 @@ bool tray_manager::on(const signals::ui_tray::tray_pos_change& evt) {
 }
 
 bool tray_manager::on(const signals::ui_tray::tray_visibility& evt) {
-  if (m_opts.tray_position == tray_postition::MODULE) {
+  if (evt.cast() == m_hidden && m_opts.tray_position == tray_postition::MODULE) {
     return change_visibility(evt.cast());
   } else {
     return true;

From 98d584c8fe5924a271bb213e2f9d6480b22d17b9 Mon Sep 17 00:00:00 2001
From: Tuur Vanhoutte <4633209+zjeffer@users.noreply.github.com>
Date: Sat, 9 Jul 2022 12:24:21 +0200
Subject: [PATCH 29/32] Also monitor include-files for changes when --reload is
 set (#2759)

* fixes #675

* feat(configwatcher): method to create config monitor handler

* cleanup

Co-authored-by: patrick96 <p.ziegler96@gmail.com>
---
 include/components/config.hpp     |  9 +++++----
 include/components/controller.hpp |  1 +
 src/components/config.cpp         |  4 ++++
 src/components/controller.cpp     | 22 +++++++++++++++-------
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/include/components/config.hpp b/include/components/config.hpp
index b3a894e6..d0be66d4 100644
--- a/include/components/config.hpp
+++ b/include/components/config.hpp
@@ -44,6 +44,8 @@ class config {
 
   void set_included(file_list included);
 
+  file_list get_included_files() const;
+
   void warn_deprecated(const string& section, const string& key, string replacement) const;
 
   /**
@@ -225,10 +227,9 @@ class config {
       return value;
     } catch (const key_error& err) {
       return get<T>(section, newkey, fallback);
-    }
-    catch (const std::exception& err) {
-      m_log.err("Invalid value for \"%s.%s\", using fallback key \"%s.%s\" (reason: %s)",
-                section, old, section, newkey, err.what());
+    } catch (const std::exception& err) {
+      m_log.err("Invalid value for \"%s.%s\", using fallback key \"%s.%s\" (reason: %s)", section, old, section, newkey,
+          err.what());
       return get<T>(section, newkey, fallback);
     }
   }
diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index 0eec49c0..cb0a72e7 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -55,6 +55,7 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eve
   void signal_handler(int signum);
 
   void conn_cb();
+  void create_config_watcher(const string& fname);
   void confwatch_handler(const char* fname);
   void notifier_handler();
   void screenshot_handler();
diff --git a/src/components/config.cpp b/src/components/config.cpp
index de30204f..9d5e37ec 100644
--- a/src/components/config.cpp
+++ b/src/components/config.cpp
@@ -59,6 +59,10 @@ void config::set_included(file_list included) {
   m_included = move(included);
 }
 
+file_list config::get_included_files() const {
+  return m_included;
+}
+
 void config::ignore_key(const string& section, const string& key) const {
   if (has(section, key)) {
     m_log.warn(
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 96b7b51d..ba00ef1a 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -195,6 +195,16 @@ void controller::signal_handler(int signum) {
   stop(signum == SIGUSR1);
 }
 
+void controller::create_config_watcher(const string& filename) {
+  auto& fs_event_handler = m_loop.handle<FSEventHandle>();
+  fs_event_handler.start(
+      filename, 0, [this](const auto& e) { confwatch_handler(e.path); },
+      [this, &fs_event_handler](const auto& e) {
+        m_log.err("libuv error while watching included file for changes: %s", uv_strerror(e.status));
+        fs_event_handler.close();
+      });
+}
+
 void controller::confwatch_handler(const char* filename) {
   m_log.notice("Watched config file changed %s", filename);
   stop(true);
@@ -251,13 +261,11 @@ void controller::read_events(bool confwatch) {
     }
 
     if (confwatch) {
-      auto& fs_event_handle = m_loop.handle<FSEventHandle>();
-      fs_event_handle.start(
-          m_conf.filepath(), 0, [this](const auto& e) { confwatch_handler(e.path); },
-          [this, &fs_event_handle](const auto& e) {
-            m_log.err("libuv error while watching config file for changes: %s", uv_strerror(e.status));
-            fs_event_handle.close();
-          });
+      create_config_watcher(m_conf.filepath());
+      // also watch the include-files for changes
+      for (auto& module_path : m_conf.get_included_files()) {
+        create_config_watcher(module_path);
+      }
     }
 
     if (!m_snapshot_dst.empty()) {

From 841b799299865047c2b2cd8cf8457e8c4dd9dc98 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Sat, 9 Jul 2022 12:26:07 +0200
Subject: [PATCH 30/32] Add include-file reload fix to changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f3309e4..1cca1973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Waiting for double click interval on modules that don't have a double click action ([`#2663`](https://github.com/polybar/polybar/issues/2663), [`#2695`](https://github.com/polybar/polybar/pull/2695))
-- Error reporting for deprecated config values ([`#2724`](https://github.com/polybar/polybar/issues/2724))
+- config:
+  - Error reporting for deprecated config values ([`#2724`](https://github.com/polybar/polybar/issues/2724))
+  - Also monitor include-files for changes when --reload is set ([`#675`](https://github.com/polybar/polybar/issues/675), [`#2759`](https://github.com/polybar/polybar/pull/2759))
 
 ## [3.6.3] - 2022-05-04
 ### Fixed

From f4d0ba9186013c125c49a0d38f74c4b8e968e015 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Sat, 9 Jul 2022 13:12:37 +0200
Subject: [PATCH 31/32] config_parser: Pass barname as argument to parse()
 (#2765)

Doesn't need to be a class field
---
 include/components/config_parser.hpp          | 11 +++--------
 src/components/config_parser.cpp              | 18 +++++++++---------
 src/main.cpp                                  |  4 ++--
 tests/unit_tests/components/config_parser.cpp |  6 +++---
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/include/components/config_parser.hpp b/include/components/config_parser.hpp
index 35c56781..f580f0eb 100644
--- a/include/components/config_parser.hpp
+++ b/include/components/config_parser.hpp
@@ -90,12 +90,12 @@ struct line_t {
 
 class config_parser {
  public:
-  config_parser(const logger& logger, string&& file, string&& bar);
+  config_parser(const logger& logger, string&& file);
   /**
    * This prevents passing a temporary logger to the constructor because that would be UB, as the temporary would be
    * destroyed once the constructor returns.
    */
-  config_parser(logger&& logger, string&& file, string&& bar) = delete;
+  config_parser(logger&& logger, string&& file) = delete;
 
   /**
    * @brief Performs the parsing of the main config file m_file
@@ -105,7 +105,7 @@ class config_parser {
    * @throws syntax_error If there was any kind of syntax error
    * @throws parser_error If aynthing else went wrong
    */
-  config::make_type parse();
+  config::make_type parse(string barname);
 
  protected:
   /**
@@ -231,11 +231,6 @@ class config_parser {
    */
   string m_config;
 
-  /**
-   * Is used to resolve ${root...} references
-   */
-  string m_barname;
-
   /**
    * @brief List of all the lines in the config (with included files)
    *
diff --git a/src/components/config_parser.cpp b/src/components/config_parser.cpp
index d29a2319..6403bb1a 100644
--- a/src/components/config_parser.cpp
+++ b/src/components/config_parser.cpp
@@ -10,10 +10,10 @@
 
 POLYBAR_NS
 
-config_parser::config_parser(const logger& logger, string&& file, string&& bar)
-    : m_log(logger), m_config(file_util::expand(file)), m_barname(move(bar)) {}
+config_parser::config_parser(const logger& logger, string&& file)
+    : m_log(logger), m_config(file_util::expand(file)) {}
 
-config::make_type config_parser::parse() {
+config::make_type config_parser::parse(string barname) {
   m_log.notice("Parsing config file: %s", m_config);
 
   parse_file(m_config, {});
@@ -21,21 +21,21 @@ config::make_type config_parser::parse() {
   sectionmap_t sections = create_sectionmap();
 
   vector<string> bars = get_bars(sections);
-  if (m_barname.empty()) {
+  if (barname.empty()) {
     if (bars.size() == 1) {
-      m_barname = bars[0];
+      barname = bars[0];
     } else if (bars.empty()) {
       throw application_error("The config file contains no bar.");
     } else {
       throw application_error("The config file contains multiple bars, but no bar name was given. Available bars: " +
                               string_util::join(bars, ", "));
     }
-  } else if (sections.find("bar/" + m_barname) == sections.end()) {
+  } else if (sections.find("bar/" + barname) == sections.end()) {
     if (bars.empty()) {
-      throw application_error("Undefined bar: " + m_barname + ". The config file contains no bar.");
+      throw application_error("Undefined bar: " + barname + ". The config file contains no bar.");
     } else {
       throw application_error(
-          "Undefined bar: " + m_barname + ". Available bars: " + string_util::join(get_bars(sections), ", "));
+          "Undefined bar: " + barname + ". Available bars: " + string_util::join(get_bars(sections), ", "));
     }
   }
 
@@ -45,7 +45,7 @@ config::make_type config_parser::parse() {
    * second element onwards for the included list
    */
   file_list included(m_files.begin() + 1, m_files.end());
-  config::make_type result = config::make(m_config, m_barname);
+  config::make_type result = config::make(m_config, barname);
 
   // Cast to non-const to set sections, included and xrm
   config& m_conf = const_cast<config&>(result);
diff --git a/src/main.cpp b/src/main.cpp
index e2aa9e1e..203bc49d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -127,8 +127,8 @@ int main(int argc, char** argv) {
       barname = cli->get(0);
     }
 
-    config_parser parser{logger, move(confpath), move(barname)};
-    config::make_type conf = parser.parse();
+    config_parser parser{logger, move(confpath)};
+    config::make_type conf = parser.parse(move(barname));
 
     //==================================================
     // Dump requested data
diff --git a/tests/unit_tests/components/config_parser.cpp b/tests/unit_tests/components/config_parser.cpp
index 05d55220..a3d1cbe9 100644
--- a/tests/unit_tests/components/config_parser.cpp
+++ b/tests/unit_tests/components/config_parser.cpp
@@ -13,8 +13,8 @@ class TestableConfigParser : public config_parser {
   using config_parser::config_parser;
 
  public:
-  TestableConfigParser(const logger& logger, string&& file, string&& bar)
-      : config_parser(logger, move(file), move(bar)) {
+  TestableConfigParser(const logger& logger, string&& file)
+      : config_parser(logger, move(file)) {
     m_files.push_back("test_config");
   }
 
@@ -43,7 +43,7 @@ class TestableConfigParser : public config_parser {
 class ConfigParser : public ::testing::Test {
  protected:
   const logger l = logger(loglevel::NONE);
-  unique_ptr<TestableConfigParser> parser = make_unique<TestableConfigParser>(l, "/dev/zero", "TEST");
+  unique_ptr<TestableConfigParser> parser = make_unique<TestableConfigParser>(l, "/dev/zero");
 };
 
 // ParseLineTest {{{

From b5764c8a9395465ae4a83ba647e74f94132401f1 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Tue, 19 Jul 2022 23:26:11 +0200
Subject: [PATCH 32/32] Use CMAKE_INSTALL_SYSCONFDIR instead of /etc (#2770)

Some distro's build infrastructure (e.g. gentoo) can use
CMAKE_INSTALL_PREFIX to install to a different location.
When the config path is hardcoded to /etc, CMAKE_INSTALL_PREFIX has no
effect.

Ref: https://bugs.gentoo.org/858797
---
 CHANGELOG.md   | 3 +++
 CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cca1973..cfd265b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Breaking
 - `custom/script`: now doesn't hide failing script if it's output is not changing ([`#2636`](https://github.com/polybar/polybar/issues/2636)). Somewhat similar behaviour can be imitated with `format-fail`, if necessary.
 
+### Build
+- Respect `CMAKE_INSTALL_PREFIX` when installing default config ([`#2770`](https://github.com/polybar/polybar/pull/2770))
+
 ### Deprecated
 - `custom/text`: The `content` setting and all its properties are deprecated in favor of `format` with the same functionality. ([`#2676`](https://github.com/polybar/polybar/pull/2676))
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f71801c8..0979f8af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
 
 if(BUILD_CONFIG)
   install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini
-    DESTINATION /etc/${PROJECT_NAME}
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}
     COMPONENT config)
 endif()