X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwm_client.hpp;h=623d34fccd83bffc642b78bbfe57ca9afda748de;hb=refs%2Fheads%2Fsandbox%2Fruke47%2Flifecycle;hp=0d6faeb25ee9362d5f835877bd70c28de8c78ef9;hpb=847dde9621cef9b9a44eda95c63c0fe3f528468d;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 0d6faeb..623d34f 100644
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -20,10 +20,10 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+#include "wm_error.hpp"
 
 extern "C"
 {
-#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 }
 
@@ -42,19 +42,20 @@ class WMClient
     WMClient(const std::string &appid, unsigned layer,
             unsigned surface, const std::string &role);
     WMClient(const std::string &appid, const std::string &role);
-    virtual ~WMClient();
+    WMClient(const std::string &appid, unsigned layer, const std::string &role);
+    WMClient(const std::string &appid, unsigned layer,
+        const std::string& layer_name, unsigned surface, const std::string &role);
+    ~WMClient() = default;
 
     std::string appID() const;
-    unsigned surfaceID(const std::string &role) const;
+    std::string role() const;
     unsigned layerID() const;
-    std::string role(unsigned surface) const;
-    void registerLayer(unsigned layer);
-    bool addSurface(const std::string& role, unsigned surface);
+    unsigned surfaceID() const;
+    WMError addSurface(unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
-    bool removeRole(const std::string& role);
 
-#ifndef GTEST_ENABLED
-    bool subscribe(afb_req req, const std::string &event_name);
+#if GTEST_ENABLED
+    bool subscribe(afb_req_t req, const std::string &event_name);
     void emitError(WM_CLIENT_ERROR_EVENT ev);
 #endif
 
@@ -63,14 +64,18 @@ class WMClient
   private:
     std::string id;
     unsigned layer;
+    std::string main_role;
+    std::string area;
+    unsigned surface; // currently, main application has only one surface.
+    //std::vector<std::string> role_list;
     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> event2list;
 #else
-    std::unordered_map<std::string, struct afb_event> event2list;
+    std::unordered_map<std::string, afb_event_t> evname2list;
 #endif
 };
 } // namespace wm
 
-#endif
\ No newline at end of file
+#endif