X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=44f6cb445fe719d7e785609be039223eafd1c7d6;hb=432f97a9d47eb6ddd5b347d20b8548593cf66e8b;hp=da01eb3ce6acb3474d0cbf922e1181830bbd8993;hpb=fdc1e4622d8aae5bf380e4b197ab616fed7efd34;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index da01eb3..44f6cb4 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -27,7 +27,7 @@ struct wayland_proxy {
       // custom wayland dtor
       if (this->proxy) {
          logdebug("%s %p @ %p", __func__, this, this->proxy);
-         wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(proxy));
+         wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
       }
    }
 };
@@ -57,6 +57,8 @@ struct display {
    bool ok() const;
    void roundtrip();
    int dispatch();
+   void flush();
+   int get_fd() const;
 };
 
 //                 _     _
@@ -86,6 +88,10 @@ struct registry : public wayland_proxy<struct wl_registry> {
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
 struct output : wayland_proxy<struct wl_output> {
+   int width;
+   int height;
+   int refresh;
+
    output(struct wl_registry *registry, uint32_t name, uint32_t version);
 
    // Events
@@ -110,45 +116,24 @@ struct output : wayland_proxy<struct wl_output> {
 //  |___/
 namespace genivi {
 
-//
-//  _ __   __ _ _ __ ___   ___  ___ _ __   __ _  ___ ___
-// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \
-// | | | | (_| | | | | | |  __/\__ \ |_) | (_| | (_|  __/
-// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
-//                                 |_|
-//              _   _  __
-//  _ __   ___ | |_(_)/ _|_   _
-// | '_ \ / _ \| __| | |_| | | |
-// | | | | (_) | |_| |  _| |_| |
-// |_| |_|\___/ \__|_|_|  \__, |
-//                        |___/
-namespace notify {
-enum property {
-   Dimensions,  // i.e. configure
-   DestRect,
-   SrcRect,
-   ZOrder,
-   Vibility,
-   Opacity,
-   Layer,
-   Surface,
-   Content,
-   Orientation,
-   Screen,
+struct size {
+   uint32_t w, h;
 };
 
-template <typename ObjectT>
-struct notifier {
-   typedef std::function<void(enum property, ObjectT *)> ReceiverT;
+struct rect {
+   uint32_t w, h;
+   int32_t x, y;
+};
 
-   std::vector<ReceiverT> receivers;
+struct controller;
 
-   virtual ~notifier() {}
+struct controlled_entity {
+   struct controller *parent;
+   uint32_t id;
 
-   void add_receiver(ReceiverT);
-   void notify(enum property) const;
+   controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {}
+   virtual ~controlled_entity() {}
 };
-}
 
 //                  __
 //  ___ _   _ _ __ / _| __ _  ___ ___
@@ -157,27 +142,17 @@ struct notifier {
 // |___/\__,_|_|  |_|  \__,_|\___\___|
 //
 struct surface : public wayland_proxy<struct ivi_controller_surface>,
-                 notify::notifier<struct surface> {
-   uint32_t id;
-
-   surface(uint32_t i, struct ivi_controller *c);
+                 controlled_entity {
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
+
+   surface(uint32_t i, struct controller *c);
    ~surface() override;
 
-   // Events
-   void visibility(int32_t visibility);
-   void opacity(float opacity);
-   void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height);
-   void destination_rectangle(int32_t x, int32_t y, int32_t width,
-                              int32_t height);
-   void configuration(int32_t width, int32_t height);
-   void orientation(int32_t orientation);
-   void pixelformat(int32_t pixelformat);
-   void layer(struct ivi_controller_layer *layer);
-   void stats(uint32_t redraw_count, uint32_t frame_count,
-              uint32_t update_count, uint32_t pid, const char *process_name);
-   void destroyed();
-   void content(int32_t content_state);
-
    // Requests
    inline void set_visibility(uint32_t visibility) {
       ivi_controller_surface_set_visibility(this->proxy, visibility);
@@ -225,23 +200,18 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
 // |_|\__,_|\__, |\___|_|
 //          |___/
 struct layer : public wayland_proxy<struct ivi_controller_layer>,
-                      notify::notifier<struct layer> {
-   uint32_t id;
-
-   layer(uint32_t i, struct ivi_controller *c);
+               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;
 
-   // Events
-   void visibility(int32_t visibility);
-   void opacity(float opacity);
-   void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height);
-   void destination_rectangle(int32_t x, int32_t y, int32_t width,
-                              int32_t height);
-   void configuration(int32_t width, int32_t height);
-   void orientation(int32_t orientation);
-   void screen(struct wl_output *screen);
-   void destroyed();
-
    // Requests
    inline void set_visibility(uint32_t visibility) {
       ivi_controller_layer_set_visibility(this->proxy, visibility);
@@ -298,10 +268,14 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 // \__ \ (__| | |  __/  __/ | | |
 // |___/\___|_|  \___|\___|_| |_|
 //
-struct screen : public wayland_proxy<struct ivi_controller_screen> {
-   uint32_t id;
+struct screen : public wayland_proxy<struct ivi_controller_screen>,
+                controlled_entity {
+   screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
 
-   screen(uint32_t i, 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);
+   }
 };
 
 //                  _             _ _
@@ -315,14 +289,73 @@ 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;
 
+   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(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) {
+            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
-   void screen(uint32_t id, struct ivi_controller_screen *screen);
-   void layer(uint32_t id);
-   void surface(uint32_t id);
-   void error(int32_t oid, int32_t otype, int32_t code, char const *text);
+   // controller
+   void controller_screen(uint32_t id, struct ivi_controller_screen *screen);
+   void controller_layer(uint32_t id);
+   void controller_surface(uint32_t id);
+   void controller_error(int32_t oid, int32_t otype, int32_t code,
+                         char const *text);
+
+   // surface
+   void surface_visibility(uint32_t id, int32_t visibility);
+   void surface_opacity(uint32_t id, float opacity);
+   void surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
+                                 int32_t width, int32_t height);
+   void surface_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+                                      int32_t width, int32_t height);
+   void surface_configuration(uint32_t id, int32_t width, int32_t height);
+   void surface_orientation(uint32_t id, int32_t orientation);
+   void surface_pixelformat(uint32_t id, int32_t pixelformat);
+   void surface_layer(uint32_t id, struct ivi_controller_layer *layer);
+   void surface_stats(uint32_t id, uint32_t redraw_count, uint32_t frame_count,
+                      uint32_t update_count, uint32_t pid,
+                      const char *process_name);
+   void surface_destroyed(uint32_t id);
+   void surface_content(uint32_t id, int32_t content_state);
+
+   // layer
+   void layer_visibility(uint32_t id, int32_t visibility);
+   void layer_opacity(uint32_t id, float opacity);
+   void layer_source_rectangle(uint32_t id, int32_t x, int32_t y, int32_t width,
+                               int32_t height);
+   void layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+                                    int32_t width, int32_t height);
+   void layer_configuration(uint32_t id, int32_t width, int32_t height);
+   void layer_orientation(uint32_t id, int32_t orientation);
+   void layer_screen(uint32_t id, struct wl_output *screen);
+   void layer_destroyed(uint32_t id);
 };
 }