X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=60a045bc3b91a81078d924b63d10ce3c20372df7;hb=88666c08dd76d09596aa9906f39d466c45d5979e;hp=44f6cb445fe719d7e785609be039223eafd1c7d6;hpb=1433d7cd8a5b2a1f6bd64c370d1cfe98d7a27d5e;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index 44f6cb4..60a045b 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -6,7 +6,7 @@
 #include "util.h"
 
 #include <functional>
-#include <map>
+#include <unordered_map>
 #include <memory>
 #include <vector>
 
@@ -39,28 +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();
-   void flush();
-   int get_fd() const;
-};
-
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -69,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();
@@ -81,6 +59,25 @@ 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();
+   bool ok() const;
+   void roundtrip();
+   int dispatch();
+   void flush();
+   int get_fd() const;
+};
+
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
 //  / _ \| | | | __| '_ \| | | | __|
@@ -88,11 +85,11 @@ struct registry : public wayland_proxy<struct wl_registry> {
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
 struct output : wayland_proxy<struct wl_output> {
-   int width;
-   int height;
-   int refresh;
+   int width{};
+   int height{};
+   int refresh{};
 
-   output(struct wl_registry *registry, uint32_t name, uint32_t version);
+   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,
@@ -127,12 +124,12 @@ struct rect {
 
 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(struct controller *c, uint32_t i) : parent(c), id(i) {}
+   virtual ~controller_child() {}
 };
 
 //                  __
@@ -142,7 +139,7 @@ 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;
@@ -154,43 +151,17 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
    ~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);
 };
 
 //  _
@@ -200,7 +171,7 @@ 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;
@@ -213,53 +184,19 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
    ~layer() override;
 
    // 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);
 };
 
 //
@@ -269,13 +206,11 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 // |___/\___|_|  \___|\___|_| |_|
 //
 struct screen : public wayland_proxy<struct ivi_controller_screen>,
-                controlled_entity {
+                controller_child {
    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 clear();
+   void add_layer(layer *l);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //                  _             _ _
@@ -285,9 +220,13 @@ 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;
@@ -295,22 +234,15 @@ struct controller : public wayland_proxy<struct ivi_controller> {
 
    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 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 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...
-      }
-   }
+   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;
@@ -325,8 +257,8 @@ struct controller : public wayland_proxy<struct ivi_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);