From 497463754856362822c9d7e3c6b082f0467478a0 Mon Sep 17 00:00:00 2001
From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Thu, 31 May 2018 19:13:33 +0900
Subject: Add new functions to windowmanager-client

Change-Id: Ib4d69d903469ed5f1a3d39553098f6995f593c59
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---
 src/windowmanager-client.cpp | 80 +++++++++++++++++++++++++++++++++++---------
 src/windowmanager-client.hpp | 13 +++----
 2 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/src/windowmanager-client.cpp b/src/windowmanager-client.cpp
index 55d9864..1bda793 100644
--- a/src/windowmanager-client.cpp
+++ b/src/windowmanager-client.cpp
@@ -13,29 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <iostream> // for debug
-using std::cerr;    //debug
-using std::cout;    //debug
-using std::endl;    //debug
+
 #include "windowmanager-client.hpp"
+#include "hmi-debug.h"
+
+#define INVALID_SURFACE_ID 0
+
+using std::string;
+using std::vector;
 
 namespace wm
 {
 
-using std::string;
 
-const std::vector<std::string> wm_events = {
+const vector<string> wm_events = {
     // Private event for applications
-    "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive"};
+    "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"};
+
+static const char key_drawing_name[] = "drawing_name";
+static const char key_role[] = "role";
 
 WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role)
-    : id(appid),
-      layer(layerID),
-      roles(0),
-      surfaces(0)
+    : layer(layerID),
+      id(appid),
+      role2surface(0)
 {
-    roles.push_back(role);
-    surfaces.push_back(surfaceID);
+    role2surface[role] = surfaceID;
     for (auto x : wm_events)
     {
 #if GTEST_ENABLED
@@ -50,11 +53,10 @@ WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, co
 WMClient::WMClient(const string &appid, const string &role)
     : id(appid),
       layer(0),
-      roles(0),
-      surfaces(0),
+      role2surface(0),
       event_list(0)
 {
-    roles.push_back(role);
+    role2surface[role] = INVALID_SURFACE_ID;
     for (auto x : wm_events)
     {
 #if GTEST_ENABLED
@@ -75,4 +77,50 @@ string WMClient::appID()
     return this->id;
 }
 
+void WMClient::registerLayer(unsigned layerID)
+{
+    this->layer = layerID;
+}
+
+bool WMClient::addSurface(const string &role, unsigned surface)
+{
+    HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface);
+    if(0 != role2surface.count(role)){
+        HMI_NOTICE("wm", "override surfaceID %d with %d", role2surface[role], surface);
+    }
+    role2surface[role] = surface;
+    return true;
+}
+
+bool WMClient::removeSurfaceIfExist(unsigned surfaceID){
+    bool ret = false;
+    for (auto &x : role2surface)
+    {
+        if(surfaceID == x.second){
+            role2surface.erase(x.first);
+            ret = true;
+            break;
+        }
+    }
+    return ret;
+}
+
+bool WMClient::removeRole(const string& role){
+    bool ret = false;
+    if (role2surface.count(role) != 0)
+    {
+        role2surface.erase(role);
+        ret = true;
+    }
+    return ret;
+}
+
+void WMClient::dumpInfo(){
+    DUMP("APPID : %s", id.c_str());
+    DUMP("  LAYER : %d", layer);
+    for(const auto& x : role2surface){
+        DUMP("  ROLE  : %s , SURFACE : %d", x.first.c_str(), x.second);
+    }
+}
+
 } // namespace wm
\ No newline at end of file
diff --git a/src/windowmanager-client.hpp b/src/windowmanager-client.hpp
index 833187a..33024b0 100644
--- a/src/windowmanager-client.hpp
+++ b/src/windowmanager-client.hpp
@@ -39,22 +39,23 @@ class WMClient
     virtual ~WMClient();
 
     std::string appID();
-    //WMClient::WMClient(const WMClient &obj);
-    /* const std::vector<optional<unsigned>> surfaceIDList();
-    optional<unsigned> surfaceID(role); */
+    void registerLayer(unsigned layerID);
+    bool addSurface(const std::string& role, unsigned surface);
+    bool removeSurfaceIfExist(unsigned surfaceID);
+    bool removeRole(const std::string& role);
+
+    void dumpInfo();
 
   private:
     unsigned layer;
-    std::vector<unsigned> surfaces;
     std::string id;
-    std::vector<std::string> roles;
+    std::unordered_map<std::string, unsigned> role2surface;
 #if GTEST_ENABLED
     // This is for unit test. afb_make_event occurs sig11 if call not in afb-binding
     std::unordered_map<std::string, std::string> event_list;
 #else
     std::unordered_map<std::string, struct afb_event> event_list;
 #endif
-    //std::vector<Task *> requestingTask;
 };
 } // namespace wm
 
-- 
cgit 1.2.3-korg