wayland: refactored genivi object events

Events are now delivered to surface_* and layer_* methods of the
controller. The genivi object wrappers still are needed to hold wl_proxy
objects, their id and a reference/pointer to the controller.

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

diff --git a/src/wayland.cpp b/src/wayland.cpp
index fef0cc3..c2f55fa 100644 (file)
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -26,9 +26,7 @@ display::display()
 
 display::~display() {}
 
-bool display::ok() const {
-   return d && wl_display_get_error(d.get()) == 0;
-}
+bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
 
 void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
 
@@ -195,17 +193,17 @@ controller::~controller() {}
 void controller::screen(uint32_t id, struct ivi_controller_screen *screen) {
    logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy, id, id,
             screen);
-   this->screens[id] = std::make_unique<struct screen>(id, screen);
+   this->screens[id] = std::make_unique<struct screen>(id, this, screen);
 }
 
 void controller::layer(uint32_t id) {
    logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id);
-   this->layers[id] = std::make_unique<struct layer>(id, this->proxy);
+   this->layers[id] = std::make_unique<struct layer>(id, this);
 }
 
 void controller::surface(uint32_t id) {
    logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id);
-   this->surfaces[id] = std::make_unique<struct surface>(id, this->proxy);
+   this->surfaces[id] = std::make_unique<struct surface>(id, this);
 }
 
 void controller::error(int32_t object_id, int32_t object_type,
@@ -224,49 +222,56 @@ namespace {
 void layer_visibility(void *data,
                       struct ivi_controller_layer *ivi_controller_layer,
                       int32_t visibility) {
-   static_cast<struct layer *>(data)->visibility(visibility);
+   static_cast<struct layer *>(data)->parent->layer_visibility(
+      static_cast<struct layer *>(data)->id, visibility);
 }
 
 void layer_opacity(void *data,
                    struct ivi_controller_layer *ivi_controller_layer,
                    wl_fixed_t opacity) {
-   static_cast<struct layer *>(data)->opacity(wl_fixed_to_double(opacity));
+   static_cast<struct layer *>(data)->parent->layer_opacity(
+      static_cast<struct layer *>(data)->id, wl_fixed_to_double(opacity));
 }
 
 void layer_source_rectangle(void *data,
                             struct ivi_controller_layer *ivi_controller_layer,
                             int32_t x, int32_t y, int32_t width,
                             int32_t height) {
-   static_cast<struct layer *>(data)->source_rectangle(x, y, width, height);
+   static_cast<struct layer *>(data)->parent->layer_source_rectangle(
+      static_cast<struct layer *>(data)->id, x, y, width, height);
 }
 
 void layer_destination_rectangle(
    void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x,
    int32_t y, int32_t width, int32_t height) {
-   static_cast<struct layer *>(data)->destination_rectangle(x, y, width,
-                                                            height);
+   static_cast<struct layer *>(data)->parent->layer_destination_rectangle(
+      static_cast<struct layer *>(data)->id, x, y, width, height);
 }
 
 void layer_configuration(void *data,
                          struct ivi_controller_layer *ivi_controller_layer,
                          int32_t width, int32_t height) {
-   static_cast<struct layer *>(data)->configuration(width, height);
+   static_cast<struct layer *>(data)->parent->layer_configuration(
+      static_cast<struct layer *>(data)->id, width, height);
 }
 
 void layer_orientation(void *data,
                        struct ivi_controller_layer *ivi_controller_layer,
                        int32_t orientation) {
-   static_cast<struct layer *>(data)->orientation(orientation);
+   static_cast<struct layer *>(data)->parent->layer_orientation(
+      static_cast<struct layer *>(data)->id, orientation);
 }
 
 void layer_screen(void *data, struct ivi_controller_layer *ivi_controller_layer,
                   struct wl_output *screen) {
-   static_cast<struct layer *>(data)->screen(screen);
+   static_cast<struct layer *>(data)->parent->layer_screen(
+      static_cast<struct layer *>(data)->id, screen);
 }
 
 void layer_destroyed(void *data,
                      struct ivi_controller_layer *ivi_controller_layer) {
-   static_cast<struct layer *>(data)->destroyed();
+   static_cast<struct layer *>(data)->parent->layer_destroyed(
+      static_cast<struct layer *>(data)->id);
 }
 
 constexpr struct ivi_controller_layer_listener layer_listener = {
@@ -277,8 +282,9 @@ constexpr struct ivi_controller_layer_listener layer_listener = {
 };
 }
 
-layer::layer(uint32_t i, struct ivi_controller *c)
-   : wayland_proxy(ivi_controller_layer_create(c, i, 0, 0)), id(i) {
+layer::layer(uint32_t i, struct controller *c)
+   : wayland_proxy(ivi_controller_layer_create(c->proxy, i, 0, 0)),
+     controlled_entity(c, i) {
    ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
 }
 
@@ -288,40 +294,41 @@ layer::~layer() {
    this->proxy = nullptr;
 }
 
-void layer::visibility(int32_t visibility) {
+void controller::layer_visibility(uint32_t id, int32_t visibility) {
    logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy, visibility);
 }
 
-void layer::opacity(float opacity) {
+void controller::layer_opacity(uint32_t id, float opacity) {
    logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy, opacity);
 }
 
-void layer::source_rectangle(int32_t x, int32_t y, int32_t width,
-                             int32_t height) {
+void controller::layer_source_rectangle(uint32_t id, int32_t x, int32_t y,
+                                        int32_t width, int32_t height) {
    logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, this->proxy,
             x, y, width, height);
 }
 
-void layer::destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                  int32_t height) {
+void controller::layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+                                             int32_t width, int32_t height) {
    logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, this->proxy,
             x, y, width, height);
 }
 
-void layer::configuration(int32_t width, int32_t height) {
+void controller::layer_configuration(uint32_t id, int32_t width,
+                                     int32_t height) {
    logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy, width,
             height);
 }
 
-void layer::orientation(int32_t orientation) {
+void controller::layer_orientation(uint32_t id, int32_t orientation) {
    logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy, orientation);
 }
 
-void layer::screen(struct wl_output *screen) {
+void controller::layer_screen(uint32_t id, struct wl_output *screen) {
    logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen);
 }
 
-void layer::destroyed() {
+void controller::layer_destroyed(uint32_t id) {
    logdebug("genivi::layer %s @ %p", __func__, this->proxy);
 }
 
@@ -336,50 +343,57 @@ namespace {
 void surface_visibility(void *data,
                         struct ivi_controller_surface *ivi_controller_surface,
                         int32_t visibility) {
-   static_cast<struct surface *>(data)->visibility(visibility);
+   static_cast<struct surface *>(data)->parent->surface_visibility(
+      static_cast<struct surface *>(data)->id, visibility);
 }
 
 void surface_opacity(void *data,
                      struct ivi_controller_surface *ivi_controller_surface,
                      wl_fixed_t opacity) {
-   static_cast<struct surface *>(data)->opacity(wl_fixed_to_double(opacity));
+   static_cast<struct surface *>(data)->parent->surface_opacity(
+      static_cast<struct surface *>(data)->id, wl_fixed_to_double(opacity));
 }
 
 void surface_source_rectangle(
    void *data, struct ivi_controller_surface *ivi_controller_surface, int32_t x,
    int32_t y, int32_t width, int32_t height) {
-   static_cast<struct surface *>(data)->source_rectangle(x, y, width, height);
+   static_cast<struct surface *>(data)->parent->surface_source_rectangle(
+      static_cast<struct surface *>(data)->id, x, y, width, height);
 }
 
 void surface_destination_rectangle(
    void *data, struct ivi_controller_surface *ivi_controller_surface, int32_t x,
    int32_t y, int32_t width, int32_t height) {
-   static_cast<struct surface *>(data)->destination_rectangle(x, y, width,
-                                                              height);
+   static_cast<struct surface *>(data)->parent->surface_destination_rectangle(
+      static_cast<struct surface *>(data)->id, x, y, width, height);
 }
 
 void surface_configuration(
    void *data, struct ivi_controller_surface *ivi_controller_surface,
    int32_t width, int32_t height) {
-   static_cast<struct surface *>(data)->configuration(width, height);
+   static_cast<struct surface *>(data)->parent->surface_configuration(
+      static_cast<struct surface *>(data)->id, width, height);
 }
 
 void surface_orientation(void *data,
                          struct ivi_controller_surface *ivi_controller_surface,
                          int32_t orientation) {
-   static_cast<struct surface *>(data)->orientation(orientation);
+   static_cast<struct surface *>(data)->parent->surface_orientation(
+      static_cast<struct surface *>(data)->id, orientation);
 }
 
 void surface_pixelformat(void *data,
                          struct ivi_controller_surface *ivi_controller_surface,
                          int32_t pixelformat) {
-   static_cast<struct surface *>(data)->pixelformat(pixelformat);
+   static_cast<struct surface *>(data)->parent->surface_pixelformat(
+      static_cast<struct surface *>(data)->id, pixelformat);
 }
 
 void surface_layer(void *data,
                    struct ivi_controller_surface *ivi_controller_surface,
                    struct ivi_controller_layer *layer) {
-   static_cast<struct surface *>(data)->layer(layer);
+   static_cast<struct surface *>(data)->parent->surface_layer(
+      static_cast<struct surface *>(data)->id, layer);
 }
 
 void surface_stats(void *data,
@@ -387,19 +401,22 @@ void surface_stats(void *data,
                    uint32_t redraw_count, uint32_t frame_count,
                    uint32_t update_count, uint32_t pid,
                    const char *process_name) {
-   static_cast<struct surface *>(data)->stats(redraw_count, frame_count,
-                                              update_count, pid, process_name);
+   static_cast<struct surface *>(data)->parent->surface_stats(
+      static_cast<struct surface *>(data)->id, redraw_count, frame_count,
+      update_count, pid, process_name);
 }
 
 void surface_destroyed(void *data,
                        struct ivi_controller_surface *ivi_controller_surface) {
-   static_cast<struct surface *>(data)->destroyed();
+   static_cast<struct surface *>(data)->parent->surface_destroyed(
+      static_cast<struct surface *>(data)->id);
 }
 
 void surface_content(void *data,
                      struct ivi_controller_surface *ivi_controller_surface,
                      int32_t content_state) {
-   static_cast<struct surface *>(data)->content(content_state);
+   static_cast<struct surface *>(data)->parent->surface_content(
+      static_cast<struct surface *>(data)->id, content_state);
 }
 
 constexpr struct ivi_controller_surface_listener surface_listener = {
@@ -417,8 +434,9 @@ constexpr struct ivi_controller_surface_listener surface_listener = {
 };
 }
 
-surface::surface(uint32_t i, struct ivi_controller *c)
-   : wayland_proxy(ivi_controller_surface_create(c, i)), id(i) {
+surface::surface(uint32_t i, struct controller *c)
+   : wayland_proxy(ivi_controller_surface_create(c->proxy, i)),
+     controlled_entity(c, i) {
    ivi_controller_surface_add_listener(this->proxy, &surface_listener, this);
 }
 
@@ -428,56 +446,59 @@ surface::~surface() {
    this->proxy = nullptr;
 }
 
-void surface::visibility(int32_t visibility) {
+void controller::surface_visibility(uint32_t id, int32_t visibility) {
    logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility);
 }
 
-void surface::opacity(float opacity) {
+void controller::surface_opacity(uint32_t id, float opacity) {
    logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
 }
 
-void surface::source_rectangle(int32_t x, int32_t y, int32_t width,
-                               int32_t height) {
+void controller::surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
+                                          int32_t width, int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy, x, y, width, height);
 }
 
-void surface::destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                    int32_t height) {
+void controller::surface_destination_rectangle(uint32_t id, int32_t x,
+                                               int32_t y, int32_t width,
+                                               int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy, x, y, width, height);
 }
 
-void surface::configuration(int32_t width, int32_t height) {
+void controller::surface_configuration(uint32_t id, int32_t width,
+                                       int32_t height) {
    logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy, width,
             height);
 }
 
-void surface::orientation(int32_t orientation) {
+void controller::surface_orientation(uint32_t id, int32_t orientation) {
    logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy, orientation);
 }
 
-void surface::pixelformat(int32_t pixelformat) {
+void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
    logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat);
 }
 
-void surface::layer(struct ivi_controller_layer *layer) {
+void controller::surface_layer(uint32_t id,
+                               struct ivi_controller_layer *layer) {
    logdebug("genivi::surface %s @ %p l @ %p", __func__, this->proxy, layer);
 }
 
-void surface::stats(uint32_t redraw_count, uint32_t frame_count,
-                    uint32_t update_count, uint32_t pid,
-                    const char *process_name) {
+void controller::surface_stats(uint32_t id, uint32_t redraw_count,
+                               uint32_t frame_count, uint32_t update_count,
+                               uint32_t pid, const char *process_name) {
    logdebug("genivi::surface %s @ %p r %u f %u u %u pid %u p %s", __func__,
             this->proxy, redraw_count, frame_count, update_count, pid,
             process_name);
 }
 
-void surface::destroyed() {
+void controller::surface_destroyed(uint32_t id) {
    logdebug("genivi::surface %s @ %p", __func__, this->proxy);
 }
 
-void surface::content(int32_t content_state) {
+void controller::surface_content(uint32_t id, int32_t content_state) {
    logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy,
             content_state);
 }
@@ -488,6 +509,7 @@ void surface::content(int32_t content_state) {
 // \__ \ (__| | |  __/  __/ | | |
 // |___/\___|_|  \___|\___|_| |_|
 //
-screen::screen(uint32_t i, struct ivi_controller_screen *p)
-   : wayland_proxy(p), id(i) {}
+screen::screen(uint32_t i, struct controller *c,
+               struct ivi_controller_screen *p)
+   : wayland_proxy(p), controlled_entity(c, i) {}
 }

diff --git a/src/wayland.hpp b/src/wayland.hpp
index da01eb3..889b722 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -150,6 +150,16 @@ struct notifier {
 };
 }
 
+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() {}
+};
+
 //                  __
 //  ___ _   _ _ __ / _| __ _  ___ ___
 // / __| | | | '__| |_ / _` |/ __/ _ \
@@ -157,27 +167,10 @@ 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 {
+   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 +218,10 @@ 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 {
+   layer(uint32_t i, 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 +278,9 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 // \__ \ (__| | |  __/  __/ | | |
 // |___/\___|_|  \___|\___|_| |_|
 //
-struct screen : public wayland_proxy<struct ivi_controller_screen> {
-   uint32_t id;
-
-   screen(uint32_t i, struct ivi_controller_screen *p);
+struct screen : public wayland_proxy<struct ivi_controller_screen>,
+                controlled_entity {
+   screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
 };
 
 //                  _             _ _
@@ -319,10 +298,40 @@ struct controller : public wayland_proxy<struct ivi_controller> {
    ~controller() override;
 
    // 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);
+
+   // 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);
 };
 }