Update windowmanager

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

diff --git a/src/applist.cpp b/src/applist.cpp
index fe9832f..644e41e 100644 (file)
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <algorithm>
 #include "applist.hpp"
-#include "../include/hmi-debug.h"
+#include "util.hpp"
 
 using std::shared_ptr;
 using std::string;
@@ -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
  *
@@ -82,7 +90,7 @@ void AppList::removeClient(const string &appid)
 {
     std::lock_guard<std::mutex> lock(this->mtx);
     this->app2client.erase(appid);
-    HMI_INFO("wm", "Remove client %s", appid.c_str());
+    HMI_INFO("Remove client %s", appid.c_str());
 }
 
 /**
@@ -111,7 +119,7 @@ void AppList::removeSurface(unsigned surface){
     {
         ret = x.second->removeSurfaceIfExist(surface);
         if(ret){
-            HMI_DEBUG("wm", "remove surface %d from Client %s finish",
+            HMI_DEBUG("remove surface %d from Client %s finish",
                         surface, x.second->appID().c_str());
             break;
         }
@@ -189,7 +197,7 @@ WMError AppList::popFloatingSurface(unsigned pid, unsigned *surface)
                                     });
     if (fwd_itr != this->floating_surfaces.cend())
     {
-        HMI_INFO("wm", "pop floating surface: %d", *surface);
+        HMI_INFO("pop floating surface: %d", *surface);
     }
     this->floating_surfaces.erase(fwd_itr, this->floating_surfaces.end());
     return ret;
@@ -199,7 +207,7 @@ WMError AppList::popFloatingSurface(unsigned pid, unsigned *surface)
 
 WMError AppList::popFloatingSurface(const string &appid, unsigned *surface)
 {
-    HMI_ERROR("wm", "This function is not implemented");
+    HMI_ERROR("This function is not implemented");
     return WMError::SUCCESS;
 }
 
@@ -223,21 +231,20 @@ void AppList::removeFloatingSurface(unsigned surface)
             return x.surface_id == surface;
         });
     if(fwd_itr != this->floating_surfaces.cend()){
-        HMI_INFO("wm", "remove floating surface: %d", surface);
+        HMI_INFO("remove floating surface: %d", 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("wm", "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;
 }