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 dc1d729..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>
 
 //                      _                 _
@@ -46,17 +46,17 @@ namespace wl {
 // |_|  \___|\__, |_|___/\__|_|   \__, |
 //           |___/                |___/
 struct registry : public wayland_proxy<struct wl_registry> {
-    typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
-    std::unordered_map<std::string, binder> bindings;
+   typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
+   std::unordered_map<std::string, binder> bindings;
 
-    registry(struct wl_display *d);
-    ~registry();
+   registry(struct wl_display *d);
+   ~registry();
 
-    void add_global_handler(char const *iface, binder bind);
+   void add_global_handler(char const *iface, binder bind);
 
-    // Events
-    void global(uint32_t name, char const *iface, uint32_t v);
-    void global_remove(uint32_t name);
+   // Events
+   void global(uint32_t name, char const *iface, uint32_t v);
+   void global_remove(uint32_t name);
 };
 
 //      _ _           _
@@ -66,8 +66,7 @@ struct registry : public wayland_proxy<struct wl_registry> {
 //  \__,_|_|___/ .__/|_|\__,_|\__, |
 //             |_|            |___/
 struct display {
-   std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
-      d;
+   std::unique_ptr<struct wl_display, void(*)(struct wl_display *)> d;
    struct registry r;
 
    display();
@@ -256,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()))
@@ -280,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()))