tray: Embed in bar window

.clang-format

@@ -3,7 +3,7 @@ Language: Cpp
 Standard: c++17
 BasedOnStyle: Google
 ColumnLimit: 120
-NamespaceIndentation: All
+NamespaceIndentation: Inner
 AlignAfterOpenBracket: DontAlign
 AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false

.gitignore

@@ -12,3 +12,4 @@
 /.cache
 
 polybar-*.tar
+*.cache

include/components/bar.hpp

@@ -23,10 +23,12 @@ class connection;
 class logger;
 class renderer;
 class screen;
+namespace legacy_tray {
 class tray_manager;
+}
 
 namespace tags {
-  class dispatch;
+class dispatch;
 }
 // }}}
 
@@ -92,7 +94,7 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
   const logger& m_log;
   eventloop::loop& m_loop;
   unique_ptr<screen> m_screen;
-  unique_ptr<tray_manager> m_tray;
+  unique_ptr<legacy_tray::tray_manager> m_tray;
   unique_ptr<renderer> m_renderer;
   unique_ptr<tags::dispatch> m_dispatch;
   unique_ptr<tags::action_context> m_action_ctxt;

include/components/controller.hpp

@@ -62,6 +62,7 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eve
 
  protected:
   void trigger_notification();
+  void start_modules();
   void read_events(bool confwatch);
   void process_inputdata(string&& cmd);
   bool process_update(bool force);

include/components/eventloop.hpp

@@ -319,7 +319,7 @@ namespace eventloop {
       UV(uv_accept, this->template get<uv_stream_t>(), client.template get<uv_stream_t>());
     }
 
-    void read_start(cb_read &&fun, cb_void&& eof_cb, cb_error&& err_cb) {
+    void read_start(cb_read&& fun, cb_void&& eof_cb, cb_error&& err_cb) {
       this->read_callback = std::move(fun);
       this->read_eof_cb = std::move(eof_cb);
       this->read_err_cb = std::move(err_cb);

include/components/logger.hpp

@@ -34,11 +34,15 @@ class logger {
 
   explicit logger(loglevel level);
 
+  const logger& operator=(const logger&) const {
+    return *this;
+  }
+
   static loglevel parse_verbosity(const string& name, loglevel fallback = loglevel::NONE);
 
   void verbosity(loglevel level);
 
-#ifdef DEBUG_LOGGER  // {{{
+#ifdef DEBUG_LOGGER // {{{
   template <typename... Args>
   void trace(const string& message, Args&&... args) const {
     output(loglevel::TRACE, message, std::forward<Args>(args)...);
@@ -57,7 +61,7 @@ class logger {
   void trace(Args&&...) const {}
   template <typename... Args>
   void trace_x(Args&&...) const {}
-#endif  // }}}
+#endif // }}}
 
   /**
    * Output an info message
@@ -118,21 +122,21 @@ class logger {
       return;
     }
 
-#if defined(__clang__)  // {{{
+#if defined(__clang__) // {{{
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wformat-security"
 #elif defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-security"
-#endif  // }}}
+#endif // }}}
 
     dprintf(m_fd, (m_prefixes.at(level) + format + m_suffixes.at(level) + "\n").c_str(), convert(values)...);
 
-#if defined(__clang__)  // {{{
+#if defined(__clang__) // {{{
 #pragma clang diagnostic pop
 #elif defined(__GNUC__)
 #pragma GCC diagnostic pop
-#endif  // }}}
+#endif // }}}
   }
 
  private:

include/components/renderer.hpp

@@ -53,6 +53,8 @@ class renderer : public renderer_interface,
   ~renderer();
 
   xcb_window_t window() const;
+  xcb_visualtype_t* visual() const;
+  int depth() const;
 
   void begin(xcb_rectangle_t rect);
   void end();
@@ -102,18 +104,22 @@ class renderer : public renderer_interface,
   const bar_settings& m_bar;
   std::shared_ptr<bg_slice> m_background;
 
-  int m_depth{32};
+  int m_depth{-1};
   xcb_window_t m_window;
-  xcb_colormap_t m_colormap;
+  xcb_colormap_t m_colormap{XCB_NONE};
   xcb_visualtype_t* m_visual;
   xcb_gcontext_t m_gcontext;
+
+  /**
+   * Background pixmap for the bar window
+   *
+   * All bar contents are rendered onto this.
+   */
   xcb_pixmap_t m_pixmap;
 
   xcb_rectangle_t m_rect{0, 0, 0U, 0U};
   reserve_area m_cleararea{};
 
-  // bool m_autosize{false};
-
   unique_ptr<cairo::context> m_context;
   unique_ptr<cairo::xcb_surface> m_surface;
   map<alignment, alignment_block> m_blocks;

include/components/screen.hpp

@@ -16,23 +16,16 @@ class logger;
 class connection;
 class signal_emitter;
 
-class screen : public xpp::event::sink<evt::randr_screen_change_notify> {
+class screen : public xpp::event::sink<evt::map_notify, evt::randr_screen_change_notify> {
  public:
   using make_type = unique_ptr<screen>;
   static make_type make();
 
   explicit screen(connection& conn, signal_emitter& emitter, const logger& logger, const config& conf);
   ~screen();
 
-  struct size size() const {
-    return m_size;
-  }
-
-  xcb_window_t root() const {
-    return m_root;
-  }
-
  protected:
+  void handle(const evt::map_notify& evt) override;
   void handle(const evt::randr_screen_change_notify& evt) override;
 
  private:
@@ -50,6 +43,12 @@ class screen : public xpp::event::sink<evt::randr_screen_change_notify> {
   };
   bool m_sigraised{false};
 
+  /**
+   * Original event mask on the root window.
+   * Used to restore event mask after the proxy window is mapped.
+   */
+  uint32_t m_root_mask{0};
+
   bool have_monitors_changed() const;
 };
 

include/components/types.hpp

@@ -82,11 +82,15 @@ enum class strut {
 struct position {
   int x{0};
   int y{0};
+
+  bool operator==(const position& other) {
+    return this->x == other.x && this->y == other.y;
+  }
 };
 
 struct size {
-  unsigned int w{1U};
-  unsigned int h{1U};
+  unsigned w{1U};
+  unsigned h{1U};
 };
 
 enum class spacing_type { SPACE, POINT, PIXEL };
@@ -163,11 +167,21 @@ struct action {
   string command{};
 };
 
+/**
+ * Settings specific to the X window system.
+ */
+struct x_settings {
+  xcb_window_t window{XCB_NONE};
+  xcb_visualtype_t* visual{nullptr};
+  int depth{-1};
+};
+
 struct bar_settings {
   explicit bar_settings() = default;
   bar_settings(const bar_settings& other) = default;
 
-  xcb_window_t window{XCB_NONE};
+  x_settings x_data;
+
   monitor_t monitor{};
   bool monitor_strict{false};
   bool monitor_exact{true};

include/events/signal.hpp

@@ -101,12 +101,6 @@ namespace signals {
   } // namespace ui
 
   namespace ui_tray {
-    struct mapped_clients : public detail::value_signal<mapped_clients, unsigned int> {
-      using base_type::base_type;
-    };
-    struct tray_width_change : public detail::value_signal<tray_width_change, unsigned int> {
-      using base_type::base_type;
-    };
     struct tray_pos_change : public detail::value_signal<tray_pos_change, int> {
       using base_type::base_type;
     };

include/events/signal_fwd.hpp

@@ -35,8 +35,6 @@ namespace signals {
     struct update_geometry;
   } // namespace ui
   namespace ui_tray {
-    struct mapped_clients;
-    struct tray_width_change;
     struct tray_pos_change;
     struct tray_visibility;
   } // namespace ui_tray

include/modules/ipc.hpp

@@ -69,6 +69,6 @@ namespace modules {
     int m_current_hook{-1};
     void exec_hook();
   };
-}  // namespace modules
+} // namespace modules
 
 POLYBAR_NS_END

include/modules/meta/inotify_module.hpp

@@ -75,7 +75,7 @@ namespace modules {
 
           if (!this->running()) {
             break;
-}
+          }
         }
         CAST_MOD(Impl)->idle();
       }

include/modules/tray.hpp

@@ -3,27 +3,26 @@
 #include "common.hpp"
 #include "components/bar.hpp"
 #include "modules/meta/static_module.hpp"
+#include "x11/tray_manager.hpp"
 
 POLYBAR_NS
 namespace modules {
-  class tray_module : public static_module<tray_module>,
-                      public signal_receiver<SIGN_PRIORITY_TRAY, signals::ui_tray::tray_width_change> {
-   public:
-    explicit tray_module(const bar_settings& bar_settings, string name_);
-    string get_format() const;
+class tray_module : public static_module<tray_module> {
+ public:
+  explicit tray_module(const bar_settings& bar_settings, string name_);
+  string get_format() const;
 
-    bool build(builder* builder, const string& tag) const;
-    void update() {}
-    void teardown();
+  void start() override;
 
-    bool on(const signals::ui_tray::tray_width_change& evt) override;
+  bool build(builder* builder, const string& tag) const;
+  void update() {}
 
-    static constexpr auto TYPE = "internal/tray";
+  static constexpr auto TYPE = "internal/tray";
 
-   private:
-    static constexpr const char* TAG_TRAY{"<tray>"};
+ private:
+  static constexpr const char* TAG_TRAY{"<tray>"};
 
-    int m_width{0};
-  };
-}  // namespace modules
+  tray::manager m_tray;
+};
+} // namespace modules
 POLYBAR_NS_END

include/utils/color.hpp

@@ -37,6 +37,7 @@ class rgba {
   uint8_t blue_i() const;
 
   bool has_color() const;
+  bool is_transparent() const;
   rgba apply_alpha_to(rgba other) const;
   rgba try_apply_alpha_to(rgba other) const;