From 74a62e377e931a5fa46ea300dbaedbb2cf58042e Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Wed, 16 Oct 2019 00:30:10 +0200
Subject: [PATCH] fix(bar): Configure window before remapping

Some WMs like i3 discard position information when unmapping the bar and
because of that the bar would be at the wrong position after being
remapped.

Fixes #1484
Ref: https://github.com/i3/i3/pull/3834
---
 include/components/bar.hpp |  2 ++
 src/components/bar.cpp     | 28 ++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index 2d556e4f..1851bde2 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -74,6 +74,8 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
 
  protected:
   void restack_window();
+  void reconfigue_window();
+  void reconfigure_geom();
   void reconfigure_pos();
   void reconfigure_struts();
   void reconfigure_wm_hints();
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 53dae9a9..70586d29 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -404,6 +404,11 @@ void bar::show() {
   try {
     m_log.info("Showing bar window");
     m_sig.emit(visibility_change{true});
+    /**
+     * First reconfigures the window so that WMs that discard some information
+     * when unmapping have the correct window properties (geometry etc).
+     */
+    reconfigue_window();
     m_connection.map_window_checked(m_opts.window);
     m_connection.flush();
     m_visible = true;
@@ -460,6 +465,22 @@ void bar::restack_window() {
   }
 }
 
+void bar::reconfigue_window() {
+  m_log.trace("bar: Reconfigure window");
+  restack_window();
+  reconfigure_geom();
+  reconfigure_struts();
+  reconfigure_wm_hints();
+}
+
+/**
+ * Reconfigure window geometry
+ */
+void bar::reconfigure_geom() {
+  window win{m_connection, m_opts.window};
+  win.reconfigure_geom(m_opts.size.w, m_opts.size.h, m_opts.pos.x, m_opts.pos.y);
+}
+
 /**
  * Reconfigure window position
  */
@@ -796,11 +817,7 @@ bool bar::on(const signals::eventqueue::start&) {
   m_connection.ensure_event_mask(m_opts.window, XCB_EVENT_MASK_STRUCTURE_NOTIFY);
 
   m_log.info("Bar window: %s", m_connection.id(m_opts.window));
-  restack_window();
-
-  m_log.trace("bar: Reconfigure window");
-  reconfigure_struts();
-  reconfigure_wm_hints();
+  reconfigue_window();
 
   m_log.trace("bar: Map window");
   m_connection.map_window_checked(m_opts.window);
@@ -810,7 +827,6 @@ bool bar::on(const signals::eventqueue::start&) {
   m_sig.emit(signals::ui::update_geometry{});
 
   // Reconfigure window position after mapping (required by Openbox)
-  // Required by Openbox
   reconfigure_pos();
 
   m_log.trace("bar: Draw empty bar");