X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=ba1effdc235c3231b5471586724712c4bf9d2d36;hb=dc465727c14a7d7588dad8554afc08f55e769b76;hp=da3cc29647bdee8ad0f4e3b537e43791ef5da37b;hpb=b2dac46f817dcb12c180925a52dae5494ea584a3;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index da3cc29..ba1effd 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -6,8 +6,8 @@
 #include "util.h"
 
 #include <functional>
-#include <map>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 //                      _                 _
@@ -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::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);
-};
-
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
@@ -258,7 +256,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 +280,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()))
@@ -298,9 +296,9 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
 //  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|
 //
 struct controller : public wayland_proxy<struct ivi_controller> {
-   std::map<uint32_t, std::unique_ptr<struct surface>> surfaces;
-   std::map<uint32_t, std::unique_ptr<struct layer>> layers;
-   std::map<uint32_t, std::unique_ptr<struct screen>> screens;
+   std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces;
+   std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers;
+   std::unordered_map<uint32_t, std::unique_ptr<struct screen>> screens;
 
    typedef std::pair<char const *, std::function<void(struct controller *)>>
       name_task_pair;