Adopt error code and message into Window Manager

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

diff --git a/src/applist.cpp b/src/applist.cpp
index 37a7717..6b608d0 100644 (file)
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -23,30 +23,54 @@ using std::string;
 using std::unique_ptr;
 using std::vector;
 
-namespace wm {
-
+namespace wm
+{
 
 AppList::AppList()
     : req_list(0),
       client_list(0),
       current_seq(1)
-{}
+{
+}
 
-AppList::~AppList(){}
+AppList::~AppList() {}
 
-void AppList::addClient(const string &appid, const string &role){
+void AppList::addClient(const string &appid, const string &role)
+{
     shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, role);
     client_list[appid] = client;
     client_dump();
 }
 
-void AppList::removeClient(const string &appid){
+void AppList::addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role)
+{
+    shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, layer, surface, role);
+    client_list[appid] = client;
+    client_dump();
+}
+
+void AppList::removeClient(const string &appid)
+{
     client_list.erase(appid);
 }
 
-bool AppList::contains(const string &appid){
+WMError AppList::contains(const string &appid)
+{
     auto result = client_list.find(appid);
-    return (client_list.end() != result) ? true : false;
+    return (client_list.end() != result) ? WMError::SUCCESS : WMError::NOT_REGISTERED;
+}
+
+void AppList::removeSurface(unsigned surface_id){
+    // This function may be very slow
+    bool ret = false;
+    for (auto &x : client_list)
+    {
+        ret = x.second->removeSurfaceIfExist(surface_id);
+        if(ret){
+            HMI_DEBUG("wm", "remove surface %d from Client %s finish", surface_id, x.second->appID().c_str());
+            break;
+        }
+    }
 }
 
 /**
@@ -55,7 +79,7 @@ bool AppList::contains(const string &appid){
  * @param string[in] application id(key)
  * @return WMClient object
  */
-shared_ptr <WMClient> AppList::lookUpClient(const string &appid)
+shared_ptr<WMClient> AppList::lookUpClient(const string &appid)
 {
     return client_list.at(appid);
 }
@@ -65,15 +89,18 @@ int AppList::countClient()
     return client_list.size();
 }
 
-unsigned AppList::currentSequenceNumber(){
+unsigned AppList::currentSequenceNumber()
+{
     return current_seq;
 }
 
 // Is this function necessary ?
-unsigned AppList::getSequenceNumber(const string &appid){
-    for(const auto& x : req_list){
+unsigned AppList::getSequenceNumber(const string &appid)
+{
+    for (const auto &x : req_list)
+    {
         // Since app will not request twice and more, comparing appid is enough?
-        if( (x.trigger.appid == appid))
+        if ((x.trigger.appid == appid))
         {
             return x.seq_num;
         }
@@ -81,11 +108,14 @@ unsigned AppList::getSequenceNumber(const string &appid){
     return 0;
 }
 
-unsigned AppList::addAllocateRequest(WMRequest req){
-    if(req_list.size() == 0){
+unsigned AppList::addAllocateRequest(WMRequest req)
+{
+    if (req_list.size() == 0)
+    {
         req.seq_num = current_seq;
     }
-    else{
+    else
+    {
         HMI_SEQ_DEBUG(current_seq, "real: %d", req_list.back().seq_num + 1);
         req.seq_num = req_list.back().seq_num + 1;
     }
@@ -93,12 +123,15 @@ unsigned AppList::addAllocateRequest(WMRequest req){
     return req.seq_num; // return 1; if you test time_expire
 }
 
-bool AppList::requestFinished(){
+bool AppList::requestFinished()
+{
     return req_list.empty();
 }
 
-struct WMTrigger AppList::getRequest(unsigned req_num){
-    for(auto& x : req_list){
+struct WMTrigger AppList::getRequest(unsigned req_num)
+{
+    for (auto &x : req_list)
+    {
         if (req_num == x.seq_num)
         {
             return x.trigger;
@@ -106,7 +139,8 @@ struct WMTrigger AppList::getRequest(unsigned req_num){
     }
 }
 
-const vector<struct WMAction>& AppList::getActions(unsigned req_num){
+const vector<struct WMAction> &AppList::getActions(unsigned req_num)
+{
     for (auto &x : req_list)
     {
         if (req_num == x.seq_num)
@@ -116,8 +150,9 @@ const vector<struct WMAction>& AppList::getActions(unsigned req_num){
     }
 }
 
-bool AppList::setAction(unsigned req_num, const struct WMAction &action){
-    bool result = false;
+WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
+{
+    WMError result = WMError::FAIL;
     for (auto &x : req_list)
     {
         if (req_num != x.seq_num)
@@ -125,16 +160,17 @@ bool AppList::setAction(unsigned req_num, const struct WMAction &action){
             continue;
         }
         x.sync_draw_req.push_back(action);
-        result = true;
+        result = WMError::SUCCESS;
         break;
     }
 
     return result;
 }
 
-bool AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, bool visible){
-    bool result = false;
-    for (auto& x : req_list)
+WMError AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, bool visible)
+{
+    WMError result = WMError::NOT_REGISTERED;
+    for (auto &x : req_list)
     {
         if (req_num != x.seq_num)
         {
@@ -143,15 +179,16 @@ bool AppList::setAction(unsigned req_num, const string &appid, const string &rol
         WMAction action{appid, role, area, visible, false};
 
         x.sync_draw_req.push_back(action);
-        result = true;
+        result = WMError::SUCCESS;
         break;
     }
     return result;
 }
 
-bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const string &role){
+bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const string &role)
+{
     bool result = false;
-    for (auto& x : req_list)
+    for (auto &x : req_list)
     {
         if (req_num < x.seq_num)
         {
@@ -159,7 +196,8 @@ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const st
         }
         if (req_num == x.seq_num)
         {
-            for(auto& y : x.sync_draw_req){
+            for (auto &y : x.sync_draw_req)
+            {
                 if (y.appid == appid && y.role == role)
                 {
                     y.end_draw_finished = true;
@@ -177,18 +215,23 @@ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const st
  * @param  unsigned sequence_num
  * @return true if all action is set.
  */
-bool AppList::endDrawFullfilled(unsigned req_num){
+bool AppList::endDrawFullfilled(unsigned req_num)
+{
     bool result = false;
-    for (const auto& x : req_list)
+    for (const auto &x : req_list)
     {
-        if(req_num < x.seq_num){
+        if (req_num < x.seq_num)
+        {
             break;
         }
-        if(req_num == x.seq_num){
+        if (req_num == x.seq_num)
+        {
             result = true;
-            for(const auto& y : x.sync_draw_req){
+            for (const auto &y : x.sync_draw_req)
+            {
                 result &= y.end_draw_finished;
-                if(!result){
+                if (!result)
+                {
                     break;
                 }
             }
@@ -197,14 +240,16 @@ bool AppList::endDrawFullfilled(unsigned req_num){
     return result;
 }
 
-void AppList::removeRequest(unsigned req_seq){
+void AppList::removeRequest(unsigned req_seq)
+{
     req_list.erase(remove_if(req_list.begin(), req_list.end(),
-        [req_seq](WMRequest x) {
-            return x.seq_num == req_seq;
-        }));
+                             [req_seq](WMRequest x) {
+                                 return x.seq_num == req_seq;
+                             }));
 }
 
-void AppList::next(){
+void AppList::next()
+{
     ++this->current_seq;
     if (0 == this->current_seq)
     {
@@ -212,15 +257,18 @@ void AppList::next(){
     }
 }
 
-bool AppList::haveRequest(){
+bool AppList::haveRequest()
+{
     return !req_list.empty();
 }
 
-void AppList::client_dump(){
+void AppList::client_dump()
+{
     DUMP("======= client dump =====");
-    for(const auto& x : client_list){
-        const auto& y = x.second;
-        DUMP("APPID : %s", y->appID().c_str());
+    for (const auto &x : client_list)
+    {
+        const auto &y = x.second;
+        y->dumpInfo();
     }
     DUMP("======= client dump end=====");
 }
@@ -229,7 +277,8 @@ void AppList::req_dump()
 {
     DUMP("======= req dump =====");
     DUMP("current request : %d", current_seq);
-    for(const auto& x : req_list){
+    for (const auto &x : req_list)
+    {
         DUMP("requested with  : %d", x.seq_num);
         DUMP("Trigger : (APPID :%s, ROLE :%s, AREA :%s, TASK: %d)",
              x.trigger.appid.c_str(),
@@ -237,7 +286,8 @@ void AppList::req_dump()
              x.trigger.area.c_str(),
              x.trigger.task);
 
-        for (const auto& y : x.sync_draw_req){
+        for (const auto &y : x.sync_draw_req)
+        {
             DUMP(
                 "Action  : (APPID :%s, ROLE :%s, AREA :%s, END_DRAW_FINISHED: %d)",
                 y.appid.c_str(),
@@ -248,4 +298,4 @@ void AppList::req_dump()
     }
     DUMP("======= req dump end =====\n");
 }
-}
\ No newline at end of file
+} // namespace wm
\ No newline at end of file