Change struct WMAction

[apps/agl-service-windowmanager.git] / src / applist.cpp

diff --git a/src/applist.cpp b/src/applist.cpp
index 391a3ce..93c90ac 100644 (file)
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -73,6 +73,14 @@ void AppList::addClient(const string &appid, unsigned layer, unsigned surface, c
     this->clientDump();
 }
 
+void AppList::addClient(const string &appid, unsigned layer, const string& layer_name, unsigned surface, const string &role)
+{
+    std::lock_guard<std::mutex> lock(this->mtx);
+    shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, layer, layer_name, surface, role);
+    this->app2client[appid] = client;
+    this->clientDump();
+}
+
 /**
  * Remove WMClient from the list
  *
@@ -228,16 +236,15 @@ void AppList::removeFloatingSurface(unsigned surface)
     this->floating_surfaces.erase(fwd_itr, this->floating_surfaces.end());
 }
 
-WMError AppList::appendRole(const string &id, const string &role, unsigned surface)
+WMError AppList::appendRole(const string &id, const string &role)
 {
     WMError wm_err = WMError::NO_ENTRY;
-    HMI_ERROR("This function is disabled");
-    /* if (this->contains(id))
+    if (this->contains(id))
     {
         auto x = this->lookUpClient(id);
-        x->addSurface(role, surface);
+        x->appendRole(role);
         wm_err = WMError::SUCCESS;
-    } */
+    }
     return wm_err;
 }
 
@@ -421,7 +428,7 @@ WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
  *            otherwise (visible is false) app should be invisible. Then enddraw_finished param is set to true.
  *            This function doesn't support actions for focus yet.
  */
-WMError AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, TaskVisible visible)
+WMError AppList::setAction(unsigned req_num, shared_ptr<WMClient> client, const string &role, const string &area, TaskVisible visible)
 {
     std::lock_guard<std::mutex> lock(this->mtx);
     WMError result = WMError::FAIL;
@@ -433,7 +440,7 @@ WMError AppList::setAction(unsigned req_num, const string &appid, const string &
         }
         // If visible task is not invisible, redraw is required -> true
         bool edraw_f = (visible != TaskVisible::INVISIBLE) ? false : true;
-        WMAction action{appid, role, area, visible, edraw_f};
+        WMAction action{req_num, client, role, area, visible, edraw_f};
 
         x.sync_draw_req.push_back(action);
         result = WMError::SUCCESS;
@@ -469,7 +476,7 @@ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const st
         {
             for (auto &y : x.sync_draw_req)
             {
-                if (y.appid == appid && y.role == role)
+                if (y.client->appID() == appid && y.role == role)
                 {
                     HMI_SEQ_INFO(req_num, "Role %s finish redraw", y.role.c_str());
                     y.end_draw_finished = true;
@@ -584,7 +591,7 @@ void AppList::reqDump()
         {
             DUMP(
                 "Action  : (APPID :%s, ROLE :%s, AREA :%s, VISIBLE : %s, END_DRAW_FINISHED: %d)",
-                y.appid.c_str(),
+                y.client->appID().c_str(),
                 y.role.c_str(),
                 y.area.c_str(),
                 (y.visible == TaskVisible::INVISIBLE) ? "invisible" : "visible",