From cec463e8301d38b536867ec16204cd60e0272d6e Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Thu, 17 Dec 2020 05:12:09 +0100
Subject: [PATCH 01/16] doc: Don't use git for checking version number (#2311)

If git is not available (and it doesn't have to be when building from a
source archive) building the documentation fails because we use
`git rev-parse` to determine whether a certain version is unreleased.

We now use the version.txt file to do this check

This uses the packaging library, but this should not introduce a new
dependency because sphinx depends on setuptools which also depends on
that library.

Fixes #2309
---
 doc/conf.py | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index a68eaa55..13567506 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -13,11 +13,31 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+from pathlib import Path
 import datetime
-import subprocess
-from docutils.nodes import Node
 from typing import List
+from docutils.nodes import Node
 from sphinx.domains.changeset import VersionChange
+import packaging.version
+
+def get_version():
+  """
+  Searches for the version.txt file and extracts the version from it
+
+  Searches up the directory tree from the conf.py file because depending on the
+  build method, the conf.py file will be at a different location (because it is
+  configured by cmake)
+  """
+  current_path = Path(__file__).parent
+  while current_path != current_path.parent:
+    candidate = current_path / "version.txt"
+    if candidate.exists():
+      with open(candidate, "r") as f:
+        for line in f.readlines():
+          if not line.startswith("#"):
+            return packaging.version.parse(line)
+    current_path = current_path.parent
+
 
 
 # -- Project information -----------------------------------------------------
@@ -41,6 +61,11 @@ else:
 # The full version, including alpha/beta/rc tags
 release = version
 
+# The version from the version.txt file. Since we are not always first
+# configured by cmake, we don't necessarily have access to the current version
+# number
+version_txt = get_version()
+
 # Set path to documentation
 if on_rtd:
   # On readthedocs conf.py is already in the doc folder
@@ -213,12 +238,9 @@ class VersionDirective(VersionChange):
   deprecated and adds an unreleased tag to versions that are not yet released
   """
   def run(self) -> List[Node]:
-    # If the tag exists 'git rev-parse' will succeed and otherwise fail
-    completed = subprocess.run(["git", "rev-parse", self.arguments[0]],
-        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=doc_path,
-        check=False)
+    directive_version = packaging.version.parse(self.arguments[0])
 
-    if completed.returncode != 0:
+    if directive_version > version_txt:
       self.arguments[0] += " (unreleased)"
 
     return super().run()

From 1bf89e8b7661fdfb784be889838b173f0457e4b0 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Thu, 17 Dec 2020 14:02:48 +0100
Subject: [PATCH 02/16] fix(docs): Support out-of-tree builds (#2312)

Searching up from the conf.py only works if it is inside the repository
and not for out-of-tree builds (because conf.py gets configured in the
build directory).
---
 doc/conf.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 13567506..94d10cbe 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -20,23 +20,17 @@ from docutils.nodes import Node
 from sphinx.domains.changeset import VersionChange
 import packaging.version
 
-def get_version():
+def get_version(root_path):
   """
-  Searches for the version.txt file and extracts the version from it
+  Reads the polybar version from the version.txt at the root of the repo.
+  """
+  path = Path(root_path) / "version.txt"
+  with open(path, "r") as f:
+    for line in f.readlines():
+      if not line.startswith("#"):
+        return packaging.version.parse(line)
 
-  Searches up the directory tree from the conf.py file because depending on the
-  build method, the conf.py file will be at a different location (because it is
-  configured by cmake)
-  """
-  current_path = Path(__file__).parent
-  while current_path != current_path.parent:
-    candidate = current_path / "version.txt"
-    if candidate.exists():
-      with open(candidate, "r") as f:
-        for line in f.readlines():
-          if not line.startswith("#"):
-            return packaging.version.parse(line)
-    current_path = current_path.parent
+  raise RuntimeError("No version found in {}".format(path))
 
 
 
@@ -61,11 +55,6 @@ else:
 # The full version, including alpha/beta/rc tags
 release = version
 
-# The version from the version.txt file. Since we are not always first
-# configured by cmake, we don't necessarily have access to the current version
-# number
-version_txt = get_version()
-
 # Set path to documentation
 if on_rtd:
   # On readthedocs conf.py is already in the doc folder
@@ -75,6 +64,11 @@ else:
   # build folder.
   doc_path = '@doc_path@'
 
+# The version from the version.txt file. Since we are not always first
+# configured by cmake, we don't necessarily have access to the current version
+# number
+version_txt = get_version(Path(doc_path).absolute().parent)
+
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

From 33e691301dc0cc8ff2a171bac1653365e8962d73 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <p.ziegler96@gmail.com>
Date: Fri, 18 Dec 2020 23:33:03 +0100
Subject: [PATCH 03/16] fix(config): Don't treat an empty value as invalid
 (#2315)

An empty color value in the config should be treated as if no color was
specified (explicitly). This is the same behavior as before.
---
 src/components/config.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/config.cpp b/src/components/config.cpp
index a94aaee2..5be2c223 100644
--- a/src/components/config.cpp
+++ b/src/components/config.cpp
@@ -225,6 +225,10 @@ chrono::duration<double> config::convert(string&& value) const {
 
 template <>
 rgba config::convert(string&& value) const {
+  if (value.empty()) {
+    return rgba{};
+  }
+
   rgba ret{value};
 
   if (!ret.has_color()) {

From 64649a1e473c488d25aad126f0c2ce35a6af1dac Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 23 Dec 2020 17:32:15 +0100
Subject: [PATCH 04/16] Release 3.5.3

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 version.txt  |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..eed88973
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,21 @@
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+Each release should have the following subsections, if entries exist, in the
+given order: `Breaking`, `Build`, `Deprecated`, `Removed`, `Added`, `Changed`,
+`Fixed`, `Security`.
+
+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.5.3] - 2020-12-23
+### Build
+- Don't use `git` when building documentation ([`#2311`](https://github.com/polybar/polybar/issues/2309))
+### Fixed
+- Empty color values are no longer treated as invalid and no longer produce an error.
+
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.3...HEAD
+[3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/version.txt b/version.txt
index 2bd23581..af8cdbfd 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.5.2
+3.5.3

From e30d2c4c1f5e4ec966995497e891beef6b07a03e Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Thu, 24 Dec 2020 23:52:35 +0100
Subject: [PATCH 05/16] Remove tag compaction "optimizations"

The intention was to remove tags that won't have an effect and join
together consecutive tags.
However the patterns used can just as well appear in regular text, so
this can replace characters inside user defined text and not just
formatting tags.

Fixes #2331
---
 CHANGELOG.md                  |  4 +++-
 src/components/controller.cpp | 11 +----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eed88973..289ca7e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,12 @@ 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
+- Wrong text displayed if module text ends with `}` ([`#2331`](https://github.com/polybar/polybar/issues/2331))
 
 ## [3.5.3] - 2020-12-23
 ### Build
-- Don't use `git` when building documentation ([`#2311`](https://github.com/polybar/polybar/issues/2309))
+- Don't use `git` when building documentation ([`#2309`](https://github.com/polybar/polybar/issues/2309))
 ### Fixed
 - Empty color values are no longer treated as invalid and no longer produce an error.
 
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index f55a05d1..86a1e983 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -646,16 +646,7 @@ bool controller::process_update(bool force) {
       block_contents += padding_right;
     }
 
-    // Strip unnecessary reset tags
-    block_contents = string_util::replace_all(block_contents, "T-}%{T", "T");
-    block_contents = string_util::replace_all(block_contents, "B-}%{B#", "B#");
-    block_contents = string_util::replace_all(block_contents, "F-}%{F#", "F#");
-    block_contents = string_util::replace_all(block_contents, "U-}%{U#", "U#");
-    block_contents = string_util::replace_all(block_contents, "u-}%{u#", "u#");
-    block_contents = string_util::replace_all(block_contents, "o-}%{o#", "o#");
-
-    // Join consecutive tags
-    contents += string_util::replace_all(block_contents, "}%{", " ");
+    contents += block_contents;
   }
 
   try {

From fdc670a9ddf561b8bb92b67f4cf4c190678e6af1 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Thu, 7 Jan 2021 13:44:30 +0100
Subject: [PATCH 06/16] Release 3.5.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 289ca7e3..bf5eb9d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -10,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.5.4] - 2021-01-07
 ### Fixed
 - Wrong text displayed if module text ends with `}` ([`#2331`](https://github.com/polybar/polybar/issues/2331))
 
@@ -19,5 +20,6 @@ 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.5.3...HEAD
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.4...HEAD
+[3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4
 [3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/version.txt b/version.txt
index af8cdbfd..094129b6 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.5.3
+3.5.4

From 6b1c5489a2c364cf269ef174447e524bd23ca560 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Tue, 19 Jan 2021 10:42:27 +0100
Subject: [PATCH 07/16] fix(build): Only change VersionDirective if supported

The VersionChange class is not available in older versions of sphinx, so
we just disable it

Fixes #2356
---
 CHANGELOG.md |  2 ++
 doc/conf.py  | 46 +++++++++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf5eb9d0..19083c9c 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]
+### Build
+- Support older python sphinx versions again ([`#2356`](https://github.com/polybar/polybar/issues/2356))
 
 ## [3.5.4] - 2021-01-07
 ### Fixed
diff --git a/doc/conf.py b/doc/conf.py
index 94d10cbe..9bd12125 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -15,9 +15,7 @@
 import os
 from pathlib import Path
 import datetime
-from typing import List
-from docutils.nodes import Node
-from sphinx.domains.changeset import VersionChange
+import sphinx
 import packaging.version
 
 def get_version(root_path):
@@ -32,8 +30,6 @@ def get_version(root_path):
 
   raise RuntimeError("No version found in {}".format(path))
 
-
-
 # -- Project information -----------------------------------------------------
 
 project = 'Polybar User Manual'
@@ -221,20 +217,32 @@ epub_exclude_files = ['search.html']
 # The 'versionadded' and 'versionchanged' directives are overridden.
 suppress_warnings = ['app.add_directive']
 
-def setup(app):
-  app.add_directive('deprecated', VersionDirective)
-  app.add_directive('versionadded', VersionDirective)
-  app.add_directive('versionchanged', VersionDirective)
+# It is not exactly clear in which version the VersionChange class was
+# introduced, but we know it is available in at least 1.8.5.
+# This feature is mainly needed for the online docs on readthedocs for the docs
+# built from master, documentation built for proper releases should not even
+# mention unreleased changes. Because of that it's not that important that this
+# is added to local builds.
+if packaging.version.parse(sphinx.__version__) >= packaging.version.parse("1.8.5"):
 
-class VersionDirective(VersionChange):
-  """
-  Overwrites the Sphinx directive for versionchanged, versionadded, and
-  deprecated and adds an unreleased tag to versions that are not yet released
-  """
-  def run(self) -> List[Node]:
-    directive_version = packaging.version.parse(self.arguments[0])
+  from typing import List
+  from docutils.nodes import Node
+  from sphinx.domains.changeset import VersionChange
 
-    if directive_version > version_txt:
-      self.arguments[0] += " (unreleased)"
+  def setup(app):
+    app.add_directive('deprecated', VersionDirective)
+    app.add_directive('versionadded', VersionDirective)
+    app.add_directive('versionchanged', VersionDirective)
 
-    return super().run()
+  class VersionDirective(VersionChange):
+    """
+    Overwrites the Sphinx directive for versionchanged, versionadded, and
+    deprecated and adds an unreleased tag to versions that are not yet released
+    """
+    def run(self) -> List[Node]:
+      directive_version = packaging.version.parse(self.arguments[0])
+
+      if directive_version > version_txt:
+        self.arguments[0] += " (unreleased)"
+
+      return super().run()

From 1d033edaae8fe40ed3cbe2b80687cac0813837fb Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Mon, 1 Mar 2021 21:33:03 +0100
Subject: [PATCH 08/16] Release 3.5.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19083c9c..44988bd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ 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.5.5] - 2021-03-01
 ### Build
 - Support older python sphinx versions again ([`#2356`](https://github.com/polybar/polybar/issues/2356))
 
@@ -22,6 +23,7 @@ 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.5.4...HEAD
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.5...HEAD
+[3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.5
 [3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4
 [3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/version.txt b/version.txt
index 094129b6..207bcec8 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.5.4
+3.5.5

From 1ddd8bd1e16c2fcbd79fa0476619aea8c259c688 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Sun, 9 May 2021 21:19:15 +0200
Subject: [PATCH 09/16] fix(build): Disable sphinx manpage section dirs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before sphinx 4.0, this was the default but was changed in 4.0.
Now by default the folder structure looks like this:

man
├── 1
│   └── polybar.1
└── 5
    └── polybar.5

This restores the old behavior where there weren't individual folders
for the different sections.

Fixes #2424
Ref: https://www.sphinx-doc.org/en/master/changes.html#id14
---
 CHANGELOG.md | 3 +++
 doc/conf.py  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44988bd1..2d03d7c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ 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]
+### Build
+- Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
+
 ## [3.5.5] - 2021-03-01
 ### Build
 - Support older python sphinx versions again ([`#2356`](https://github.com/polybar/polybar/issues/2356))
diff --git a/doc/conf.py b/doc/conf.py
index 9bd12125..656c7291 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -185,6 +185,9 @@ man_pages = [
     ('man/polybar.5', 'polybar', 'configuration file for polybar(1)', [], 5)
 ]
 
+man_make_section_directory = False
+
+
 # -- Options for Texinfo output ----------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples

From ad987098ff10a03f74a5388de0b920cdcf67dd1c Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Tue, 18 May 2021 11:02:10 +0200
Subject: [PATCH 10/16] fix(tray): Support clients with different depths

XCB_BACK_PIXMAP_PARENT_RELATIVE requires that the client has the same
depth as the tray window.

There was an issue with dropbox having a depth of 32 and the tray window
having a depth of 24 that caused the configuration of the icon to fail.
It would then be displayed outside of the bar because the catch block
was not hit (different exception).

We now just don't configure XCB_CW_BACK_PIXMAP. This seems to work and
is also what stalonetray does.

This does not fix the issue with dropbox having an arbitrary background.

Fixes #1679
Fixes #2430
---
 CHANGELOG.md             |  2 ++
 src/x11/tray_manager.cpp | 16 +++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d03d7c4..6fbc5e03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Build
 - Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
+### Fixed
+- Tray icons sometimes appears outside of bar ([`#2430`](https://github.com/polybar/polybar/issues/2430), [`#1679`](https://github.com/polybar/polybar/issues/1679))
 
 ## [3.5.5] - 2021-03-01
 ### Build
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 5cf503d1..44bac367 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -726,7 +726,7 @@ void tray_manager::track_selection_owner(xcb_window_t owner) {
  * Process client docking request
  */
 void tray_manager::process_docking_request(xcb_window_t win) {
-  m_log.info("Processing docking request from %s", m_connection.id(win));
+  m_log.info("Processing docking request from '%s' (%s)", ewmh_util::get_wm_name(win), m_connection.id(win));
 
   m_clients.emplace_back(factory_util::shared<tray_client>(m_connection, win, m_opts.width, m_opts.height));
   auto& client = m_clients.back();
@@ -734,18 +734,15 @@ void tray_manager::process_docking_request(xcb_window_t win) {
   try {
     m_log.trace("tray: Get client _XEMBED_INFO");
     xembed::query(m_connection, win, client->xembed());
-  } catch (const application_error& err) {
-    m_log.err(err.what());
-  } catch (const xpp::x::error::window& err) {
+  } catch (const std::exception& err) {
     m_log.err("Failed to query _XEMBED_INFO, removing client... (%s)", err.what());
     remove_client(win, true);
     return;
   }
 
   try {
-    const unsigned int mask{XCB_CW_BACK_PIXMAP | XCB_CW_EVENT_MASK};
-    const unsigned int values[]{
-        XCB_BACK_PIXMAP_PARENT_RELATIVE, XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY};
+    const unsigned int mask = XCB_CW_EVENT_MASK;
+    const unsigned int values[]{XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY};
 
     m_log.trace("tray: Update client window");
     m_connection.change_window_attributes_checked(client->window(), mask, values);
@@ -767,8 +764,9 @@ void tray_manager::process_docking_request(xcb_window_t win) {
       m_log.trace("tray: Map client");
       m_connection.map_window_checked(client->window());
     }
-  } catch (const xpp::x::error::window& err) {
-    m_log.err("Failed to setup tray client, removing... (%s)", err.what());
+
+  } catch (const std::exception& err) {
+    m_log.err("Failed to setup tray client removing... (%s)", err.what());
     remove_client(win, false);
   }
 }

From cbe4521737087a3113720b040cc0e043358188c7 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Tue, 18 May 2021 11:05:02 +0200
Subject: [PATCH 11/16] tray: Do not swallow clear_window exceptions

---
 src/x11/tray_client.cpp  |  9 +++------
 src/x11/tray_manager.cpp | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/x11/tray_client.cpp b/src/x11/tray_client.cpp
index 9075083f..12978fad 100644
--- a/src/x11/tray_client.cpp
+++ b/src/x11/tray_client.cpp
@@ -1,9 +1,10 @@
+#include "x11/tray_client.hpp"
+
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
 #include "utils/memory.hpp"
 #include "x11/connection.hpp"
-#include "x11/tray_client.hpp"
 #include "x11/xembed.hpp"
 
 POLYBAR_NS
@@ -28,11 +29,7 @@ unsigned int tray_client::height() const {
 }
 
 void tray_client::clear_window() const {
-  try {
-    m_connection.clear_area_checked(1, window(), 0, 0, width(), height());
-  } catch (const xpp::x::error::window& err) {
-    // ignore
-  }
+  m_connection.clear_area_checked(1, window(), 0, 0, width(), height());
 }
 
 /**
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 44bac367..f8414538 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -427,13 +427,21 @@ void tray_manager::refresh_window() {
     m_connection.poly_fill_rectangle(m_pixmap, m_gc, 1, &rect);
   }
 
-  if (m_surface)
+  if (m_surface) {
     m_surface->flush();
+  }
 
   m_connection.clear_area(0, m_tray, 0, 0, width, height);
 
   for (auto&& client : m_clients) {
-    client->clear_window();
+    try {
+      if (client->mapped()) {
+        client->clear_window();
+      }
+    } catch (const std::exception& e) {
+      m_log.err("Failed to clear tray client %s '%s' (%s)", m_connection.id(client->window()),
+          ewmh_util::get_wm_name(client->window()), e.what());
+    }
   }
 
   m_connection.flush();
@@ -477,8 +485,8 @@ void tray_manager::create_window() {
     << cw_class(XCB_WINDOW_CLASS_INPUT_OUTPUT)
     << cw_params_backing_store(XCB_BACKING_STORE_WHEN_MAPPED)
     << cw_params_event_mask(XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
-                           |XCB_EVENT_MASK_STRUCTURE_NOTIFY
-                           |XCB_EVENT_MASK_EXPOSURE)
+        |XCB_EVENT_MASK_STRUCTURE_NOTIFY
+        |XCB_EVENT_MASK_EXPOSURE)
     << cw_params_override_redirect(true);
   // clang-format on
 

From d8f4d56a95b388cf7332b972d1a32e8039ba36fc Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Mon, 24 May 2021 00:51:18 +0200
Subject: [PATCH 12/16] Fix i3 module assertion failure

This brings #2417 into the hotfix release

Ref #2417
---
 CHANGELOG.md | 1 +
 lib/i3ipcpp  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fbc5e03..9e691031 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
 - Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
 ### Fixed
 - Tray icons sometimes appears outside of bar ([`#2430`](https://github.com/polybar/polybar/issues/2430), [`#1679`](https://github.com/polybar/polybar/issues/1679))
+- Crash in the i3 module ([`#2416`](https://github.com/polybar/polybar/issues/2416))
 
 ## [3.5.5] - 2021-03-01
 ### Build
diff --git a/lib/i3ipcpp b/lib/i3ipcpp
index cb008b30..86ddf710 160000
--- a/lib/i3ipcpp
+++ b/lib/i3ipcpp
@@ -1 +1 @@
-Subproject commit cb008b30fc5f3febfe467884cb0211ee3c16386b
+Subproject commit 86ddf7102c6903ae0cc543071e2d375403fc0727

From eb9c192d041fa272982d8d5bc06bdb2322a3c4c0 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Mon, 24 May 2021 01:00:50 +0200
Subject: [PATCH 13/16] Release 3.5.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e691031..80fa3a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ 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.5.6] - 2021-05-24
 ### Build
 - Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
 ### Fixed
@@ -29,7 +30,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.5.5...HEAD
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.6...HEAD
+[3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.6
 [3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.5
 [3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4
 [3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/version.txt b/version.txt
index 207bcec8..e870d52e 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.5.5
+3.5.6

From 6136c08d4287a575f6ef593e3ecca27dfa517c01 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 8 Sep 2021 18:13:21 +0200
Subject: [PATCH 14/16] tray: Properly handle missing _XEMBED_INFO

The icon not supporting XEMBED is not fatal, we just treat is as always
mapped.

Fixes #2479
Fixes #2442
---
 CHANGELOG.md                 |  5 +++++
 include/x11/tray_client.hpp  | 20 ++++++++++++++---
 include/x11/tray_manager.hpp |  1 -
 include/x11/xembed.hpp       | 37 ++++++++++++++++++++++---------
 src/x11/tray_client.cpp      | 32 ++++++++++++++++-----------
 src/x11/tray_manager.cpp     | 38 ++++++++++++++++++++------------
 src/x11/xembed.cpp           | 42 ++++++++++++++++++++++++------------
 7 files changed, 120 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80fa3a51..380dc37e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@ 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
+- The tray mistakenly removed tray icons that did not support XEMBED
+  ([`#2479`](https://github.com/polybar/polybar/issues/2479),
+  [`#2442`](https://github.com/polybar/polybar/issues/2442))
+
 ## [3.5.6] - 2021-05-24
 ### Build
 - Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
diff --git a/include/x11/tray_client.hpp b/include/x11/tray_client.hpp
index d74c9546..eb2593fa 100644
--- a/include/x11/tray_client.hpp
+++ b/include/x11/tray_client.hpp
@@ -4,12 +4,12 @@
 
 #include "common.hpp"
 #include "utils/concurrency.hpp"
+#include "x11/xembed.hpp"
 
 POLYBAR_NS
 
 // fwd declarations
 class connection;
-struct xembed_data;
 
 class tray_client {
  public:
@@ -28,7 +28,10 @@ class tray_client {
   void mapped(bool state);
 
   xcb_window_t window() const;
-  xembed_data* xembed() const;
+
+  void query_xembed();
+  bool is_xembed_supported() const;
+  const xembed::info& get_xembed() const;
 
   void ensure_state() const;
   void reconfigure(int x, int y) const;
@@ -38,7 +41,18 @@ class tray_client {
   connection& m_connection;
   xcb_window_t m_window{0};
 
-  shared_ptr<xembed_data> m_xembed;
+  /**
+   * Whether the client window supports XEMBED.
+   *
+   * A tray client can still work when it doesn't support XEMBED.
+   */
+  bool m_xembed_supported{false};
+
+  /**
+   * _XEMBED_INFO of the client window
+   */
+  xembed::info m_xembed;
+
   bool m_mapped{false};
 
   unsigned int m_width;
diff --git a/include/x11/tray_manager.hpp b/include/x11/tray_manager.hpp
index 1228c3a9..bf3732e4 100644
--- a/include/x11/tray_manager.hpp
+++ b/include/x11/tray_manager.hpp
@@ -34,7 +34,6 @@ using namespace std::chrono_literals;
 
 // fwd declarations
 class connection;
-struct xembed_data;
 class background_manager;
 class bg_slice;
 
diff --git a/include/x11/xembed.hpp b/include/x11/xembed.hpp
index b587bbf2..51407612 100644
--- a/include/x11/xembed.hpp
+++ b/include/x11/xembed.hpp
@@ -21,24 +21,41 @@ POLYBAR_NS
 #define XEMBED_FOCUS_FIRST 1
 #define XEMBED_FOCUS_LAST 1
 
-struct xembed_data {
-  unsigned long version;
-  unsigned long flags;
-  xcb_timestamp_t time;
-  xcb_atom_t xembed;
-  xcb_atom_t xembed_info;
-};
+/**
+ * Max XEMBED version supported.
+ */
+#define XEMBED_MAX_VERSION UINT32_C(0)
 
+/**
+ * Implementation of parts of the XEMBED spec (as much as needed to get the tray working).
+ *
+ * Ref: https://specifications.freedesktop.org/xembed-spec/xembed-spec-latest.html
+ */
 namespace xembed {
-  xembed_data* query(connection& conn, xcb_window_t win, xembed_data* data);
+
+  class info {
+    public:
+      void set(uint32_t* data);
+
+      uint32_t get_version() const;
+      uint32_t get_flags() const;
+
+      bool is_mapped() const;
+
+    protected:
+      uint32_t version;
+      uint32_t flags;
+  };
+
+  bool query(connection& conn, xcb_window_t win, info& data);
   void send_message(connection& conn, xcb_window_t target, long message, long d1, long d2, long d3);
   void send_focus_event(connection& conn, xcb_window_t target);
-  void notify_embedded(connection& conn, xcb_window_t win, xcb_window_t embedder, long version);
+  void notify_embedded(connection& conn, xcb_window_t win, xcb_window_t embedder, uint32_t version);
   void notify_activated(connection& conn, xcb_window_t win);
   void notify_deactivated(connection& conn, xcb_window_t win);
   void notify_focused(connection& conn, xcb_window_t win, long focus_type);
   void notify_unfocused(connection& conn, xcb_window_t win);
   void unembed(connection& conn, xcb_window_t win, xcb_window_t root);
-}
+}  // namespace xembed
 
 POLYBAR_NS_END
diff --git a/src/x11/tray_client.cpp b/src/x11/tray_client.cpp
index 12978fad..11d357ee 100644
--- a/src/x11/tray_client.cpp
+++ b/src/x11/tray_client.cpp
@@ -5,16 +5,11 @@
 
 #include "utils/memory.hpp"
 #include "x11/connection.hpp"
-#include "x11/xembed.hpp"
 
 POLYBAR_NS
 
 tray_client::tray_client(connection& conn, xcb_window_t win, unsigned int w, unsigned int h)
-    : m_connection(conn), m_window(win), m_width(w), m_height(h) {
-  m_xembed = memory_util::make_malloc_ptr<xembed_data>();
-  m_xembed->version = XEMBED_VERSION;
-  m_xembed->flags = XEMBED_MAPPED;
-}
+    : m_connection(conn), m_window(win), m_width(w), m_height(h) {}
 
 tray_client::~tray_client() {
   xembed::unembed(m_connection, window(), m_connection.root());
@@ -60,20 +55,31 @@ xcb_window_t tray_client::window() const {
   return m_window;
 }
 
-/**
- * Get xembed data pointer
- */
-xembed_data* tray_client::xembed() const {
-  return m_xembed.get();
+void tray_client::query_xembed() {
+  m_xembed_supported = xembed::query(m_connection, m_window, m_xembed);
+}
+
+bool tray_client::is_xembed_supported() const {
+  return m_xembed_supported;
+}
+
+const xembed::info& tray_client::get_xembed() const {
+  return m_xembed;
 }
 
 /**
  * Make sure that the window mapping state is correct
  */
 void tray_client::ensure_state() const {
-  if (!mapped() && ((xembed()->flags & XEMBED_MAPPED) == XEMBED_MAPPED)) {
+  bool should_be_mapped = true;
+
+  if (is_xembed_supported()) {
+    should_be_mapped = m_xembed.is_mapped();
+  }
+
+  if (!mapped() && should_be_mapped) {
     m_connection.map_window_checked(window());
-  } else if (mapped() && ((xembed()->flags & XEMBED_MAPPED) != XEMBED_MAPPED)) {
+  } else if (mapped() && !should_be_mapped) {
     m_connection.unmap_window_checked(window());
   }
 }
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index f8414538..77c2eb5b 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -21,6 +21,12 @@
 #include "x11/winspec.hpp"
 #include "x11/xembed.hpp"
 
+/*
+ * Tray implementation according to the System Tray Protocol.
+ *
+ * Ref: https://specifications.freedesktop.org/systemtray-spec/systemtray-spec-latest.html
+ */
+
 // ====================================================================================================
 //
 // TODO: 32-bit visual
@@ -740,14 +746,20 @@ void tray_manager::process_docking_request(xcb_window_t win) {
   auto& client = m_clients.back();
 
   try {
-    m_log.trace("tray: Get client _XEMBED_INFO");
-    xembed::query(m_connection, win, client->xembed());
-  } catch (const std::exception& err) {
+    client->query_xembed();
+  } catch (const xpp::x::error::window& err) {
     m_log.err("Failed to query _XEMBED_INFO, removing client... (%s)", err.what());
     remove_client(win, true);
     return;
   }
 
+  m_log.trace("tray: xembed = %s", client->is_xembed_supported() ? "true" : "false");
+  if (client->is_xembed_supported()) {
+    m_log.trace("tray: version = 0x%x, flags = 0x%x, XEMBED_MAPPED = %s", client->get_xembed().get_version(),
+        client->get_xembed().get_flags(), client->get_xembed().is_mapped() ? "true" : "false");
+  }
+
+
   try {
     const unsigned int mask = XCB_CW_EVENT_MASK;
     const unsigned int values[]{XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY};
@@ -765,10 +777,12 @@ void tray_manager::process_docking_request(xcb_window_t win) {
     m_connection.reparent_window_checked(
         client->window(), m_tray, calculate_client_x(client->window()), calculate_client_y());
 
-    m_log.trace("tray: Send embbeded notification to client");
-    xembed::notify_embedded(m_connection, client->window(), m_tray, client->xembed()->version);
+    if (client->is_xembed_supported()) {
+      m_log.trace("tray: Send embbeded notification to client");
+      xembed::notify_embedded(m_connection, client->window(), m_tray, client->get_xembed().get_version());
+    }
 
-    if (client->xembed()->flags & XEMBED_MAPPED) {
+    if (!client->is_xembed_supported() || client->get_xembed().is_mapped()) {
       m_log.trace("tray: Map client");
       m_connection.map_window_checked(client->window());
     }
@@ -1019,7 +1033,6 @@ void tray_manager::handle(const evt::property_notify& evt) {
 
   m_log.trace("tray: _XEMBED_INFO: %s", m_connection.id(evt->window));
 
-  auto xd = client->xembed();
   auto win = client->window();
 
   if (evt->state == XCB_PROPERTY_NEW_VALUE) {
@@ -1027,20 +1040,17 @@ void tray_manager::handle(const evt::property_notify& evt) {
   }
 
   try {
-    m_log.trace("tray: Get client _XEMBED_INFO");
-    xembed::query(m_connection, win, xd);
-  } catch (const application_error& err) {
-    m_log.err(err.what());
-    return;
+    client->query_xembed();
   } catch (const xpp::x::error::window& err) {
     m_log.err("Failed to query _XEMBED_INFO, removing client... (%s)", err.what());
     remove_client(win, true);
     return;
   }
 
-  m_log.trace("tray: _XEMBED_INFO[0]=%u _XEMBED_INFO[1]=%u", xd->version, xd->flags);
+  m_log.trace("tray: version = 0x%x, flags = 0x%x, XEMBED_MAPPED = %s", client->get_xembed().get_version(),
+      client->get_xembed().get_flags(), client->get_xembed().is_mapped() ? "true" : "false");
 
-  if ((client->xembed()->flags & XEMBED_MAPPED) & XEMBED_MAPPED) {
+  if (client->get_xembed().is_mapped()) {
     reconfigure();
   }
 }
diff --git a/src/x11/xembed.cpp b/src/x11/xembed.cpp
index b426d9c4..1f3f27a4 100644
--- a/src/x11/xembed.cpp
+++ b/src/x11/xembed.cpp
@@ -5,26 +5,40 @@
 POLYBAR_NS
 
 namespace xembed {
+
+  void info::set(uint32_t* data) {
+    version = data[0];
+    flags = data[1];
+  }
+
+  uint32_t info::get_version() const {
+    return version;
+  }
+
+  uint32_t info::get_flags() const {
+    return flags;
+  }
+
+  bool info::is_mapped() const {
+    return (flags & XEMBED_MAPPED) == XEMBED_MAPPED;
+  }
+
   /**
    * Query _XEMBED_INFO for the given window
+   *
+   * \return Whether valid XEMBED info was found
    */
-  xembed_data* query(connection& conn, xcb_window_t win, xembed_data* data) {
-    auto info = conn.get_property(false, win, _XEMBED_INFO, XCB_GET_PROPERTY_TYPE_ANY, 0L, 2);
+  bool query(connection& conn, xcb_window_t win, info& data) {
+    auto info = conn.get_property(false, win, _XEMBED_INFO, _XEMBED_INFO, 0L, 2);
 
     if (info->value_len == 0) {
-      throw application_error("Invalid _XEMBED_INFO for window " + conn.id(win));
+      return false;
     }
 
-    std::vector<unsigned int> xembed_data{info.value<unsigned int>().begin(), info.value<unsigned int>().end()};
+    std::vector<uint32_t> xembed_data{info.value<uint32_t>().begin(), info.value<uint32_t>().end()};
+    data.set(xembed_data.data());
 
-    data->xembed = _XEMBED;
-    data->xembed_info = _XEMBED_INFO;
-
-    data->time = XCB_CURRENT_TIME;
-    data->flags = xembed_data[1];
-    data->version = xembed_data[0];
-
-    return data;
+    return true;
   }
 
   /**
@@ -53,8 +67,8 @@ namespace xembed {
   /**
    * Acknowledge window embedding
    */
-  void notify_embedded(connection& conn, xcb_window_t win, xcb_window_t embedder, long version) {
-    send_message(conn, win, XEMBED_EMBEDDED_NOTIFY, 0, embedder, version);
+  void notify_embedded(connection& conn, xcb_window_t win, xcb_window_t embedder, uint32_t version) {
+    send_message(conn, win, XEMBED_EMBEDDED_NOTIFY, 0, embedder, std::min(version, XEMBED_MAX_VERSION));
   }
 
   /**

From a8cba9c43c2633aa716af06ebe720c5d6948a63a Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Mon, 13 Sep 2021 14:06:08 +0200
Subject: [PATCH 15/16] fix(ipc): Replace all %pid% tokens

Fixes #2500
---
 CHANGELOG.md        |  2 ++
 src/modules/ipc.cpp | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380dc37e..f37ceb0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The tray mistakenly removed tray icons that did not support XEMBED
   ([`#2479`](https://github.com/polybar/polybar/issues/2479),
   [`#2442`](https://github.com/polybar/polybar/issues/2442))
+- `custom/ipc`: Only the first appearance of the `%pid%` token was replaced
+  ([`#2500`](https://github.com/polybar/polybar/issues/2500))
 
 ## [3.5.6] - 2021-05-24
 ### Build
diff --git a/src/modules/ipc.cpp b/src/modules/ipc.cpp
index c8082769..d95ab8dc 100644
--- a/src/modules/ipc.cpp
+++ b/src/modules/ipc.cpp
@@ -38,18 +38,15 @@ namespace modules {
     m_actions.emplace(make_pair<mousebtn, string>(mousebtn::DOUBLE_RIGHT, m_conf.get(name(), "double-click-right", ""s)));
     // clang-format on
 
-    const auto pid_token = [](string& s) {
-      string::size_type p = s.find("%pid%");
-      if (p != string::npos) {
-        s.replace(p, 5, to_string(getpid()));
-      }
+    const auto pid_token = [](const string& s) {
+      return string_util::replace_all(s, "%pid%", to_string(getpid()));
     };
 
     for (auto& action : m_actions) {
-      pid_token(action.second);
+      action.second = pid_token(action.second);
     }
     for (auto& hook : m_hooks) {
-      pid_token(hook->command);
+      hook->command = pid_token(hook->command);
     }
 
     m_formatter->add(DEFAULT_FORMAT, TAG_OUTPUT, {TAG_OUTPUT});

From 92722e05c2a44c68da56fdf3610fc5a06f256459 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Tue, 21 Sep 2021 18:12:57 +0200
Subject: [PATCH 16/16] Release 3.5.7

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f37ceb0e..98e1b6c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ 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.5.7] - 2021-09-21
 ### Fixed
 - The tray mistakenly removed tray icons that did not support XEMBED
   ([`#2479`](https://github.com/polybar/polybar/issues/2479),
@@ -37,8 +38,9 @@ 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.5.6...HEAD
-[3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.6
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.7...HEAD
+[3.5.7]: https://github.com/polybar/polybar/releases/tag/3.5.7
+[3.5.6]: https://github.com/polybar/polybar/releases/tag/3.5.6
 [3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.5
 [3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4
 [3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/version.txt b/version.txt
index e870d52e..1addef8a 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.5.6
+3.5.7