X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=3516f5ecd49b2df87108feffa17063adbbb37893;hb=63c655fab3274e1319b3f52c236178e00452fe89;hp=d76a02394bb3e558e3a0e6b70bb146741c1a4b59;hpb=3121d0b9b553ddc709be8b67e91395a796cc6b6e;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index d76a023..3516f5e 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>
 
 //                      _                 _
@@ -18,18 +18,16 @@
 //                |___/                   |_____|_|                  |___/
 template <typename ProxyT>
 struct wayland_proxy {
-   ProxyT *proxy;
-
-   wayland_proxy(void *p) : proxy(static_cast<ProxyT *>(p)) {}
-
-   virtual ~wayland_proxy() {
-      // If this is the nullptr, then it means it already was destroyed by a
-      // custom wayland dtor
-      if (this->proxy) {
-         logdebug("%s %p @ %p", __func__, this, this->proxy);
-         wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
-      }
-   }
+   std::unique_ptr<ProxyT, std::function<void(ProxyT *)>> proxy;
+   wayland_proxy(wayland_proxy const &) = delete;
+   wayland_proxy &operator=(wayland_proxy const &) = delete;
+   wayland_proxy(void *p)
+      : wayland_proxy(p, [](ProxyT *p) {
+           wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(p));
+        }) {}
+   wayland_proxy(void *p, std::function<void(ProxyT *)> p_del)
+      : proxy(std::unique_ptr<ProxyT, std::function<void(ProxyT *)>>(
+           static_cast<ProxyT *>(p), p_del)) {}
 };
 
 //                                                                  _
@@ -39,28 +37,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();
-   void flush();
-   int get_fd() const;
-};
-
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -69,10 +45,11 @@ 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(registry const &) = delete;
+   registry &operator=(registry const &) = delete;
    registry(struct wl_display *d);
-   ~registry();
 
    void add_global_handler(char const *iface, binder bind);
 
@@ -81,6 +58,26 @@ struct registry : public wayland_proxy<struct wl_registry> {
    void global_remove(uint32_t name);
 };
 
+//      _ _           _
+//   __| (_)___ _ __ | | __ _ _   _
+//  / _` | / __| '_ \| |/ _` | | | |
+// | (_| | \__ \ |_) | | (_| | |_| |
+//  \__,_|_|___/ .__/|_|\__,_|\__, |
+//             |_|            |___/
+struct display {
+   std::unique_ptr<struct wl_display, void (*)(struct wl_display *)> d;
+   struct registry r;
+
+   display(display const &) = delete;
+   display &operator=(display const &) = delete;
+   display();
+   bool ok() const;
+   void roundtrip();
+   int dispatch();
+   void flush();
+   int get_fd() const;
+};
+
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
@@ -88,7 +85,13 @@ struct registry : public wayland_proxy<struct wl_registry> {
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
 struct output : wayland_proxy<struct wl_output> {
-   output(struct wl_registry *registry, uint32_t name, uint32_t version);
+   int width{};
+   int height{};
+   int refresh{};
+
+   output(output const &) = delete;
+   output &operator=(output const &) = delete;
+   output(struct wl_registry *r, uint32_t name, uint32_t v);
 
    // Events
    void geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t subpel,
@@ -112,14 +115,25 @@ struct output : wayland_proxy<struct wl_output> {
 //  |___/
 namespace genivi {
 
+struct size {
+   uint32_t w, h;
+};
+
+struct rect {
+   uint32_t w, h;
+   int32_t x, y;
+};
+
 struct controller;
 
-struct controlled_entity {
+struct controller_child {
    struct controller *parent;
    uint32_t id;
 
-   controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {}
-   virtual ~controlled_entity() {}
+   controller_child(controller_child const &) = delete;
+   controller_child &operator=(controller_child const &) = delete;
+   controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {}
+   virtual ~controller_child() {}
 };
 
 //                  __
@@ -129,48 +143,30 @@ struct controlled_entity {
 // |___/\__,_|_|  |_|  \__,_|\___\___|
 //
 struct surface : public wayland_proxy<struct ivi_controller_surface>,
-                 controlled_entity {
+                 controller_child {
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
+
+   surface(surface const &) = delete;
+   surface &operator=(surface const &) = delete;
    surface(uint32_t i, struct controller *c);
-   ~surface() override;
 
    // Requests
-   inline void set_visibility(uint32_t visibility) {
-      ivi_controller_surface_set_visibility(this->proxy, visibility);
-   }
-
-   inline void set_opacity(wl_fixed_t opacity) {
-      ivi_controller_surface_set_opacity(this->proxy, opacity);
-   }
-
-   inline void set_source_rectangle(int32_t x, int32_t y, int32_t width,
-                                    int32_t height) {
-      ivi_controller_surface_set_source_rectangle(this->proxy, x, y, width,
-                                                  height);
-   }
-
-   inline void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                         int32_t height) {
-      ivi_controller_surface_set_destination_rectangle(this->proxy, x, y, width,
-                                                       height);
-   }
-
-   inline void set_configuration(int32_t width, int32_t height) {
-      ivi_controller_surface_set_configuration(this->proxy, width, height);
-   }
-
-   inline void set_orientation(int32_t orientation) {
-      ivi_controller_surface_set_orientation(this->proxy, orientation);
-   }
-
-   inline void screenshot(const char *filename) {
-      ivi_controller_surface_screenshot(this->proxy, filename);
-   }
-
-   inline void send_stats() { ivi_controller_surface_send_stats(this->proxy); }
-
-   inline void destroy(int32_t destroy_scene_object) {
-      ivi_controller_surface_destroy(this->proxy, destroy_scene_object);
-   }
+   void set_visibility(uint32_t visibility);
+   void set_opacity(wl_fixed_t opacity);
+   void set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                             int32_t height);
+   void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                  int32_t height);
+   void set_configuration(int32_t width, int32_t height);
+   void set_orientation(int32_t orientation);
+   void screenshot(const char *filename);
+   void send_stats();
+   void destroy(int32_t destroy_scene_object);
 };
 
 //  _
@@ -180,58 +176,33 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
 // |_|\__,_|\__, |\___|_|
 //          |___/
 struct layer : public wayland_proxy<struct ivi_controller_layer>,
-               controlled_entity {
+               controller_child {
+   struct rect dst_rect;
+   struct rect src_rect;
+   struct size size;
+   int32_t orientation;
+   int32_t visibility;
+   float opacity;
+
+   layer(layer const &) = delete;
+   layer &operator=(layer const &) = delete;
    layer(uint32_t i, struct controller *c);
-   ~layer() override;
+   layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
 
    // Requests
-   inline void set_visibility(uint32_t visibility) {
-      ivi_controller_layer_set_visibility(this->proxy, visibility);
-   }
-
-   inline void set_opacity(wl_fixed_t opacity) {
-      ivi_controller_layer_set_opacity(this->proxy, opacity);
-   }
-
-   inline void set_source_rectangle(int32_t x, int32_t y, int32_t width,
-                                    int32_t height) {
-      ivi_controller_layer_set_source_rectangle(this->proxy, x, y, width,
-                                                height);
-   }
-
-   inline void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                         int32_t height) {
-      ivi_controller_layer_set_destination_rectangle(this->proxy, x, y, width,
-                                                     height);
-   }
-
-   inline void set_configuration(int32_t width, int32_t height) {
-      ivi_controller_layer_set_configuration(this->proxy, width, height);
-   }
-
-   inline void set_orientation(int32_t orientation) {
-      ivi_controller_layer_set_orientation(this->proxy, orientation);
-   }
-
-   inline void screenshot(const char *filename) {
-      ivi_controller_layer_screenshot(this->proxy, filename);
-   }
-
-   inline void clear_surfaces() {
-      ivi_controller_layer_clear_surfaces(this->proxy);
-   }
-
-   inline void add_surface(struct surface *surface) {
-      ivi_controller_layer_add_surface(this->proxy, surface->proxy);
-   }
-
-   inline void remove_surface(struct surface *surface) {
-      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_visibility(uint32_t visibility);
+   void set_opacity(wl_fixed_t opacity);
+   void set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                             int32_t height);
+   void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                  int32_t height);
+   void set_configuration(int32_t width, int32_t height);
+   void set_orientation(int32_t orientation);
+   void screenshot(const char *filename);
+   void clear_surfaces();
+   void add_surface(struct surface *surface);
+   void remove_surface(struct surface *surface);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //
@@ -241,8 +212,13 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 // |___/\___|_|  \___|\___|_| |_|
 //
 struct screen : public wayland_proxy<struct ivi_controller_screen>,
-                controlled_entity {
+                controller_child {
+   screen(screen const &) = delete;
+   screen &operator=(screen const &) = delete;
    screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
+   void clear();
+   void add_layer(layer *l);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //                  _             _ _
@@ -252,20 +228,47 @@ 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<uintptr_t, uint32_t> surface_proxy_to_id;
+   std::unordered_map<uintptr_t, uint32_t> layer_proxy_to_id;
+   std::unordered_map<uintptr_t, uint32_t> screen_proxy_to_id;
+
+   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_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id);
+   void remove_proxy_to_id_mapping(struct ivi_controller_surface *p);
+   void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id);
+   void remove_proxy_to_id_mapping(struct ivi_controller_layer *p);
+   void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
+   void remove_proxy_to_id_mapping(struct wl_output *p);
+
+   void add_task(char const *name,
+                 std::function<void(struct controller *)> &&f);
+   void execute_pending();
 
    controller(struct wl_registry *r, uint32_t name, uint32_t version);
-   ~controller() override;
+
+   // Requests
+   void commit_changes() const {
+      ivi_controller_commit_changes(this->proxy.get());
+   }
+   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);
    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);
+   void controller_error(int32_t object_id, int32_t object_type,
+                         int32_t error_code, char const *error_text);
 
    // surface
    void surface_visibility(uint32_t id, int32_t visibility);