wayland: set surface layout in controller::surface

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

diff --git a/src/wayland.hpp b/src/wayland.hpp
index a98c36d..df9b68e 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -6,7 +6,7 @@
 #include "util.h"
 
 #include <functional>
-#include <map>
+#include <unordered_map>
 #include <memory>
 #include <vector>
 
@@ -69,7 +69,7 @@ struct display {
 //           |___/                |___/
 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;
+   std::unordered_map<std::string, binder> bindings;
 
    registry(struct wl_display *d);
    ~registry();
@@ -201,6 +201,13 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
 //          |___/
 struct layer : public wayland_proxy<struct ivi_controller_layer>,
                controlled_entity {
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
+
    layer(uint32_t i, struct controller *c);
    layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
    ~layer() override;
@@ -250,8 +257,13 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
       ivi_controller_layer_remove_surface(this->proxy, surface->proxy);
    }
 
-   inline void set_render_order(struct wl_array *surfaces) {
-      ivi_controller_layer_set_render_order(this->proxy, surfaces);
+   void set_render_order(std::vector<uint32_t> const &ro) {
+      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()))
+      };
+      ivi_controller_layer_set_render_order(this->proxy, &wlro);
    }
 };
 
@@ -266,7 +278,17 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
    screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
 
    void clear() { ivi_controller_screen_clear(this->proxy); }
-   void add_layer(layer *l) { ivi_controller_screen_add_layer(this->proxy, l->proxy); }
+   void add_layer(layer *l) {
+      ivi_controller_screen_add_layer(this->proxy, l->proxy);
+   }
+   void set_render_order(std::vector<uint32_t> const &ro) {
+      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()))
+      };
+      ivi_controller_screen_set_render_order(this->proxy, &wlro);
+   }
 };
 
 //                  _             _ _
@@ -276,9 +298,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;
@@ -299,6 +321,7 @@ struct controller : public wayland_proxy<struct ivi_controller> {
          }
          this->pending.clear();
          ivi_controller_commit_changes(this->proxy);
+         // XXX: No flush here...
       }
    }