X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=1078a141140aae7da7161f44547c7a7de2294dfd;hb=ccad564c1621ba8aa69ce47ea9374da373b0bcce;hp=a5129799a8a903aead53d37e735c988f71f6290c;hpb=d34b46aae11efe3f5060067d1f2ee3ed3eac2b7e;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index a512979..1078a14 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -15,14 +15,18 @@ namespace wl {
 //  \__,_|_|___/ .__/|_|\__,_|\__, |
 //             |_|            |___/
 display::display()
-   : d(std::unique_ptr<struct wl_display,
-                       std::function<void(struct wl_display *)>>(
+   : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
         wl_display_connect(NULL),
+#ifdef DEBUG_OUTPUT
         [](struct wl_display *d) {
            logdebug("wl::display ~display @ %p", d);
            wl_display_disconnect(d);
         })),
-     r(!d ? nullptr : std::make_unique<struct registry>(d.get())) {}
+#else
+        &wl_display_disconnect)),
+#endif
+     r(d.get()) {
+}
 
 display::~display() {}
 
@@ -74,9 +78,8 @@ 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);
+   logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface,
+            v);
 }
 
 void registry::global_remove(uint32_t name) {}
@@ -194,12 +197,12 @@ constexpr struct ivi_controller_listener listener = {
 
 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{} {
+        wl_registry_bind(r, name, &ivi_controller_interface, version)),
+     surfaces{},
+     layers{},
+     screens{},
+     pending{},
+     output_size{} {
    ivi_controller_add_listener(this->proxy, &listener, this);
 }
 
@@ -228,6 +231,16 @@ void controller::controller_layer(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<struct surface>(id, this);
+
+   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("Surface %u now fullscreen on layer %u", id, lid);
+   });
 }
 
 void controller::controller_error(int32_t object_id, int32_t object_type,
@@ -254,7 +267,8 @@ 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));
+      static_cast<struct layer *>(data)->id,
+      float(wl_fixed_to_double(opacity)));
 }
 
 void layer_source_rectangle(void *data,
@@ -306,13 +320,17 @@ constexpr struct ivi_controller_layer_listener layer_listener = {
 };
 }
 
-layer::layer(uint32_t i, struct controller *c)
-   : layer(i, 0, 0, c) {
-}
+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) {
+     controlled_entity(c, i),
+     dst_rect{},
+     src_rect{},
+     size{},
+     orientation{},
+     visibility{},
+     opacity{} {
    ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
 }
 
@@ -324,32 +342,38 @@ layer::~layer() {
 
 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 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 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);
+   this->layers[id]->src_rect = rect{uint32_t(width), uint32_t(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_configuration(uint32_t id, 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)};
 }
 
 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_screen(uint32_t id, struct wl_output *screen) {
@@ -379,7 +403,8 @@ 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));
+      static_cast<struct surface *>(data)->id,
+      float(wl_fixed_to_double(opacity)));
 }
 
 void surface_source_rectangle(
@@ -482,22 +507,19 @@ surface::~surface() {
 
 void controller::surface_visibility(uint32_t id, int32_t visibility) {
    logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility);
-   struct surface *s = this->surfaces[id].get();
-   s->visibility = visibility;
+   this->surfaces[id]->visibility = visibility;
 }
 
 void controller::surface_opacity(uint32_t id, float opacity) {
    logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
-   struct surface *s = this->surfaces[id].get();
-   s->opacity = opacity;
+   this->surfaces[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);
-   struct surface *s = this->surfaces[id].get();
-   s->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
 }
 
 void controller::surface_destination_rectangle(uint32_t id, int32_t x,
@@ -505,30 +527,19 @@ void controller::surface_destination_rectangle(uint32_t id, int32_t x,
                                                int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy, x, y, width, height);
-   struct surface *s = this->surfaces[id].get();
-   s->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
 }
 
 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);
-   struct surface *s = this->surfaces[id].get();
-   bool center = s->size.w != width && s->size.h != height;
-   s->size = size{uint32_t(width), uint32_t(height)};
-   if (center)
-         auto const s = c->surfaces.find(id);
-         if (s != c->surfaces.end())
-            s->second->set_destination_rectangle(
-               800 / 2 - width / 2, 600 / 2 - height / 2, width, height);
-      add_task("fullscreen surface", [id, width, height](struct controller *c) {
-      });
+   this->surfaces[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);
-   struct surface *s = this->surfaces[id].get();
-   s->orientation = orientation;
+   this->surfaces[id]->orientation = orientation;
 }
 
 void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
@@ -550,6 +561,7 @@ void controller::surface_stats(uint32_t id, uint32_t redraw_count,
 
 void controller::surface_destroyed(uint32_t id) {
    logdebug("genivi::surface %s @ %p", __func__, this->proxy);
+   this->surfaces.erase(id);
 }
 
 void controller::surface_content(uint32_t id, int32_t content_state) {