X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=c19b0dc8b3e8fcc17286364a72cc9d852339bee8;hb=6cbdcf493969b1f819a34d087f2fa306090b76c7;hp=f8db0a6cf4d042eb9d548cd35a60ff5083f60f92;hpb=90e562cd013333084f455257edaf43c0b2258e28;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index f8db0a6..c19b0dc 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -15,36 +15,57 @@ namespace wl {
 //  \__,_|_|___/ .__/|_|\__,_|\__, |
 //             |_|            |___/
 display::display()
-   : d(std::unique_ptr<wl_display, void (*)(wl_display *)>(
-        wl_display_connect(NULL), wl_display_disconnect)),
-     r(std::make_unique<registry>(d.get())) {}
+   : d(std::unique_ptr<struct wl_display,
+                       std::function<void(struct wl_display *)>>(
+        wl_display_connect(NULL),
+        [](struct wl_display *d) {
+           logdebug("wl::display ~display @ %p", d);
+           wl_display_disconnect(d);
+        })),
+     r(!d ? nullptr : std::make_unique<struct registry>(d.get())) {}
 
-bool display::ok() const {
-   return d.get() != nullptr && wl_display_get_error(d.get()) == 0;
-}
+display::~display() {}
+
+bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
 
 void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
 
+int display::dispatch() { return wl_display_dispatch(this->d.get()); }
+
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
 // | | |  __/ (_| | \__ \ |_| |  | |_| |
 // |_|  \___|\__, |_|___/\__|_|   \__, |
 //           |___/                |___/
-registry::registry(wl_display *d) : wayland_proxy(wl_display_get_registry(d)) {
-   wl_registry_add_listener(this->proxy, &listener, this);
+namespace {
+void registry_global(void *data, struct wl_registry *r, uint32_t name,
+                     char const *iface, uint32_t v) {
+   static_cast<struct registry *>(data)->global(name, iface, v);
+}
+
+void registry_global_remove(void *data, struct wl_registry *r, uint32_t name) {
+   static_cast<struct registry *>(data)->global_remove(name);
+}
+
+constexpr struct wl_registry_listener registry_listener = {
+   registry_global, registry_global_remove};
+}
+
+registry::registry(struct wl_display *d)
+   : wayland_proxy(wl_display_get_registry(d)) {
+   wl_registry_add_listener(this->proxy, &registry_listener, this);
 }
 
 registry::~registry() {
-   wl_registry_destroy(this->proxy);
-   this->proxy = nullptr;
+   logdebug("wl::registry %s @ %p", __func__, this->proxy);
 }
 
 void registry::add_global_handler(char const *iface, binder bind) {
    this->bindings[iface] = bind;
 }
 
-void registry::event_global(uint32_t name, char const *iface, uint32_t v) {
+void registry::global(uint32_t name, char const *iface, uint32_t v) {
    auto b = this->bindings.find(iface);
    if (b != this->bindings.end())
       b->second(this->proxy, name, v);
@@ -53,19 +74,7 @@ void registry::event_global(uint32_t name, char const *iface, uint32_t v) {
                iface, v);
 }
 
-void registry::event_global_remove(uint32_t name) {}
-
-constexpr wl_registry_listener registry::listener;
-
-void registry::s_global(void *data, struct wl_registry *r, uint32_t name,
-                        char const *iface, uint32_t v) {
-   static_cast<registry *>(data)->event_global(name, iface, v);
-}
-
-void registry::s_global_remove(void *data, struct wl_registry *r,
-                               uint32_t name) {
-   static_cast<registry *>(data)->event_global_remove(name);
-}
+void registry::global_remove(uint32_t name) {}
 
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
@@ -73,53 +82,57 @@ void registry::s_global_remove(void *data, struct wl_registry *r,
 // | (_) | |_| | |_| |_) | |_| | |_
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
-output::output(wl_registry *r, uint32_t name, uint32_t v)
-   : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) {
-   wl_output_add_listener(this->proxy, &listener, this);
+namespace {
+void output_geometry(void *data, struct wl_output *wl_output, int32_t x,
+                     int32_t y, int32_t physical_width, int32_t physical_height,
+                     int32_t subpixel, const char *make, const char *model,
+                     int32_t transform) {
+   static_cast<struct output *>(data)->geometry(
+      x, y, physical_width, physical_height, subpixel, make, model, transform);
 }
 
-void output::event_geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
-                            int32_t subpel, char const *make, char const *model,
-                            int32_t tx) {
-   logdebug(
-      "wl::output @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
-      this->proxy, x, y, pw, ph, subpel, make, model, tx);
+void output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
+                 int32_t width, int32_t height, int32_t refresh) {
+   static_cast<struct output *>(data)->mode(flags, width, height, refresh);
 }
 
-void output::event_mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
-   logdebug("wl::output @ %p mode f %x w %i h %i r %i", this->proxy, flags, w,
-            h, r);
+void output_done(void *data, struct wl_output *wl_output) {
+   static_cast<struct output *>(data)->done();
 }
 
-void output::event_done() { logdebug("wl::output @ %p done", this->proxy); }
+void output_scale(void *data, struct wl_output *wl_output, int32_t factor) {
+   static_cast<struct output *>(data)->scale(factor);
+}
 
-void output::event_scale(int32_t factor) {
-   logdebug("wl::output @ %p scale %i", this->proxy, factor);
+constexpr struct wl_output_listener output_listener = {
+   output_geometry, output_mode, output_done, output_scale};
 }
 
-void output::s_geometry(void *data, struct wl_output *wl_output, int32_t x,
-                        int32_t y, int32_t physical_width,
-                        int32_t physical_height, int32_t subpixel,
-                        const char *make, const char *model,
-                        int32_t transform) {
-   static_cast<output *>(data)->event_geometry(
-      x, y, physical_width, physical_height, subpixel, make, model, transform);
+output::output(struct wl_registry *r, uint32_t name, uint32_t v)
+   : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) {
+   wl_output_add_listener(this->proxy, &output_listener, this);
 }
 
-void output::s_mode(void *data, struct wl_output *wl_output, uint32_t flags,
-                    int32_t width, int32_t height, int32_t refresh) {
-   static_cast<output *>(data)->event_mode(flags, width, height, refresh);
+void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
+                      int32_t subpel, char const *make, char const *model,
+                      int32_t tx) {
+   logdebug(
+      "wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
+      __func__, this->proxy, x, y, pw, ph, subpel, make, model, tx);
 }
 
-void output::s_done(void *data, struct wl_output *wl_output) {
-   static_cast<output *>(data)->event_done();
+void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
+   logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__, this->proxy,
+            flags, w, h, r);
 }
 
-void output::s_scale(void *data, struct wl_output *wl_output, int32_t factor) {
-   static_cast<output *>(data)->event_scale(factor);
+void output::done() {
+   logdebug("wl::output %s @ %p done", __func__, this->proxy);
 }
 
-constexpr wl_output_listener output::listener;
+void output::scale(int32_t factor) {
+   logdebug("wl::output %s @ %p f %i", __func__, this->proxy, factor);
+}
 }
 
 //  _ __   __ _ _ __ ___   ___  ___ _ __   __ _  ___ ___
@@ -141,7 +154,35 @@ namespace genivi {
 // | (_| (_) | | | | |_| | | (_) | | |  __/ |
 //  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|
 //
-controller::controller(wl_registry *r, uint32_t name, uint32_t version)
+namespace {
+void controller_screen(void *data, struct ivi_controller *ivi_controller,
+                       uint32_t id_screen,
+                       struct ivi_controller_screen *screen) {
+   static_cast<struct controller *>(data)->controller_screen(id_screen, screen);
+}
+
+void controller_layer(void *data, struct ivi_controller *ivi_controller,
+                      uint32_t id_layer) {
+   static_cast<struct controller *>(data)->controller_layer(id_layer);
+}
+
+void controller_surface(void *data, struct ivi_controller *ivi_controller,
+                        uint32_t id_surface) {
+   static_cast<struct controller *>(data)->controller_surface(id_surface);
+}
+
+void controller_error(void *data, struct ivi_controller *ivi_controller,
+                      int32_t object_id, int32_t object_type,
+                      int32_t error_code, const char *error_text) {
+   static_cast<struct controller *>(data)->controller_error(
+      object_id, object_type, error_code, error_text);
+}
+
+constexpr struct ivi_controller_listener listener = {
+   controller_screen, controller_layer, controller_surface, controller_error};
+}
+
+controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
    : wayland_proxy(
         wl_registry_bind(r, name, &ivi_controller_interface, version)) {
    ivi_controller_add_listener(this->proxy, &listener, this);
@@ -149,63 +190,103 @@ controller::controller(wl_registry *r, uint32_t name, uint32_t version)
 
 controller::~controller() {}
 
-void controller::event_screen(uint32_t id,
-                              struct ivi_controller_screen *screen) {
+void controller::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::event_layer(uint32_t id) {
+void controller::controller_layer(uint32_t id) {
    logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id);
-   this->layers[id] = std::make_unique<layer>(id, this->proxy);
+   this->layers[id] = std::make_unique<struct layer>(id, this);
 }
 
-void controller::event_surface(uint32_t id) {
+void controller::controller_surface(uint32_t id) {
    logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id);
-   this->surfaces[id] = std::make_unique<surface>(id, this->proxy);
+   this->surfaces[id] = std::make_unique<struct surface>(id, this);
 }
 
-void controller::event_error(int32_t object_id, int32_t object_type,
-                             int32_t error_code, const char *error_text) {
+void controller::controller_error(int32_t object_id, int32_t object_type,
+                                  int32_t error_code, const char *error_text) {
    logdebug("genivi::controller @ %p error o %i t %i c %i text %s", this->proxy,
             object_id, object_type, error_code, error_text);
 }
 
-void controller::s_screen(void *data, struct ivi_controller *ivi_controller,
-                          uint32_t id_screen,
-                          struct ivi_controller_screen *screen) {
-   static_cast<controller *>(data)->event_screen(id_screen, screen);
+//  _
+// | | __ _ _   _  ___ _ __
+// | |/ _` | | | |/ _ \ '__|
+// | | (_| | |_| |  __/ |
+// |_|\__,_|\__, |\___|_|
+//          |___/
+namespace {
+void layer_visibility(void *data,
+                      struct ivi_controller_layer *ivi_controller_layer,
+                      int32_t visibility) {
+   static_cast<struct layer *>(data)->parent->layer_visibility(
+      static_cast<struct layer *>(data)->id, visibility);
 }
 
-void controller::s_layer(void *data, struct ivi_controller *ivi_controller,
-                         uint32_t id_layer) {
-   static_cast<controller *>(data)->event_layer(id_layer);
+void layer_opacity(void *data,
+                   struct ivi_controller_layer *ivi_controller_layer,
+                   wl_fixed_t opacity) {
+   static_cast<struct layer *>(data)->parent->layer_opacity(
+      static_cast<struct layer *>(data)->id, wl_fixed_to_double(opacity));
 }
 
-void controller::s_surface(void *data, struct ivi_controller *ivi_controller,
-                           uint32_t id_surface) {
-   static_cast<controller *>(data)->event_surface(id_surface);
+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)->parent->layer_source_rectangle(
+      static_cast<struct layer *>(data)->id, x, y, width, height);
 }
 
-void controller::s_error(void *data, struct ivi_controller *ivi_controller,
-                         int32_t object_id, int32_t object_type,
-                         int32_t error_code, const char *error_text) {
-   static_cast<controller *>(data)->event_error(object_id, object_type,
-                                                error_code, error_text);
+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)->parent->layer_destination_rectangle(
+      static_cast<struct layer *>(data)->id, x, y, width, height);
 }
 
-constexpr ivi_controller_listener controller::listener;
+void layer_configuration(void *data,
+                         struct ivi_controller_layer *ivi_controller_layer,
+                         int32_t width, int32_t height) {
+   static_cast<struct layer *>(data)->parent->layer_configuration(
+      static_cast<struct layer *>(data)->id, width, height);
+}
 
-//  _
-// | | __ _ _   _  ___ _ __
-// | |/ _` | | | |/ _ \ '__|
-// | | (_| | |_| |  __/ |
-// |_|\__,_|\__, |\___|_|
-//          |___/
-layer::layer(uint32_t i, ivi_controller *c)
-   : wayland_proxy(ivi_controller_layer_create(c, i, 0, 0)), id(i) {
-   ivi_controller_layer_add_listener(this->proxy, &listener, this);
+void layer_orientation(void *data,
+                       struct ivi_controller_layer *ivi_controller_layer,
+                       int32_t 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)->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)->parent->layer_destroyed(
+      static_cast<struct layer *>(data)->id);
+}
+
+constexpr struct ivi_controller_layer_listener layer_listener = {
+   layer_visibility,       layer_opacity,
+   layer_source_rectangle, layer_destination_rectangle,
+   layer_configuration,    layer_orientation,
+   layer_screen,           layer_destroyed,
+};
+}
+
+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);
 }
 
 layer::~layer() {
@@ -214,101 +295,150 @@ layer::~layer() {
    this->proxy = nullptr;
 }
 
-void layer::event_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::event_opacity(wl_fixed_t opacity) {
-   logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy, opacity);
+void controller::layer_opacity(uint32_t id, float opacity) {
+   logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy, opacity);
 }
 
-void layer::event_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::event_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::event_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::event_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::event_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::event_destroyed() {
+void controller::layer_destroyed(uint32_t id) {
    logdebug("genivi::layer %s @ %p", __func__, this->proxy);
 }
 
-void layer::s_visibility(void *data,
-                         struct ivi_controller_layer *ivi_controller_layer,
-                         int32_t visibility) {
-   static_cast<layer *>(data)->event_visibility(visibility);
+//                  __
+//  ___ _   _ _ __ / _| __ _  ___ ___
+// / __| | | | '__| |_ / _` |/ __/ _ \
+// \__ \ |_| | |  |  _| (_| | (_|  __/
+// |___/\__,_|_|  |_|  \__,_|\___\___|
+//
+namespace {
+
+void surface_visibility(void *data,
+                        struct ivi_controller_surface *ivi_controller_surface,
+                        int32_t visibility) {
+   static_cast<struct surface *>(data)->parent->surface_visibility(
+      static_cast<struct surface *>(data)->id, visibility);
 }
 
-void layer::s_opacity(void *data,
-                      struct ivi_controller_layer *ivi_controller_layer,
-                      wl_fixed_t opacity) {
-   static_cast<layer *>(data)->event_opacity(opacity);
+void surface_opacity(void *data,
+                     struct ivi_controller_surface *ivi_controller_surface,
+                     wl_fixed_t opacity) {
+   static_cast<struct surface *>(data)->parent->surface_opacity(
+      static_cast<struct surface *>(data)->id, wl_fixed_to_double(opacity));
 }
 
-void layer::s_source_rectangle(
-   void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x,
+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<layer *>(data)->event_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 layer::s_destination_rectangle(
-   void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x,
+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<layer *>(data)->event_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 layer::s_configuration(void *data,
-                            struct ivi_controller_layer *ivi_controller_layer,
-                            int32_t width, int32_t height) {
-   static_cast<layer *>(data)->event_configuration(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)->parent->surface_configuration(
+      static_cast<struct surface *>(data)->id, width, height);
 }
 
-void layer::s_orientation(void *data,
-                          struct ivi_controller_layer *ivi_controller_layer,
-                          int32_t orientation) {
-   static_cast<layer *>(data)->event_orientation(orientation);
+void surface_orientation(void *data,
+                         struct ivi_controller_surface *ivi_controller_surface,
+                         int32_t orientation) {
+   static_cast<struct surface *>(data)->parent->surface_orientation(
+      static_cast<struct surface *>(data)->id, orientation);
 }
 
-void layer::s_screen(void *data,
-                     struct ivi_controller_layer *ivi_controller_layer,
-                     struct wl_output *screen) {
-   static_cast<layer *>(data)->event_screen(screen);
+void surface_pixelformat(void *data,
+                         struct ivi_controller_surface *ivi_controller_surface,
+                         int32_t pixelformat) {
+   static_cast<struct surface *>(data)->parent->surface_pixelformat(
+      static_cast<struct surface *>(data)->id, pixelformat);
 }
 
-void layer::s_destroyed(void *data,
-                        struct ivi_controller_layer *ivi_controller_layer) {
-   static_cast<layer *>(data)->event_destroyed();
+void surface_layer(void *data,
+                   struct ivi_controller_surface *ivi_controller_surface,
+                   struct ivi_controller_layer *layer) {
+   static_cast<struct surface *>(data)->parent->surface_layer(
+      static_cast<struct surface *>(data)->id, layer);
 }
 
-constexpr ivi_controller_layer_listener layer::listener;
+void surface_stats(void *data,
+                   struct ivi_controller_surface *ivi_controller_surface,
+                   uint32_t redraw_count, uint32_t frame_count,
+                   uint32_t update_count, uint32_t pid,
+                   const char *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);
+}
 
-//                  __
-//  ___ _   _ _ __ / _| __ _  ___ ___
-// / __| | | | '__| |_ / _` |/ __/ _ \
-// \__ \ |_| | |  |  _| (_| | (_|  __/
-// |___/\__,_|_|  |_|  \__,_|\___\___|
-//
-surface::surface(uint32_t i, ivi_controller *c)
-   : wayland_proxy(ivi_controller_surface_create(c, i)), id(i) {
-   ivi_controller_surface_add_listener(this->proxy, &listener, this);
+void surface_destroyed(void *data,
+                       struct ivi_controller_surface *ivi_controller_surface) {
+   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)->parent->surface_content(
+      static_cast<struct surface *>(data)->id, content_state);
+}
+
+constexpr struct ivi_controller_surface_listener surface_listener = {
+   surface_visibility,
+   surface_opacity,
+   surface_source_rectangle,
+   surface_destination_rectangle,
+   surface_configuration,
+   surface_orientation,
+   surface_pixelformat,
+   surface_layer,
+   surface_stats,
+   surface_destroyed,
+   surface_content,
+};
+}
+
+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);
 }
 
 surface::~surface() {
@@ -317,137 +447,70 @@ surface::~surface() {
    this->proxy = nullptr;
 }
 
-void surface::event_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::event_opacity(wl_fixed_t opacity) {
-   logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy, opacity);
+void controller::surface_opacity(uint32_t id, float opacity) {
+   logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
 }
 
-void surface::event_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::event_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::event_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::event_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::event_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::event_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::event_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::event_destroyed() {
+void controller::surface_destroyed(uint32_t id) {
    logdebug("genivi::surface %s @ %p", __func__, this->proxy);
 }
 
-void surface::event_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);
 }
 
-void surface::s_visibility(
-   void *data, struct ivi_controller_surface *ivi_controller_surface,
-   int32_t visibility) {
-   static_cast<surface *>(data)->event_visibility(visibility);
-}
-
-void surface::s_opacity(void *data,
-                        struct ivi_controller_surface *ivi_controller_surface,
-                        wl_fixed_t opacity) {
-   static_cast<surface *>(data)->event_opacity(opacity);
-}
-
-void surface::s_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<surface *>(data)->event_source_rectangle(x, y, width, height);
-}
-
-void surface::s_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<surface *>(data)->event_destination_rectangle(x, y, width,
-                                                             height);
-}
-
-void surface::s_configuration(
-   void *data, struct ivi_controller_surface *ivi_controller_surface,
-   int32_t width, int32_t height) {
-   static_cast<surface *>(data)->event_configuration(width, height);
-}
-
-void surface::s_orientation(
-   void *data, struct ivi_controller_surface *ivi_controller_surface,
-   int32_t orientation) {
-   static_cast<surface *>(data)->event_orientation(orientation);
-}
-
-void surface::s_pixelformat(
-   void *data, struct ivi_controller_surface *ivi_controller_surface,
-   int32_t pixelformat) {
-   static_cast<surface *>(data)->event_pixelformat(pixelformat);
-}
-
-void surface::s_layer(void *data,
-                      struct ivi_controller_surface *ivi_controller_surface,
-                      struct ivi_controller_layer *layer) {
-   static_cast<surface *>(data)->event_layer(layer);
-}
-
-void surface::s_stats(void *data,
-                      struct ivi_controller_surface *ivi_controller_surface,
-                      uint32_t redraw_count, uint32_t frame_count,
-                      uint32_t update_count, uint32_t pid,
-                      const char *process_name) {
-   static_cast<surface *>(data)->event_stats(redraw_count, frame_count,
-                                             update_count, pid, process_name);
-}
-
-void surface::s_destroyed(
-   void *data, struct ivi_controller_surface *ivi_controller_surface) {
-   static_cast<surface *>(data)->event_destroyed();
-}
-
-void surface::s_content(void *data,
-                        struct ivi_controller_surface *ivi_controller_surface,
-                        int32_t content_state) {
-   static_cast<surface *>(data)->event_content(content_state);
-}
-
-constexpr ivi_controller_surface_listener surface::listener;
-
 //
-// ___  ___ _ __ ___  ___ _ __
-/// __|/ __| '__/ _ \/ _ \ '_ \
-//\__ \ (__| | |  __/  __/ | | |
-//|___/\___|_|  \___|\___|_| |_|
+//  ___  ___ _ __ ___  ___ _ __
+// / __|/ __| '__/ _ \/ _ \ '_ \
+// \__ \ (__| | |  __/  __/ | | |
+// |___/\___|_|  \___|\___|_| |_|
 //
-screen::screen(uint32_t i, 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) {}
 }