X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=8ad2544a698bcf509ed4a15ec6fd2d90e406f353;hb=d16426164142cdddeaf16cb18a6ac5f191c8e0e4;hp=424ad0da03da5c31c9c9e9aa0f6113ca1c65b184;hpb=64ed0324fe01c76ba7ada09243228b5ec45c6cda;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index 424ad0d..8ad2544 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -220,15 +220,7 @@ void controller::controller_surface(uint32_t id) {
    logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
             id);
    this->surfaces[id] = std::make_unique<struct surface>(id, this);
-
-   add_task("fullscreen surface", [id](struct controller *c) {
-      auto &s = c->surfaces[id];
-      s->set_destination_rectangle(0, 0, c->output_size.w, c->output_size.h);
-      s->set_visibility(1);
-      uint32_t lid = id == 0x16180 ? 1000 : 100;
-      c->layers[lid]->add_surface(s.get());
-      logdebug("Surface %u now fullscreen on layer %u", id, lid);
-   });
+   this->chooks->surface_created(id);
 }
 
 void controller::controller_error(int32_t object_id, int32_t object_type,
@@ -388,7 +380,7 @@ 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.get(), x, y, width, height);
-   this->lprops[l->id].src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->lprops[l->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::layer_destination_rectangle(struct layer *l, int32_t x,
@@ -396,7 +388,7 @@ void controller::layer_destination_rectangle(struct layer *l, int32_t x,
                                              int32_t height) {
    logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->lprops[l->id].dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->lprops[l->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::layer_configuration(struct layer *l, int32_t width,
@@ -596,7 +588,7 @@ void controller::surface_source_rectangle(struct surface *s, int32_t x,
                                           int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->sprops[s->id].src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->sprops[s->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::surface_destination_rectangle(struct surface *s, int32_t x,
@@ -604,7 +596,7 @@ void controller::surface_destination_rectangle(struct surface *s, int32_t x,
                                                int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->sprops[s->id].dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->sprops[s->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::surface_configuration(struct surface *s, int32_t width,
@@ -642,6 +634,8 @@ void controller::surface_stats(struct surface * /*s*/, uint32_t redraw_count,
 
 void controller::surface_destroyed(struct surface *s) {
    logdebug("genivi::surface %s @ %p", __func__, this->proxy.get());
+   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);
 }
@@ -650,6 +644,8 @@ void controller::surface_content(struct surface *s, int32_t content_state) {
    logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(),
             content_state);
    if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
+      // XXX is this the right thing to do?
+      this->chooks->surface_removed(s->id);
       add_task("remove surface", [s](struct controller *c) {
          c->sprops.erase(s->id);
          c->surfaces.erase(s->id);