main: pass struct conn by-reference to init_layout()

[staging/windowmanager.git] / src / wayland.hpp

diff --git a/src/wayland.hpp b/src/wayland.hpp
index df9b68e..7ff1145 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -6,8 +6,8 @@
 #include "util.h"
 
 #include <functional>
-#include <unordered_map>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 //                      _                 _
@@ -39,28 +39,6 @@ struct wayland_proxy {
 // |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|   \_/\_/ |_|
 //                                 |_|
 namespace wl {
-struct registry;
-
-//      _ _           _
-//   __| (_)___ _ __ | | __ _ _   _
-//  / _` | / __| '_ \| |/ _` | | | |
-// | (_| | \__ \ |_) | | (_| | |_| |
-//  \__,_|_|___/ .__/|_|\__,_|\__, |
-//             |_|            |___/
-struct display {
-   std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
-      d;
-   std::unique_ptr<struct registry> r;
-
-   display();
-   ~display();
-   bool ok() const;
-   void roundtrip();
-   int dispatch();
-   void flush();
-   int get_fd() const;
-};
-
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -81,6 +59,25 @@ struct registry : public wayland_proxy<struct wl_registry> {
    void global_remove(uint32_t name);
 };
 
+//      _ _           _
+//   __| (_)___ _ __ | | __ _ _   _
+//  / _` | / __| '_ \| |/ _` | | | |
+// | (_| | \__ \ |_) | | (_| | |_| |
+//  \__,_|_|___/ .__/|_|\__,_|\__, |
+//             |_|            |___/
+struct display {
+   std::unique_ptr<struct wl_display, void(*)(struct wl_display *)> d;
+   struct registry r;
+
+   display();
+   ~display();
+   bool ok() const;
+   void roundtrip();
+   int dispatch();
+   void flush();
+   int get_fd() const;
+};
+
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
@@ -258,7 +255,7 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
    }
 
    void set_render_order(std::vector<uint32_t> const &ro) {
-      struct wl_array wlro{
+      struct wl_array wlro {
          .size = ro.size() * sizeof(ro[0]),
          .alloc = ro.capacity() * sizeof(ro[0]),
          .data = const_cast<void *>(static_cast<void const *>(ro.data()))
@@ -282,7 +279,7 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
       ivi_controller_screen_add_layer(this->proxy, l->proxy);
    }
    void set_render_order(std::vector<uint32_t> const &ro) {
-      struct wl_array wlro{
+      struct wl_array wlro {
          .size = ro.size() * sizeof(ro[0]),
          .alloc = ro.capacity() * sizeof(ro[0]),
          .data = const_cast<void *>(static_cast<void const *>(ro.data()))