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

diff --git a/src/wayland.hpp b/src/wayland.hpp
index 889b722..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>
 
 //                      _                 _
@@ -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));
       }
    }
 };
@@ -39,26 +39,6 @@ struct wayland_proxy {
 // |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|   \_/\_/ |_|
 //                                 |_|
 namespace wl {
-struct registry;
-
-//      _ _           _
-//   __| (_)___ _ __ | | __ _ _   _
-//  / _` | / __| '_ \| |/ _` | | | |
-// | (_| | \__ \ |_) | | (_| | |_| |
-//  \__,_|_|___/ .__/|_|\__,_|\__, |
-//             |_|            |___/
-struct display {
-   std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
-      d;
-   std::unique_ptr<struct registry> r;
-
-   display();
-   ~display();
-   bool ok() const;
-   void roundtrip();
-   int dispatch();
-};
-
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -67,7 +47,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();
@@ -79,6 +59,26 @@ struct registry : public wayland_proxy<struct wl_registry> {
    void global_remove(uint32_t name);
 };
 
+//      _ _           _
+//   __| (_)___ _ __ | | __ _ _   _
+//  / _` | / __| '_ \| |/ _` | | | |
+// | (_| | \__ \ |_) | | (_| | |_| |
+//  \__,_|_|___/ .__/|_|\__,_|\__, |
+//             |_|            |___/
+struct display {
+   std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
+      d;
+   struct registry r;
+
+   display();
+   ~display();
+   bool ok() const;
+   void roundtrip();
+   int dispatch();
+   void flush();
+   int get_fd() const;
+};
+
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
@@ -86,6 +86,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 +114,14 @@ 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;
-
-   std::vector<ReceiverT> receivers;
-
-   virtual ~notifier() {}
-
-   void add_receiver(ReceiverT);
-   void notify(enum property) const;
+struct rect {
+   uint32_t w, h;
+   int32_t x, y;
 };
-}
 
 struct controller;
 
@@ -168,6 +141,13 @@ struct controlled_entity {
 //
 struct surface : public wayland_proxy<struct ivi_controller_surface>,
                  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;
 
@@ -219,7 +199,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
@@ -267,8 +255,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);
    }
 };
 
@@ -281,6 +274,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);
+   }
 };
 
 //                  _             _ _
@@ -290,19 +296,48 @@ 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;
+   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
    // controller
-   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);
+   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);