The surfaces are managed by using the roles instead of the drawing names

Change-Id: I7373a54f2df334ac223b51a6cb9a643a88e7c33c
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

3 files changed, 36 insertions, 48 deletions

diff --git a/layers.json b/layers.json
index 0fb9983..551c86a 100644
--- a/layers.json
+++ b/layers.json
@@ -15,14 +15,14 @@
          "comment": "Single BackGround layer map for the Navigation, Radio and MediaPlayer"
       },
       {
-         "role": "^HomeScreen$",
+         "role": "^HomeScreen$|homescreen",
          "name": "FarHomeScreen",
          "layer_id": 1000,
          "area": { "type": "full" },
          "comment": "FarHomeScreen is the part of HomeScreen, and lawer layer of z order for HomeScreen"
       },
       {
-         "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Splitable1|Splitable2|Fallback",
+         "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Fallback|music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|fallback",
          "name": "apps",
          "layer_id": 1001,
          "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
diff --git a/src/app.cpp b/src/app.cpp
index faca413..0d727b6 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -545,9 +545,12 @@ void App::check_flushdraw(int surface_id) {
 }
 
 void App::api_enddraw(char const *appid, char const *drawing_name) {
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+
    for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
       auto n = this->lookup_name(this->pending_end_draw[i]);
-      if (n && *n == drawing_name) {
+      if (n && *n == role) {
          std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
          this->pending_end_draw.resize(iend - 1);
          this->activate(this->pending_end_draw[i]);
@@ -634,10 +637,10 @@ void App::surface_removed(uint32_t surface_id) {
    if (int(surface_id) == this->layers.main_surface) {
       this->deactivate_main_surface();
    } else {
-      auto drawing_name = this->lookup_name(surface_id);
-      if (drawing_name) {
+      auto role = this->lookup_name(surface_id);
+      if (role) {
          this->allocateWindowResource("deactivate",
-                                      drawing_name->c_str(), nullptr,
+                                      role->c_str(), nullptr,
                                       [](const char*){});
       }
    }
@@ -730,7 +733,9 @@ void App::emitScreenUpdated(char const* appid) {
 }
 
 result<int> App::api_request_surface(char const *drawing_name) {
-   auto lid = this->layers.get_layer_id(std::string(drawing_name));
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+   auto lid = this->layers.get_layer_id(std::string(role));
    if (!lid) {
       /**
        * register drawing_name as fallback and make it displayed.
@@ -742,10 +747,10 @@ result<int> App::api_request_surface(char const *drawing_name) {
       }
    }
 
-   auto rname = this->lookup_id(drawing_name);
+   auto rname = this->lookup_id(role);
    if (!rname) {
       // name does not exist yet, allocate surface id...
-      auto id = int(this->id_alloc.generate_id(drawing_name));
+      auto id = int(this->id_alloc.generate_id(role));
       this->layers.add_surface(id, *lid);
 
       // set the main_surface[_name] here and now
@@ -755,24 +760,11 @@ result<int> App::api_request_surface(char const *drawing_name) {
          HMI_DEBUG("wm", "Set main_surface id to %u", id);
       }
 
-#if 0 // @@@@@
-      // TODO:
-      // This process will be implemented in SystemManager
-      {
-          // Generate app id
-          auto id = int(this->app_id_alloc_.generate_id(drawing_name));
-          this->appname2appid_[drawing_name] = id;
-      }
-#endif
-
       // Set map of (role, surface_id)
-      const char* role = this->convertDrawingNameToRole(drawing_name);
       this->role2surfaceid_[role] = id;
 
-      // Set map of (role, app)
-      // If the new app which has the same role which is had by existing app is requested,
-      // the role is given to the new app.
-      this->role2app_[role] = std::string(drawing_name);
+      // Set map of (role, drawing_name)
+      this->role2drawingname_[role] = std::string(drawing_name);
 
       return Ok<int>(id);
    }
@@ -840,8 +832,11 @@ result<json_object *> App::api_get_display_info() {
 result<json_object *> App::api_get_area_info(char const *drawing_name) {
    HMI_DEBUG("wm", "called");
 
+   // Convert drawing_name to role
+   const char* role = this->convertDrawingNameToRole(drawing_name);
+
    // Check drawing name, surface/layer id
-   auto const &surface_id = this->lookup_id(drawing_name);
+   auto const &surface_id = this->lookup_id(role);
    if (!surface_id) {
       return Err<json_object *>("Surface does not exist");
    }
@@ -915,13 +910,10 @@ void App::activate(int id) {
       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, "Music"))
-          || (0 == strcmp(label, "VideoPlayer"))
-          || (0 == strcmp(label, "Video"))
-          || (0 == strcmp(label, "Navigation"))) {
+      if ((0 == strcmp(label, "radio"))
+          || (0 == strcmp(label, "music"))
+          || (0 == strcmp(label, "video"))
+          || (0 == strcmp(label, "map"))) {
         for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) {
             if (id == *i) {
                // Remove id
@@ -942,7 +934,7 @@ void App::activate(int id) {
             }
          }
       }
-      // <<< FOR CES DEMO
+
       this->layout_commit();
 
       this->emit_visible(label);
@@ -956,13 +948,10 @@ void App::deactivate(int id) {
       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, "Music"))
-          || (0 == strcmp(label, "VideoPlayer"))
-          || (0 == strcmp(label, "Video"))
-          || (0 == strcmp(label, "Navigation"))) {
+      if ((0 == strcmp(label, "radio"))
+          || (0 == strcmp(label, "music"))
+          || (0 == strcmp(label, "video"))
+          || (0 == strcmp(label, "map"))) {
 
          // Store id
          this->surface_bg.push_back(id);
@@ -982,7 +971,6 @@ void App::deactivate(int id) {
       else {
          this->controller->surfaces[id]->set_visibility(0);
       }
-      // <<< FOR CES DEMO
 
       this->layout_commit();
 
@@ -992,14 +980,14 @@ void App::deactivate(int id) {
 }
 
 void App::deactivate(std::string role) {
-    std::string app = this->role2app_[role];
-    auto const &id = this->lookup_id(app.c_str());
+    auto const &id = this->lookup_id(role.c_str());
     if (!id) {
       HMI_ERROR("wm", "Surface does not exist");
       return;
     }
-    HMI_DEBUG("wm", "Deactivate role:%s (app:%s)",
-              role.c_str(), app.c_str());
+    std::string drawing_name = this->role2drawingname_[role];
+    HMI_DEBUG("wm", "Deactivate role:%s (drawing_name:%s)",
+              role.c_str(), drawing_name.c_str());
 
     this->deactivate(*id);
 }
@@ -1181,8 +1169,8 @@ void App::setSurfaceSize(const char* role, const char* area) {
               size.x, size.y, size.w, size.h);
 
     // Emit syncDraw event
-    const char* app = this->role2app_[role].c_str();
-    this->emit_syncdraw(app, area,
+    const char* drawing_name = this->role2drawingname_[role].c_str();
+    this->emit_syncdraw(drawing_name, area,
                         size.x, size.y, size.w, size.h);
 
     // Enqueue flushDraw event
diff --git a/src/app.hpp b/src/app.hpp
index dca112e..c3ce674 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -259,7 +259,7 @@ private:
    LayoutManager lm_;
    std::unordered_map<std::string, int> role2surfaceid_;
    std::unordered_map<std::string, std::string> drawingname2role_;
-   std::unordered_map<std::string, std::string> role2app_;
+   std::unordered_map<std::string, std::string> role2drawingname_;
    std::unordered_map<int, int> appid2role_;
    CarInfo crr_car_info_;