X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=66efb72730a47a204fef08c1c0b16ec1cb8ffc81;hb=edb416241ef3a38dbade052c8361b8b96049894e;hp=b63d961d433f5a45be499781f992838f0685c296;hpb=e066b091da80364a84905c3d8fc37ebc6d7e849d;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index b63d961..66efb72 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -194,12 +194,25 @@ 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)) {
+        wl_registry_bind(r, name, &ivi_controller_interface, version)),
+     surfaces{},
+     layers{},
+     screens{},
+     pending{},
+     output_size{} {
    ivi_controller_add_listener(this->proxy, &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);
+}
+
+void controller::surface_create(uint32_t id) {
+   this->surfaces[id] = std::make_unique<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,
@@ -293,8 +306,10 @@ constexpr struct ivi_controller_layer_listener layer_listener = {
 };
 }
 
-layer::layer(uint32_t i, struct controller *c)
-   : wayland_proxy(ivi_controller_layer_create(c->proxy, i, 0, 0)),
+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);
 }
@@ -307,32 +322,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) {
@@ -497,14 +518,14 @@ void controller::surface_configuration(uint32_t id, int32_t width,
    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;
+   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)
-         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) {
+      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);
+         c->layers[100]->add_surface(c->surfaces[id].get());
+         c->layers[100]->set_visibility(1);
       });
 }