X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=da3cc29647bdee8ad0f4e3b537e43791ef5da37b;hb=1e4ce4dfbb457caa9452d16d76f112cff228ff69;hp=38f8946d86d2379c122d69c39997ebab4dd5ef6d;hpb=72ca2b377687ef63ad223ab1b55cf6bc3af24062;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index 38f8946..da3cc29 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -8,6 +8,7 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <vector>
 
 //                      _                 _
 // __      ____ _ _   _| | __ _ _ __   __| |     _ __  _ __ _____  ___   _
@@ -26,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<wl_proxy *>(proxy));
+         wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
       }
    }
 };
@@ -47,14 +48,17 @@ struct registry;
 //  \__,_|_|___/ .__/|_|\__,_|\__, |
 //             |_|            |___/
 struct display {
-   std::unique_ptr<wl_display, void (*)(wl_display *)> d;
-   std::unique_ptr<registry> r;
+   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;
 };
 
 //                 _     _
@@ -63,11 +67,11 @@ struct display {
 // | | |  __/ (_| | \__ \ |_| |  | |_| |
 // |_|  \___|\__, |_|___/\__|_|   \__, |
 //           |___/                |___/
-struct registry : public wayland_proxy<wl_registry> {
-   typedef std::function<void(wl_registry *, uint32_t, uint32_t)> binder;
+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;
 
-   registry(wl_display *d);
+   registry(struct wl_display *d);
    ~registry();
 
    void add_global_handler(char const *iface, binder bind);
@@ -83,8 +87,12 @@ struct registry : public wayland_proxy<wl_registry> {
 // | (_) | |_| | |_| |_) | |_| | |_
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
-struct output : wayland_proxy<wl_output> {
-   output(wl_registry *registry, uint32_t name, uint32_t version);
+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
    void geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t subpel,
@@ -108,32 +116,81 @@ struct output : wayland_proxy<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 *parent;
+   uint32_t id;
+
+   controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {}
+   virtual ~controlled_entity() {}
+};
+
 //                  __
 //  ___ _   _ _ __ / _| __ _  ___ ___
 // / __| | | | '__| |_ / _` |/ __/ _ \
 // \__ \ |_| | |  |  _| (_| | (_|  __/
 // |___/\__,_|_|  |_|  \__,_|\___\___|
 //
-struct surface : public wayland_proxy<ivi_controller_surface> {
-   uint32_t id;
+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, ivi_controller *c);
+   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);
+   }
+
+   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);
+   }
 };
 
 //  _
@@ -142,47 +199,96 @@ struct surface : public wayland_proxy<ivi_controller_surface> {
 // | | (_| | |_| |  __/ |
 // |_|\__,_|\__, |\___|_|
 //          |___/
-struct layer : public wayland_proxy<ivi_controller_layer> {
-   uint32_t id;
+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, ivi_controller *c);
+   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
-   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(struct wl_array *id_surfaces);
+   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);
+   }
+
+   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);
+   }
 };
 
 //
-// ___  ___ _ __ ___  ___ _ __
-/// __|/ __| '__/ _ \/ _ \ '_ \
-//\__ \ (__| | |  __/  __/ | | |
-//|___/\___|_|  \___|\___|_| |_|
+//  ___  ___ _ __ ___  ___ _ __
+// / __|/ __| '__/ _ \/ _ \ '_ \
+// \__ \ (__| | |  __/  __/ | | |
+// |___/\___|_|  \___|\___|_| |_|
 //
-struct screen : public wayland_proxy<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, 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);
+   }
 };
 
 //                  _             _ _
@@ -191,19 +297,78 @@ struct screen : public wayland_proxy<ivi_controller_screen> {
 // | (_| (_) | | | | |_| | | (_) | | |  __/ |
 //  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|
 //
-struct controller : public wayland_proxy<ivi_controller> {
-   std::map<uint32_t, std::unique_ptr<surface>> surfaces;
-   std::map<uint32_t, std::unique_ptr<layer>> layers;
-   std::map<uint32_t, std::unique_ptr<screen>> screens;
+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;
+
+   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(wl_registry *r, uint32_t name, uint32_t version);
+   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, 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);
 };
 }