X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=9ddfde44e4c3fda541082a7269cde9937fed784e;hb=25abec6a1ff6661283976f202f1ac43b2eb4f455;hp=af552b564501ef95f41b2cc2822adbc49faca4a7;hpb=0b1d9ca2550bdb877d065a74e4debcc95c4e7b98;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index af552b5..9ddfde4 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -504,8 +504,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) {
       return "No surface active";
    }
 
-   // XXX: check against main_surface, main_surface_name is the configuration
-   // item.
+   // Check against main_surface, main_surface_name is the configuration item.
    if (*surface_id == this->layers.main_surface) {
       HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id);
       return nullptr;
@@ -580,7 +579,6 @@ char const *App::api_enddraw(char const *drawing_name) {
       if (n && *n == drawing_name) {
          std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
          this->pending_end_draw.resize(iend - 1);
-         // XXX: Please tell the compositor to thaw the surface...
          this->activate(this->pending_end_draw[i]);
          this->layout_commit();
          this->emit_flushdraw(drawing_name);
@@ -688,6 +686,36 @@ result<int> App::api_request_surface(char const *drawing_name) {
    return Err<int>("Surface already present");
 }
 
+char const *App::api_request_surface(char const *drawing_name,
+                                     char const *ivi_id) {
+   ST();
+
+   auto lid = this->layers.get_layer_id(std::string(drawing_name));
+   unsigned sid = std::stol(ivi_id);
+
+   if (!lid) {
+       return "Drawing name does not match any role";
+   }
+
+   auto rname = this->lookup_id(drawing_name);
+
+   if (rname) {
+       return "Surface already present";
+   }
+
+   // register pair drawing_name and ivi_id
+   this->id_alloc.register_name_id(drawing_name, sid);
+   this->layers.add_surface(sid, *lid);
+
+   // this surface is already created
+   HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
+
+   this->controller->layers[*lid]->add_surface(
+       this->controller->surfaces[sid].get());
+
+   return nullptr;
+}
+
 void App::activate(int id) {
    auto ip = this->controller->sprops.find(id);
    if (ip != this->controller->sprops.end()) {
@@ -696,6 +724,35 @@ void App::activate(int id) {
       this->controller->surfaces[id]->set_visibility(1);
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
+
+      // FOR CES DEMO >>>
+      if ((0 == strcmp(label, "Radio"))
+          || (0 == strcmp(label, "MediaPlayer"))
+          || (0 == strcmp(label, "Navigation"))) {
+        for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) {
+            if (id == *i) {
+               // Remove id
+               this->surface_bg.erase(i);
+
+               // Remove from BG layer (999)
+               HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
+               this->controller->layers[999]->remove_surface(
+                  this->controller->surfaces[id].get());
+
+               // Add to FG layer (1001)
+               HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id);
+               this->controller->layers[1001]->add_surface(
+                  this->controller->surfaces[id].get());
+
+               for (int j : this->surface_bg) {
+                 HMI_DEBUG("wm", "Stored id:%d", j);
+               }
+               break;
+            }
+         }
+      }
+      // <<< FOR CES DEMO
+
       this->emit_visible(label);
       this->emit_activated(label);
    }
@@ -704,9 +761,36 @@ void App::activate(int id) {
 void App::deactivate(int id) {
    auto ip = this->controller->sprops.find(id);
    if (ip != this->controller->sprops.end() && ip->second.visibility != 0) {
-      this->controller->surfaces[id]->set_visibility(0);
       char const *label =
          this->lookup_name(id).value_or("unknown-name").c_str();
+
+      // FOR CES DEMO >>>
+      if ((0 == strcmp(label, "Radio"))
+          || (0 == strcmp(label, "MediaPlayer"))
+          || (0 == strcmp(label, "Navigation"))) {
+
+         // Store id
+         this->surface_bg.push_back(id);
+
+         // Remove from FG layer (1001)
+         HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
+         this->controller->layers[1001]->remove_surface(
+            this->controller->surfaces[id].get());
+
+         // Add to BG layer (999)
+         HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id);
+         this->controller->layers[999]->add_surface(
+            this->controller->surfaces[id].get());
+
+         for (int j : surface_bg) {
+            HMI_DEBUG("wm", "Stored id:%d", j);
+         }
+      }
+      else {
+         this->controller->surfaces[id]->set_visibility(0);
+      }
+      // <<< FOR CES DEMO
+
       this->emit_deactivated(label);
       this->emit_invisible(label);
    }