X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=cb4c8ed4e14c1c879007213b385747b116bffa05;hb=f4f5f3f8f86f55c658358ec8b4f120b9fcc64d70;hp=c3d4c2f724621255447bd774a8d349efc3506e2c;hpb=ac1c1b8bbd509637514e6709c904a4a62d2ea595;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index c3d4c2f..cb4c8ed 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -202,6 +202,7 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
 struct layer : public wayland_proxy<struct ivi_controller_layer>,
                controlled_entity {
    layer(uint32_t i, struct controller *c);
+   layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
    ~layer() override;
 
    // Requests
@@ -263,6 +264,9 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 struct screen : public wayland_proxy<struct ivi_controller_screen>,
                 controlled_entity {
    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); }
 };
 
 //                  _             _ _
@@ -276,15 +280,20 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    std::map<uint32_t, std::unique_ptr<struct layer>> layers;
    std::map<uint32_t, std::unique_ptr<struct screen>> screens;
 
-   std::vector<std::function<void(struct controller *)>> pending;
+   typedef std::pair<char const *, std::function<void(struct controller *)>>
+      name_task_pair;
+   std::vector<name_task_pair> pending;
 
-   void add_task(std::function<void(struct controller *)> &&f) {
-      this->pending.emplace_back(f);
+   void add_task(char const *name,
+                 std::function<void(struct controller *)> &&f) {
+      this->pending.emplace_back(std::make_pair(name, f));
    }
+
    void execute_pending() {
       if (!this->pending.empty()) {
          for (auto &t : this->pending) {
-            t(this);
+            logdebug("executing task '%s'", t.first);
+            t.second(this);
          }
          this->pending.clear();
          ivi_controller_commit_changes(this->proxy);
@@ -294,6 +303,11 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    controller(struct wl_registry *r, uint32_t name, uint32_t version);
    ~controller() override;
 
+   // Requests
+   void commit_changes() const { ivi_controller_commit_changes(this->proxy); }
+   void layer_create(uint32_t id, int32_t w, int32_t h);
+   void surface_create(uint32_t id);
+
    // Events
    // controller
    void controller_screen(uint32_t id, struct ivi_controller_screen *screen);