From 697638db2b0673d3d21b7b01f5b4124c5b23fc48 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Fri, 16 Dec 2016 07:10:45 +0100
Subject: [PATCH] fix(tray): Follow window fade

---
 include/events/signal.hpp     | 4 ++++
 include/events/signal_fwd.hpp | 1 +
 include/x11/tray_manager.hpp  | 3 ++-
 src/components/bar.cpp        | 2 ++
 src/x11/tray_manager.cpp      | 8 ++++++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/include/events/signal.hpp b/include/events/signal.hpp
index 9b15f37f..a96c8286 100644
--- a/include/events/signal.hpp
+++ b/include/events/signal.hpp
@@ -80,6 +80,9 @@ namespace signals {
       const ValueType* operator()() const {
         return reinterpret_cast<const ValueType*>(&m_data);
       }
+      const ValueType* data() const {
+        return reinterpret_cast<const ValueType*>(&m_data);
+      }
 
      private:
       char m_data[sizeof(ValueType)];
@@ -112,6 +115,7 @@ namespace signals {
   namespace ui {
     DEFINE_VALUE_SIGNAL(50, button_press, string);
     DEFINE_VALUE_SIGNAL(51, visibility_change, bool);
+    DEFINE_VALUE_SIGNAL(52, dim_window, double);
   }
 
   namespace parser {
diff --git a/include/events/signal_fwd.hpp b/include/events/signal_fwd.hpp
index 555feaf9..25051983 100644
--- a/include/events/signal_fwd.hpp
+++ b/include/events/signal_fwd.hpp
@@ -25,6 +25,7 @@ namespace signals {
   namespace ui {
     struct button_press;
     struct visibility_change;
+    struct dim_window;
   }
   namespace parser {
     struct change_background;
diff --git a/include/x11/tray_manager.hpp b/include/x11/tray_manager.hpp
index 2704b5f1..6e26b6f2 100644
--- a/include/x11/tray_manager.hpp
+++ b/include/x11/tray_manager.hpp
@@ -63,7 +63,7 @@ struct tray_settings {
 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, visibility_change> {
+                     public signal_receiver<SIGN_PRIORITY_TRAY, visibility_change, dim_window> {
  public:
   using make_type = unique_ptr<tray_manager>;
   static make_type make();
@@ -128,6 +128,7 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
   void handle(const evt::unmap_notify& evt);
 
   bool on(const visibility_change& evt);
+  bool on(const dim_window& evt);
 
  private:
   connection& m_connection;
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 4aaf7a42..b8c5a789 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -425,6 +425,7 @@ void bar::handle(const evt::enter_notify&) {
   if (m_opts.dimmed) {
     window win{m_connection, m_opts.window};
     wm_util::set_wm_window_opacity(m_connection, m_opts.window, 1.0 * 0xFFFFFFFF);
+    m_sig.emit(dim_window{1.0});
     m_opts.dimmed = false;
   }
 }
@@ -439,6 +440,7 @@ void bar::handle(const evt::leave_notify&) {
   if (!m_opts.dimmed) {
     window win{m_connection, m_opts.window};
     wm_util::set_wm_window_opacity(m_connection, m_opts.window, m_opts.dimvalue * 0xFFFFFFFF);
+    m_sig.emit(dim_window{double{m_opts.dimvalue}});
     m_opts.dimmed = true;
   }
 }
diff --git a/src/x11/tray_manager.cpp b/src/x11/tray_manager.cpp
index 5e7b5e32..6080c197 100644
--- a/src/x11/tray_manager.cpp
+++ b/src/x11/tray_manager.cpp
@@ -1146,4 +1146,12 @@ bool tray_manager::on(const visibility_change& evt) {
   return true;
 }
 
+bool tray_manager::on(const dim_window& evt) {
+  if (m_activated) {
+    wm_util::set_wm_window_opacity(m_connection, m_tray, *evt.data() * 0xFFFFFFFF);
+  }
+  // let the event bubble
+  return false;
+}
+
 POLYBAR_NS_END