X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=05e155f4d1e72de27ea8f7db644a3cf4e393d97a;hb=04a5bb45e7c6d3e713c49ce2125173a8b7e46b5b;hp=e22f4a64210346a1ad6f61da27fd5b522d6ee445;hpb=c6ee1ca3e0dc167fb529822c343843c4a16d785e;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index e22f4a6..05e155f 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <utility>
+
+#include "util.hpp"
 #include "wayland.hpp"
 
 //                                                                  _
@@ -15,16 +34,9 @@ namespace wl {
 //  \__,_|_|___/ .__/|_|\__,_|\__, |
 //             |_|            |___/
 display::display()
-   : 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())) {}
-
-display::~display() {}
+   : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
+        wl_display_connect(nullptr), &wl_display_disconnect)),
+     r(d.get()) {}
 
 bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
 
@@ -32,10 +44,35 @@ void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
 
 int display::dispatch() { return wl_display_dispatch(this->d.get()); }
 
+int display::dispatch_pending() { return wl_display_dispatch_pending(this->d.get()); }
+
+int display::read_events() {
+   ST();
+   // XXX: uhm, how?!
+   while (wl_display_prepare_read(this->d.get()) == -1) {
+      STN(pending_events_dispatch);
+      if (wl_display_dispatch_pending(this->d.get()) == -1) {
+         return -1;
+      }
+   }
+
+   if (wl_display_flush(this->d.get()) == -1) {
+      return -1;
+   }
+
+   if (wl_display_read_events(this->d.get()) == -1) {
+      wl_display_cancel_read(this->d.get());
+   }
+
+   return 0;
+}
+
 void display::flush() { wl_display_flush(this->d.get()); }
 
 int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
 
+int display::get_error() { return wl_display_get_error(this->d.get()); }
+
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -43,43 +80,41 @@ int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
 // |_|  \___|\__, |_|___/\__|_|   \__, |
 //           |___/                |___/
 namespace {
-void registry_global(void *data, struct wl_registry *r, uint32_t name,
+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) {
+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};
-}
+}  // namespace
 
 registry::registry(struct wl_display *d)
-   : wayland_proxy(!d ? nullptr : wl_display_get_registry(d)) {
-   if (this->proxy)
-      wl_registry_add_listener(this->proxy, &registry_listener, this);
-}
-
-registry::~registry() {
-   logdebug("wl::registry %s @ %p", __func__, this->proxy);
+   : wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) {
+   if (this->proxy != nullptr) {
+      wl_registry_add_listener(this->proxy.get(), &registry_listener, this);
+   }
 }
 
 void registry::add_global_handler(char const *iface, binder bind) {
-   this->bindings[iface] = bind;
+   this->bindings[iface] = std::move(bind);
 }
 
 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);
-   else
-      logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name,
-               iface, v);
+   if (b != this->bindings.end()) {
+      b->second(this->proxy.get(), name, v);
+   }
+   logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy.get(), name,
+            iface, v);
 }
 
-void registry::global_remove(uint32_t name) {}
+void registry::global_remove(uint32_t /*name*/) {}
 
 //              _               _
 //   ___  _   _| |_ _ __  _   _| |_
@@ -88,7 +123,7 @@ void registry::global_remove(uint32_t name) {}
 //  \___/ \__,_|\__| .__/ \__,_|\__|
 //                 |_|
 namespace {
-void output_geometry(void *data, struct wl_output *wl_output, int32_t x,
+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) {
@@ -96,26 +131,27 @@ void output_geometry(void *data, struct wl_output *wl_output, int32_t x,
       x, y, physical_width, physical_height, subpixel, make, model, transform);
 }
 
-void output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
+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_done(void *data, struct wl_output *wl_output) {
+void output_done(void *data, struct wl_output * /*wl_output*/) {
    static_cast<struct output *>(data)->done();
 }
 
-void output_scale(void *data, struct wl_output *wl_output, int32_t factor) {
+void output_scale(void *data, struct wl_output * /*wl_output*/,
+                  int32_t factor) {
    static_cast<struct output *>(data)->scale(factor);
 }
 
 constexpr struct wl_output_listener output_listener = {
    output_geometry, output_mode, output_done, output_scale};
-}
+}  // namespace
 
 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);
+   wl_output_add_listener(this->proxy.get(), &output_listener, this);
 }
 
 void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
@@ -123,13 +159,14 @@ void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
                       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);
+      __func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx);
+   this->transform = tx;
 }
 
 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);
-   if (flags & WL_OUTPUT_MODE_CURRENT) {
+   logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__,
+            this->proxy.get(), flags, w, h, r);
+   if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) {
       this->width = w;
       this->height = h;
       this->refresh = r;
@@ -137,13 +174,18 @@ void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
 }
 
 void output::done() {
-   logdebug("wl::output %s @ %p done", __func__, this->proxy);
+   logdebug("wl::output %s @ %p done", __func__, this->proxy.get());
+   // Let's just disregard the flipped ones...
+   if (this->transform == WL_OUTPUT_TRANSFORM_90 ||
+       this->transform == WL_OUTPUT_TRANSFORM_270) {
+      std::swap(this->width, this->height);
+   }
 }
 
 void output::scale(int32_t factor) {
-   logdebug("wl::output %s @ %p f %i", __func__, this->proxy, factor);
-}
+   logdebug("wl::output %s @ %p f %i", __func__, this->proxy.get(), factor);
 }
+}  // namespace wl
 
 //  _ __   __ _ _ __ ___   ___  ___ _ __   __ _  ___ ___
 // | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \
@@ -165,23 +207,23 @@ namespace genivi {
 //  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|
 //
 namespace {
-void controller_screen(void *data, struct ivi_controller *ivi_controller,
+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,
+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,
+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,
+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(
@@ -190,50 +232,53 @@ void controller_error(void *data, struct ivi_controller *ivi_controller,
 
 constexpr struct ivi_controller_listener listener = {
    controller_screen, controller_layer, controller_surface, controller_error};
-}
+}  // namespace
 
 controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
    : wayland_proxy(
         wl_registry_bind(r, name, &ivi_controller_interface, version)),
-     surfaces{},
-     layers{},
-     screens{},
-     pending{},
      output_size{} {
-   ivi_controller_add_listener(this->proxy, &listener, this);
+   ivi_controller_add_listener(this->proxy.get(), &listener, this);
 }
 
-controller::~controller() {}
-
 void controller::layer_create(uint32_t id, int32_t w, int32_t h) {
-   this->layers[id] = std::make_unique<layer>(id, w, h, this);
+   this->layers[id] = std::make_unique<struct layer>(id, w, h, this);
 }
 
 void controller::surface_create(uint32_t id) {
-   this->surfaces[id] = std::make_unique<surface>(id, this);
+   this->surfaces[id] = std::make_unique<struct surface>(id, this);
 }
 
 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);
+   logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy.get(),
+            id, id, screen);
    this->screens[id] = std::make_unique<struct screen>(id, this, screen);
 }
 
 void controller::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);
+   logdebug("genivi::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
+   if (this->layers.find(id) != this->layers.end()) {
+      logerror("Someone created a layer without asking US! (%d)", id);
+   } else {
+      auto &l = this->layers[id] = std::make_unique<struct layer>(id, this);
+      l->clear_surfaces();
+   }
 }
 
 void controller::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);
+   logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
+            id);
+   if (this->surfaces.find(id) == this->surfaces.end()) {
+      this->surfaces[id] = std::make_unique<struct surface>(id, this);
+      this->chooks->surface_created(id);
+   }
 }
 
 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);
+   logdebug("genivi::controller @ %p error o %i t %i c %i text %s",
+            this->proxy.get(), object_id, object_type, error_code, error_text);
 }
 
 //  _
@@ -244,58 +289,58 @@ void controller::controller_error(int32_t object_id, int32_t object_type,
 //          |___/
 namespace {
 void layer_visibility(void *data,
-                      struct ivi_controller_layer *ivi_controller_layer,
+                      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);
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_visibility(l, visibility);
 }
 
 void layer_opacity(void *data,
-                   struct ivi_controller_layer *ivi_controller_layer,
+                   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));
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_opacity(l, float(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)->parent->layer_source_rectangle(
-      static_cast<struct layer *>(data)->id, x, y, width, height);
+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) {
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_source_rectangle(l, 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)->parent->layer_destination_rectangle(
-      static_cast<struct layer *>(data)->id, x, y, width, height);
+   void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
+   int32_t x, int32_t y, int32_t width, int32_t height) {
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_destination_rectangle(l, x, y, width, height);
 }
 
 void layer_configuration(void *data,
-                         struct ivi_controller_layer *ivi_controller_layer,
+                         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);
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_configuration(l, width, height);
 }
 
 void layer_orientation(void *data,
-                       struct ivi_controller_layer *ivi_controller_layer,
+                       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);
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_orientation(l, orientation);
 }
 
-void layer_screen(void *data, struct ivi_controller_layer *ivi_controller_layer,
+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);
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_screen(l, 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);
+                     struct ivi_controller_layer * /*ivi_controller_layer*/) {
+   auto l = static_cast<struct layer *>(data);
+   l->parent->layer_destroyed(l);
 }
 
 constexpr struct ivi_controller_layer_listener layer_listener = {
@@ -304,64 +349,120 @@ constexpr struct ivi_controller_layer_listener layer_listener = {
    layer_configuration,    layer_orientation,
    layer_screen,           layer_destroyed,
 };
-}
+}  // namespace
 
 layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {}
 
 layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c)
-   : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)),
-     controlled_entity(c, i) {
-   ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
+   : wayland_proxy(ivi_controller_layer_create(c->proxy.get(), i, w, h),
+                   [c, i](ivi_controller_layer *l) {
+                      logdebug("~layer layer %i @ %p", i, l);
+                      c->remove_proxy_to_id_mapping(l);
+                      ivi_controller_layer_destroy(l, 1);
+                   }),
+     controller_child(c, i) {
+   this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
+   ivi_controller_layer_add_listener(this->proxy.get(), &layer_listener, this);
+}
+
+void layer::set_visibility(uint32_t visibility) {
+   ivi_controller_layer_set_visibility(this->proxy.get(), visibility);
+}
+
+void layer::set_opacity(wl_fixed_t opacity) {
+   ivi_controller_layer_set_opacity(this->proxy.get(), opacity);
+}
+
+void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                                 int32_t height) {
+   ivi_controller_layer_set_source_rectangle(this->proxy.get(), x, y, width,
+                                             height);
+}
+
+void layer::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                      int32_t height) {
+   ivi_controller_layer_set_destination_rectangle(this->proxy.get(), x, y,
+                                                  width, height);
+}
+
+void layer::set_configuration(int32_t width, int32_t height) {
+   ivi_controller_layer_set_configuration(this->proxy.get(), width, height);
+}
+
+void layer::set_orientation(int32_t orientation) {
+   ivi_controller_layer_set_orientation(this->proxy.get(), orientation);
+}
+
+void layer::screenshot(const char *filename) {
+   ivi_controller_layer_screenshot(this->proxy.get(), filename);
 }
 
-layer::~layer() {
-   logdebug("%s layer %i @ %p", __func__, this->id, this->proxy);
-   ivi_controller_layer_destroy(this->proxy, 1);
-   this->proxy = nullptr;
+void layer::clear_surfaces() {
+   ivi_controller_layer_clear_surfaces(this->proxy.get());
 }
 
-void controller::layer_visibility(uint32_t id, int32_t visibility) {
-   logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy, visibility);
-   this->layers[id]->visibility = visibility;
+void layer::add_surface(struct surface *surface) {
+   ivi_controller_layer_add_surface(this->proxy.get(), surface->proxy.get());
 }
 
-void controller::layer_opacity(uint32_t id, float opacity) {
-   logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy, opacity);
-   this->layers[id]->opacity = opacity;
+void layer::remove_surface(struct surface *surface) {
+   ivi_controller_layer_remove_surface(this->proxy.get(), surface->proxy.get());
 }
 
-void controller::layer_source_rectangle(uint32_t id, int32_t x, int32_t y,
+void layer::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.get(), &wlro);
+}
+
+void controller::layer_visibility(struct layer *l, int32_t visibility) {
+   logdebug("genivi::layer %s @ %d v %i", __func__, l->id, visibility);
+   this->lprops[l->id].visibility = visibility;
+}
+
+void controller::layer_opacity(struct layer *l, float opacity) {
+   logdebug("genivi::layer %s @ %d o %f", __func__, l->id, opacity);
+   this->lprops[l->id].opacity = opacity;
+}
+
+void controller::layer_source_rectangle(struct layer *l, 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);
-   this->layers[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   logdebug("genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+            l->id, x, y, width, height);
+   this->lprops[l->id].src_rect = rect{width, height, x, y};
 }
 
-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);
-   this->layers[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+void controller::layer_destination_rectangle(struct layer *l, int32_t x,
+                                             int32_t y, int32_t width,
+                                             int32_t height) {
+   logdebug("genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+            l->id, x, y, width, height);
+   this->lprops[l->id].dst_rect = rect{width, height, x, y};
 }
 
-void controller::layer_configuration(uint32_t id, int32_t width,
+void controller::layer_configuration(struct layer *l, int32_t width,
                                      int32_t height) {
-   logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy, width,
-            height);
-   this->layers[id]->size = size{uint32_t(width), uint32_t(height)};
+   logdebug("genivi::layer %s @ %d w %i h %i", __func__, l->id,
+            width, height);
+   this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
 }
 
-void controller::layer_orientation(uint32_t id, int32_t orientation) {
-   logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy, orientation);
-   this->layers[id]->orientation = orientation;
+void controller::layer_orientation(struct layer *l, int32_t orientation) {
+   logdebug("genivi::layer %s @ %d o %i", __func__, l->id,
+            orientation);
+   this->lprops[l->id].orientation = orientation;
 }
 
-void controller::layer_screen(uint32_t id, struct wl_output *screen) {
-   logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen);
+void controller::layer_screen(struct layer *l, struct wl_output *screen) {
+   logdebug("genivi::layer %s @ %d s %p", __func__, l->id, screen);
 }
 
-void controller::layer_destroyed(uint32_t id) {
-   logdebug("genivi::layer %s @ %p", __func__, this->proxy);
+void controller::layer_destroyed(struct layer *l) {
+   logdebug("genivi::layer %s @ %d", __func__, l->id);
+   this->lprops.erase(l->id);
+   this->layers.erase(l->id);
 }
 
 //                  __
@@ -372,83 +473,83 @@ void controller::layer_destroyed(uint32_t id) {
 //
 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 surface_visibility(
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
+   int32_t visibility) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_visibility(s, visibility);
 }
 
 void surface_opacity(void *data,
-                     struct ivi_controller_surface *ivi_controller_surface,
+                     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));
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_opacity(s, float(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)->parent->surface_source_rectangle(
-      static_cast<struct surface *>(data)->id, x, y, width, height);
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
+   int32_t x, int32_t y, int32_t width, int32_t height) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_source_rectangle(s, 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)->parent->surface_destination_rectangle(
-      static_cast<struct surface *>(data)->id, x, y, width, height);
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
+   int32_t x, int32_t y, int32_t width, int32_t height) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_destination_rectangle(s, x, y, width, height);
 }
 
 void surface_configuration(
-   void *data, struct ivi_controller_surface *ivi_controller_surface,
+   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);
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_configuration(s, width, height);
 }
 
-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 surface_orientation(
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
+   int32_t orientation) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_orientation(s, orientation);
 }
 
-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 surface_pixelformat(
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
+   int32_t pixelformat) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_pixelformat(s, pixelformat);
 }
 
 void surface_layer(void *data,
-                   struct ivi_controller_surface *ivi_controller_surface,
+                   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);
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_layer(s, layer);
 }
 
 void surface_stats(void *data,
-                   struct ivi_controller_surface *ivi_controller_surface,
+                   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);
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_stats(s, 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)->parent->surface_destroyed(
-      static_cast<struct surface *>(data)->id);
+void surface_destroyed(
+   void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) {
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_destroyed(s);
 }
 
 void surface_content(void *data,
-                     struct ivi_controller_surface *ivi_controller_surface,
+                     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);
+   auto s = static_cast<struct surface *>(data);
+   s->parent->surface_content(s, content_state);
 }
 
 constexpr struct ivi_controller_surface_listener surface_listener = {
@@ -464,104 +565,177 @@ constexpr struct ivi_controller_surface_listener surface_listener = {
    surface_destroyed,
    surface_content,
 };
-}
+}  // namespace
 
 surface::surface(uint32_t i, struct controller *c)
-   : wayland_proxy(ivi_controller_surface_create(c->proxy, i)),
-     controlled_entity(c, i),
-     dst_rect{},
-     src_rect{},
-     size{},
-     orientation{},
-     visibility{},
-     opacity{1.f} {
-   ivi_controller_surface_add_listener(this->proxy, &surface_listener, this);
+   : wayland_proxy(ivi_controller_surface_create(c->proxy.get(), i),
+                   [c, i](ivi_controller_surface *s) {
+                      logdebug("~surface surface %i @ %p", i, s);
+                      c->remove_proxy_to_id_mapping(s);
+                      ivi_controller_surface_destroy(s, 1);
+                   }),
+     controller_child(c, i) {
+   this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
+   ivi_controller_surface_add_listener(this->proxy.get(), &surface_listener,
+                                       this);
+}
+
+void surface::set_visibility(uint32_t visibility) {
+   ivi_controller_surface_set_visibility(this->proxy.get(), visibility);
+}
+
+void surface::set_opacity(wl_fixed_t opacity) {
+   ivi_controller_surface_set_opacity(this->proxy.get(), opacity);
+}
+
+void surface::set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                                   int32_t height) {
+   ivi_controller_surface_set_source_rectangle(this->proxy.get(), x, y, width,
+                                               height);
+}
+
+void surface::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                        int32_t height) {
+   ivi_controller_surface_set_destination_rectangle(this->proxy.get(), x, y,
+                                                    width, height);
+}
+
+void surface::set_configuration(int32_t width, int32_t height) {
+   ivi_controller_surface_set_configuration(this->proxy.get(), width, height);
+}
+
+void surface::set_orientation(int32_t orientation) {
+   ivi_controller_surface_set_orientation(this->proxy.get(), orientation);
+}
+
+void surface::screenshot(const char *filename) {
+   ivi_controller_surface_screenshot(this->proxy.get(), filename);
+}
+
+void surface::send_stats() {
+   ivi_controller_surface_send_stats(this->proxy.get());
 }
 
-surface::~surface() {
-   logdebug("%s surface %i @ %p", __func__, this->id, this->proxy);
-   ivi_controller_surface_destroy(this->proxy, 1);
-   this->proxy = nullptr;
+void surface::destroy(int32_t destroy_scene_object) {
+   ivi_controller_surface_destroy(this->proxy.get(), destroy_scene_object);
 }
 
-void controller::surface_visibility(uint32_t id, int32_t visibility) {
-   logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility);
-   this->surfaces[id]->visibility = visibility;
+void controller::surface_visibility(struct surface *s, int32_t visibility) {
+   logdebug("genivi::surface %s @ %d v %i", __func__, s->id,
+            visibility);
+   this->sprops[s->id].visibility = visibility;
+   this->chooks->surface_visibility(s->id, visibility);
 }
 
-void controller::surface_opacity(uint32_t id, float opacity) {
-   logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
-   this->surfaces[id]->opacity = opacity;
+void controller::surface_opacity(struct surface *s, float opacity) {
+   logdebug("genivi::surface %s @ %d o %f", __func__, s->id,
+            opacity);
+   this->sprops[s->id].opacity = opacity;
 }
 
-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);
-   this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+void controller::surface_source_rectangle(struct surface *s, int32_t x,
+                                          int32_t y, int32_t width,
+                                          int32_t height) {
+   logdebug("genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+            s->id, x, y, width, height);
+   this->sprops[s->id].src_rect = rect{width, height, x, y};
 }
 
-void controller::surface_destination_rectangle(uint32_t id, int32_t x,
+void controller::surface_destination_rectangle(struct surface *s, 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);
-   this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   logdebug("genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+            s->id, x, y, width, height);
+   this->sprops[s->id].dst_rect = rect{width, height, x, y};
+   this->chooks->surface_destination_rectangle(s->id, x, y, width, height);
 }
 
-void controller::surface_configuration(uint32_t id, int32_t width,
+void controller::surface_configuration(struct surface *s, int32_t width,
                                        int32_t height) {
-   logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy, width,
-            height);
-   auto &s = this->surfaces[id];
-   bool center = int(s->size.w) != int(width) && int(s->size.h) != int(height);
-   s->size = size{uint32_t(width), uint32_t(height)};
-   if (center)
-      add_task("fullscreen surface", [id](struct controller *c) {
-         c->surfaces[id]->set_destination_rectangle(0, 0, c->output_size.w,
-                                                    c->output_size.h);
-         c->surfaces[id]->set_visibility(1);
-         uint32_t lid = id == 0x16180 ? 1000 : 100;
-         c->layers[lid]->add_surface(c->surfaces[id].get());
-         c->layers[lid]->set_visibility(1);
-      });
+   logdebug("genivi::surface %s @ %d w %i h %i", __func__, s->id,
+            width, height);
+   this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
 }
 
-void controller::surface_orientation(uint32_t id, int32_t orientation) {
-   logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy, orientation);
-   this->surfaces[id]->orientation = orientation;
+void controller::surface_orientation(struct surface *s, int32_t orientation) {
+   logdebug("genivi::surface %s @ %d o %i", __func__, s->id,
+            orientation);
+   this->sprops[s->id].orientation = orientation;
 }
 
-void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
-   logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat);
+void controller::surface_pixelformat(struct surface * s,
+                                     int32_t pixelformat) {
+   logdebug("genivi::surface %s @ %d f %i", __func__, s->id,
+            pixelformat);
 }
 
-void controller::surface_layer(uint32_t id,
+void controller::surface_layer(struct surface * s,
                                struct ivi_controller_layer *layer) {
-   logdebug("genivi::surface %s @ %p l @ %p", __func__, this->proxy, layer);
+   logdebug("genivi::surface %s @ %d l %u @ %p", __func__, s->id,
+            this->layer_proxy_to_id[uintptr_t(layer)], layer);
 }
 
-void controller::surface_stats(uint32_t id, uint32_t redraw_count,
+void controller::surface_stats(struct surface *s, 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,
+   logdebug("genivi::surface %s @ %d r %u f %u u %u pid %u p %s", __func__,
+            s->id, redraw_count, frame_count, update_count, pid,
             process_name);
 }
 
-void controller::surface_destroyed(uint32_t id) {
-   logdebug("genivi::surface %s @ %p", __func__, this->proxy);
+void controller::surface_destroyed(struct surface *s) {
+   logdebug("genivi::surface %s @ %d", __func__, s->id);
+   this->chooks->surface_removed(s->id);
+   // XXX: do I need to actually remove the surface late, i.e. using add_task()?
+   this->sprops.erase(s->id);
+   this->surfaces.erase(s->id);
 }
 
-void controller::surface_content(uint32_t id, int32_t content_state) {
-   logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy,
+void controller::surface_content(struct surface *s, int32_t content_state) {
+   logdebug("genivi::surface %s @ %d s %i", __func__, s->id,
             content_state);
    if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
-      add_task("remove surface",
-               [id](struct controller *c) { c->surfaces.erase(id); });
+      // XXX is this the right thing to do?
+      this->chooks->surface_removed(s->id);
+      this->sprops.erase(s->id);
+      this->surfaces.erase(s->id);
    }
 }
 
+void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p,
+                                         uint32_t id) {
+   logdebug("Add surface proxy mapping for %p (%u)", p, id);
+   this->surface_proxy_to_id[uintptr_t(p)] = id;
+   this->sprops[id].id = id;
+}
+
+void controller::remove_proxy_to_id_mapping(struct ivi_controller_surface *p) {
+   logdebug("Remove surface proxy mapping for %p", p);
+   this->surface_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p,
+                                         uint32_t id) {
+   logdebug("Add layer proxy mapping for %p (%u)", p, id);
+   this->layer_proxy_to_id[uintptr_t(p)] = id;
+   this->lprops[id].id = id;
+}
+
+void controller::remove_proxy_to_id_mapping(struct ivi_controller_layer *p) {
+   logdebug("Remove layer proxy mapping for %p", p);
+   this->layer_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_proxy_to_id_mapping(struct wl_output *p, uint32_t id) {
+   logdebug("Add screen proxy mapping for %p (%u)", p, id);
+   this->screen_proxy_to_id[uintptr_t(p)] = id;
+}
+
+void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
+   logdebug("Remove screen proxy mapping for %p", p);
+   this->screen_proxy_to_id.erase(uintptr_t(p));
+}
+
 //
 //  ___  ___ _ __ ___  ___ _ __
 // / __|/ __| '__/ _ \/ _ \ '_ \
@@ -570,7 +744,22 @@ void controller::surface_content(uint32_t id, int32_t content_state) {
 //
 screen::screen(uint32_t i, struct controller *c,
                struct ivi_controller_screen *p)
-   : wayland_proxy(p), controlled_entity(c, i) {
+   : wayland_proxy(p), controller_child(c, i) {
    logdebug("genivi::screen @ %p id %u", p, i);
 }
+
+void screen::clear() { ivi_controller_screen_clear(this->proxy.get()); }
+
+void screen::add_layer(layer *l) {
+   ivi_controller_screen_add_layer(this->proxy.get(), l->proxy.get());
 }
+
+void screen::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.get(), &wlro);
+}
+
+}  // namespace genivi