From 0794731455fbf919882c8a9cc03dd42c66117a93 Mon Sep 17 00:00:00 2001
From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Mon, 26 Jun 2017 12:18:31 +0200
Subject: wayland: one less level of unique_ptr

Display now holds struct registry by value, as holding it through a
unique_ptr was rather unnecessary.

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---
 src/wayland.hpp | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'src/wayland.hpp')

diff --git a/src/wayland.hpp b/src/wayland.hpp
index df9b68e..dc1d729 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -39,7 +39,25 @@ struct wayland_proxy {
 // |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|   \_/\_/ |_|
 //                                 |_|
 namespace wl {
-struct registry;
+//                 _     _
+//  _ __ ___  __ _(_)___| |_ _ __ _   _
+// | '__/ _ \/ _` | / __| __| '__| | | |
+// | | |  __/ (_| | \__ \ |_| |  | |_| |
+// |_|  \___|\__, |_|___/\__|_|   \__, |
+//           |___/                |___/
+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;
+
+    registry(struct wl_display *d);
+    ~registry();
+
+    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);
+};
 
 //      _ _           _
 //   __| (_)___ _ __ | | __ _ _   _
@@ -50,7 +68,7 @@ struct registry;
 struct display {
    std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
       d;
-   std::unique_ptr<struct registry> r;
+   struct registry r;
 
    display();
    ~display();
@@ -61,26 +79,6 @@ struct display {
    int get_fd() const;
 };
 
-//                 _     _
-//  _ __ ___  __ _(_)___| |_ _ __ _   _
-// | '__/ _ \/ _` | / __| __| '__| | | |
-// | | |  __/ (_| | \__ \ |_| |  | |_| |
-// |_|  \___|\__, |_|___/\__|_|   \__, |
-//           |___/                |___/
-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;
-
-   registry(struct wl_display *d);
-   ~registry();
-
-   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);
-};
-
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
-- 
cgit 1.2.3-korg