X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=c611501d59724c7b968c167ec27a0e336ef89266;hb=c06c6004c9a9ca6d0e5a45461bfd3730b584422c;hp=be4782a6a6feb6d5be60b772ac7cf2fca6fe7eca;hpb=daebef23d579cd9826731bc6c7fcfba74e24531d;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index be4782a..c611501 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -95,16 +95,12 @@ struct result<layer_map> load_layer_map(char const *filename) {
 
 namespace rm {
 App *context;
-const char *g_new_role; // TODO: workaround
 static void eventHandler(json_object* json_out) {
     context->updateWindowResource(json_out);
 }
 }  // namespace rm
 
-
 void App::updateWindowResource(json_object* json_out) {
-    HMI_DEBUG("wm", "role:%s", rm::g_new_role);
-
     // Check parking brake state
     json_object* json_parking_brake;
     if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) {
@@ -243,24 +239,84 @@ void App::updateWindowResource(json_object* json_out) {
         }
     }
 
-    // Get category
-    const char* category = nullptr;
-    std::string str_category;
-    if (nullptr != rm::g_new_role) {
-        str_category = this->pm_.roleToCategory(rm::g_new_role);
-        category = str_category.c_str();
-        HMI_DEBUG("wm", "role:%s category:%s", rm::g_new_role, category);
+    // Get displayed roles from current layout
+    json_object* json_layers;
+    if (!json_object_object_get_ex(json_out, "layers", &json_layers)) {
+        HMI_DEBUG("wm", "Not found key \"layers\"");
+        return;
     }
 
-    // Update layout
-    if (this->lm_.updateLayout(json_out, rm::g_new_role, category)) {
-        HMI_DEBUG("wm", "Layer is changed!!");
+    int len = json_object_array_length(json_layers);
+    HMI_DEBUG("wm", "json_layers len:%d", len);
+    HMI_DEBUG("wm", "json_layers dump:%s", json_object_get_string(json_layers));
 
-        // Allocate surface
-        this->allocateSurface();
-    }
-    else {
-        HMI_DEBUG("wm", "All layer is NOT changed!!");
+    for (int i=0; i<len; i++) {
+        json_object* json_tmp = json_object_array_get_idx(json_layers, i);
+
+        std::string layer_name = jh::getStringFromJson(json_tmp, "name");
+        json_bool changed = jh::getBoolFromJson(json_tmp, "changed");
+        HMI_DEBUG("wm", "layer:%s changed:%d", layer_name.c_str(), changed);
+
+        if (changed) {
+            json_object* json_areas;
+            if (!json_object_object_get_ex(json_tmp, "areas", &json_areas)) {
+                HMI_DEBUG("wm", "Not found key \"areas\"");
+                return;
+            }
+
+            int len = json_object_array_length(json_areas);
+            HMI_DEBUG("wm", "json_layers len:%d", len);
+
+            RoleState nxt_roles;
+            RoleState crr_roles = this->crr_layer_state[layer_name];
+            for (int j=0; j<len; j++) {
+                json_object* json_tmp2 = json_object_array_get_idx(json_areas, j);
+
+                std::string area_name = jh::getStringFromJson(json_tmp2, "name");
+                std::string role_name = jh::getStringFromJson(json_tmp2, "role");
+
+                nxt_roles[role_name] = area_name;
+
+                auto i_crr = crr_roles.find(role_name);
+                HMI_DEBUG("wm", "next role:%s area:%s",
+                          role_name.c_str(), area_name.c_str());
+
+                // If next role does not exist in current
+                if (crr_roles.end() == i_crr) {
+                    HMI_DEBUG("wm", "next role does not exist in current");
+
+                    // Set surface size
+                    this->setSurfaceSize(role_name.c_str(), area_name.c_str());
+                }
+                else {
+                    HMI_DEBUG("wm", "current role:%s area:%s",
+                              i_crr->first.c_str(), i_crr->second.c_str());
+
+                    // If next role exists in current and area is different with current
+                    if (area_name != i_crr->second) {
+                        HMI_DEBUG("wm", "next role exists in current and area is different with current");
+
+                        // Set surface size
+                        this->setSurfaceSize(role_name.c_str(), area_name.c_str());
+                    }
+
+                    // Remove role which exist in next list from current list
+                    crr_roles.erase(i_crr);
+                }
+            }
+
+            // Deactivate roles which remains in current list
+            // because these are not displayed in next layout
+            for (auto i_crr : crr_roles) {
+                HMI_DEBUG("wm", "Deactivate role:%s", i_crr.first.c_str());
+
+                // Deactivate
+                this->deactivate(i_crr.first.c_str());
+            }
+
+            // Update current role list
+            this->crr_layer_state[layer_name] = nxt_roles;
+        }
     }
 }
 
@@ -496,7 +552,7 @@ void App::allocateWindowResource(char const *event, char const *drawing_name,
                 }
                 else if (0 == strcmp("homescreen", new_role)) {
                     // Now homescreen specifies "normalfull"
-                    new_area = "full";
+                    new_area = "fullscreen";
                 }
                 else {
                     new_area = "normal";
@@ -525,8 +581,12 @@ void App::allocateWindowResource(char const *event, char const *drawing_name,
     if (nullptr != new_area) {
         json_object_object_add(json_in, "area", json_object_new_string(new_area));
     }
-    rm::g_new_role = new_role;  // TODO: workaround
-    this->pm_.inputEvent(json_in);
+
+    // Set input event data
+    this->pm_.setInputEventData(json_in);
+
+    // Execute state transition
+    this->pm_.executeStateTransition();
 
     // Release json_object
     json_object_put(json_in);
@@ -753,9 +813,6 @@ result<int> App::api_request_surface(char const *drawing_name) {
          HMI_DEBUG("wm", "Set main_surface id to %u", id);
       }
 
-      // Set map of (role, surface_id)
-      this->role2surfaceid_[role] = id;
-
       // Set map of (role, drawing_name)
       this->role2drawingname_[role] = std::string(drawing_name);
 
@@ -980,129 +1037,6 @@ void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/,
                                                      uint32_t /*w*/,
                                                      uint32_t /*h*/) {}
 
-int App::allocateSurface() {
-    HMI_DEBUG("wm", "Call");
-
-    // Get current/previous layers
-    LayoutManager::TypeLayers crr_layers = this->lm_.getCurrentLayers();
-    LayoutManager::TypeLayers prv_layers = this->lm_.getPreviousLayers();
-
-    // Update resource of all layers
-    for (auto itr_layers = crr_layers.begin();
-         itr_layers != crr_layers.end(); ++itr_layers) {
-        // Get layer
-        std::string layer = itr_layers->first;
-        HMI_DEBUG("wm", "Try to update resource in %s layer", layer.c_str());
-
-        // If layout is changed, update resouce
-        if (this->lm_.isLayoutChanged(layer.c_str())) {
-            // Get current/previous layout
-            LayoutManager::TypeLayouts crr_layout = itr_layers->second;
-            LayoutManager::TypeLayouts prv_layout = prv_layers[layer];
-
-            // Get current/previous layout name
-            std::string crr_layout_name = crr_layout.begin()->first;
-            std::string prv_layout_name = prv_layout.begin()->first;
-            HMI_DEBUG("wm", "layout name crr:%s prv:%s",
-                      crr_layout_name.c_str(), prv_layout_name.c_str());
-
-            // Get current/previous ares
-            LayoutManager::TypeAreas crr_areas = crr_layout[crr_layout_name];
-            LayoutManager::TypeAreas prv_areas = prv_layout[prv_layout_name];
-
-            // Create previous displayed role list
-            std::string prv_area_name;
-            std::vector<std::string> prv_role_list;
-            for (auto itr_areas = prv_areas.begin();
-                 itr_areas != prv_areas.end(); ++itr_areas) {
-                prv_area_name = itr_areas->first;
-                prv_role_list.push_back(prv_areas[prv_area_name]["role"]);
-                HMI_DEBUG("wm", "previous displayed role:%s",
-                          prv_areas[prv_area_name]["role"].c_str());
-            }
-
-            // Allocate surface for each area
-            std::string crr_area_name;
-            std::string crr_role_name;
-            LayoutManager::TypeRolCtg crr_rol_ctg;
-            for (auto itr_areas = crr_areas.begin();
-                 itr_areas != crr_areas.end(); ++itr_areas) {
-                crr_area_name = itr_areas->first;
-                crr_rol_ctg = itr_areas->second;
-
-                // Get role of current area
-                if ("category" == crr_rol_ctg.begin()->first) {
-                    // If current area have category
-                    // Get category name
-                    std::string crr_ctg = crr_rol_ctg.begin()->second;
-
-                    // Serch relevant role from previous displayed role list
-                    for (auto itr_role = prv_role_list.begin();
-                         itr_role != prv_role_list.end(); ++itr_role) {
-                        std::string prv_ctg = this->pm_.roleToCategory((*itr_role).c_str());
-                        if (crr_ctg == prv_ctg) {
-                            // First discovered role is set to current role
-                            crr_role_name = *itr_role;
-
-                            // Delete used role for other areas
-                            // which have same category
-                            prv_role_list.erase(itr_role);
-
-                            break;
-                        }
-                    }
-                }
-                else {
-                    crr_role_name = itr_areas->second["role"];
-                }
-                HMI_DEBUG("wm", "Allocate surface for area:%s role:%s",
-                          crr_area_name.c_str(), crr_role_name.c_str());
-
-                // Deactivate non-displayed role
-                std::string prv_role_name;
-                if (crr_layout_name == prv_layout_name) {
-                    HMI_DEBUG("wm", "Current layout is same with previous");
-
-                    // Deactivate previous role in same area
-                    // if it is different with current
-                    prv_role_name = prv_areas[crr_area_name]["role"];
-                    if (crr_role_name != prv_role_name) {
-                        this->deactivate(prv_role_name);
-                    }
-                }
-                else {
-                    HMI_DEBUG("wm", "Current layout is different with previous");
-
-                    if ("none" != prv_layout_name) {
-                        // Deactivate previous role in all area in previous layout
-                        // if it is different with current role
-                        for(auto itr = prv_areas.begin(); itr != prv_areas.end(); ++itr) {
-                            prv_role_name = itr->second["role"].c_str();
-                            if (crr_role_name != prv_role_name) {
-                                this->deactivate(prv_role_name);
-                            }
-                        }
-                    }
-                }
-
-                // Set surface for displayed role
-                if ("none" != crr_layout_name) {
-                    // If current layout is not "none",
-                    // set surface for current role
-                    this->setSurfaceSize(crr_role_name.c_str(), crr_area_name.c_str());
-
-                    // TODO:
-                    // This API is workaround.
-                    // Resource manager should manage each resource infomations
-                    // according to architecture document.
-                    this->lm_.updateArea(layer.c_str(), crr_role_name.c_str(), crr_area_name.c_str());
-                }
-            }
-        }
-    }
-    return 0;
-}
-
 void App::setSurfaceSize(const char* role, const char* area) {
     HMI_DEBUG("wm", "role:%s area:%s", role, area);
 
@@ -1110,22 +1044,21 @@ void App::setSurfaceSize(const char* role, const char* area) {
     compositor::rect size = this->lm_.getAreaSize(area);
 
     // Set destination to the display rectangle
-    int surface_id = this->role2surfaceid_[role];
-
-    if (!this->controller->surface_exists(surface_id)) {
+    auto const &surface_id = this->lookup_id(role);
+    if (!this->controller->surface_exists(*surface_id)) {
         // Block until all pending request are processed by wayland display server
         // because waiting for the surface of new app is created
         this->display->roundtrip();
     }
-    auto &s = this->controller->surfaces[surface_id];
+    auto &s = this->controller->surfaces[*surface_id];
     s->set_destination_rectangle(size.x, size.y, size.w, size.h);
     this->layout_commit();
 
     // Update area information
-    this->area_info[surface_id].x = size.x;
-    this->area_info[surface_id].y = size.y;
-    this->area_info[surface_id].w = size.w;
-    this->area_info[surface_id].h = size.h;
+    this->area_info[*surface_id].x = size.x;
+    this->area_info[*surface_id].y = size.y;
+    this->area_info[*surface_id].w = size.w;
+    this->area_info[*surface_id].h = size.h;
     HMI_DEBUG("wm", "Surface rect { %d, %d, %d, %d }",
               size.x, size.y, size.w, size.h);
 
@@ -1135,7 +1068,7 @@ void App::setSurfaceSize(const char* role, const char* area) {
                         size.x, size.y, size.w, size.h);
 
     // Enqueue flushDraw event
-    this->enqueue_flushdraw(surface_id);
+    this->enqueue_flushdraw(*surface_id);
 }
 
 void App::setAccelPedalPos(double val) {