main: added some 'demarcation' comments

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

diff --git a/src/wayland.hpp b/src/wayland.hpp
index c3d4c2f..da3cc29 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -201,7 +201,15 @@ 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;
 
    // Requests
@@ -249,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);
    }
 };
 
@@ -263,6 +276,19 @@ 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);
+   }
+   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,24 +302,37 @@ 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;
+
+   size output_size;
 
-   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);
+         // XXX: No flush here...
       }
    }
 
    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);