refactor(x11): Header cleanup

include/components/controller.hpp

@@ -4,11 +4,11 @@
 #include <thread>
 
 #include "common.hpp"
-#include "config.hpp"
 #include "events/signal_fwd.hpp"
 #include "events/signal_receiver.hpp"
 #include "events/types.hpp"
 #include "x11/types.hpp"
+#include "x11/events.hpp"
 
 POLYBAR_NS
 

include/components/renderer.hpp

@@ -2,7 +2,6 @@
 
 #include "common.hpp"
 #include "components/types.hpp"
-#include "events/signal_emitter.hpp"
 #include "events/signal_fwd.hpp"
 #include "events/signal_receiver.hpp"
 #include "x11/extensions/fwd.hpp"
@@ -15,6 +14,7 @@ POLYBAR_NS
 class connection;
 class font_manager;
 class logger;
+class signal_emitter;
 
 using namespace signals::parser;
 using std::map;

include/components/screen.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
 #include "common.hpp"
-#include "components/config.hpp"
-#include "components/logger.hpp"
 #include "components/types.hpp"
 #include "events/signal_emitter.hpp"
+#include "events/signal_fwd.hpp"
 #include "x11/events.hpp"
+#include "x11/extensions/fwd.hpp"
+#include "x11/types.hpp"
 #include "x11/window.hpp"
 
 POLYBAR_NS

include/config.hpp.cmake

@@ -65,7 +65,7 @@ static constexpr const char* BUILDER_SPACE_TOKEN{"%__"};
 
 auto version_details = [](const std::vector<std::string>& args) {
   for (auto&& arg : args) {
-  if (arg.compare(0, 3, "-vv") == 0)
+    if (arg.compare(0, 3, "-vv") == 0)
       return true;
   }
   return false;

include/x11/connection.hpp

@@ -1,14 +1,16 @@
 #pragma once
 
 #include <xpp/core.hpp>
-#include <xpp/event.hpp>
 #include <xpp/generic/factory.hpp>
 #include <xpp/proto/x.hpp>
 
 #include "common.hpp"
+#include "components/screen.hpp"
 #include "utils/file.hpp"
+#include "x11/events.hpp"
 #include "x11/extensions/all.hpp"
 #include "x11/registry.hpp"
+#include "x11/types.hpp"
 
 POLYBAR_NS
 
@@ -71,7 +73,7 @@ namespace detail {
       } catch (const shared_ptr<xcb_generic_error_t>& error) {
         check<xpp::x::extension, Extensions...>(error);
       }
-      throw;  // re-throw any exception caused by wait_for_event
+      throw;  // re-throw exception
     }
 
     shared_ptr<xcb_generic_event_t> wait_for_special_event(xcb_special_event_t* se) const {
@@ -80,7 +82,7 @@ namespace detail {
       } catch (const shared_ptr<xcb_generic_error_t>& error) {
         check<xpp::x::extension, Extensions...>(error);
       }
-      throw;  // re-throw any exception caused by wait_for_event
+      throw;  // re-throw exception
     }
 
    private:

include/x11/events.hpp

@@ -1,8 +1,6 @@
 #pragma once
 
-#include "config.hpp"
+#include <xpp/event.hpp>
-
-#include <xpp/xpp.hpp>
 
 #include "common.hpp"
 

include/x11/types.hpp

@@ -17,6 +17,10 @@ namespace xpp {
   class font;
   template <typename Connection, template <typename, typename> class...>
   class cursor;
+  namespace event {
+    template <class Event, class... Events>
+    class sink;
+  }
 }
 
 POLYBAR_NS

src/components/bar.cpp

@@ -17,9 +17,8 @@
 #include "utils/math.hpp"
 #include "utils/string.hpp"
 #include "x11/atoms.hpp"
-#include "x11/extensions/all.hpp"
 #include "x11/connection.hpp"
-#include "x11/fonts.hpp"
+#include "x11/extensions/all.hpp"
 #include "x11/tray_manager.hpp"
 #include "x11/wm.hpp"
 #include "x11/xutils.hpp"

src/components/renderer.cpp

@@ -1,13 +1,12 @@
 #include "components/renderer.hpp"
 #include "components/logger.hpp"
-#include "components/types.hpp"
 #include "errors.hpp"
 #include "events/signal.hpp"
-#include "events/signal_receiver.hpp"
 #include "events/signal_emitter.hpp"
+#include "events/signal_receiver.hpp"
 #include "x11/connection.hpp"
 #include "x11/draw.hpp"
-#include "x11/fonts.hpp"
+#include "x11/extensions/all.hpp"
 #include "x11/generic.hpp"
 #include "x11/winspec.hpp"
 #include "x11/xlib.hpp"

src/components/screen.cpp

@@ -8,7 +8,10 @@
 #include "events/signal.hpp"
 #include "events/signal_emitter.hpp"
 #include "x11/connection.hpp"
-#include "x11/extensions/randr.hpp"
+#include "x11/events.hpp"
+#include "x11/extensions/all.hpp"
+#include "x11/registry.hpp"
+#include "x11/types.hpp"
 #include "x11/winspec.hpp"
 
 POLYBAR_NS

src/main.cpp

@@ -85,7 +85,6 @@ int main(int argc, char** argv) {
     conn.query_extensions();
     conn.ensure_event_mask(conn.root(), XCB_EVENT_MASK_PROPERTY_CHANGE);
 
-
     //==================================================
     // Load user configuration
     //==================================================

src/x11/events.cpp

@@ -1,4 +0,0 @@
-#include <xpp/event.hpp>
-#include <xpp/proto/x.hpp>
-
-#include "x11/events.hpp"