Remove wm_layer_name in wm_client

[apps/agl-service-windowmanager.git] / src / wm_client.hpp

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 0268807..4bc9421 100644 (file)
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -42,17 +42,21 @@ 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;
     unsigned layerID() const;
-    const std::string& getWMLayerName();
     unsigned surfaceID() const;
     std::vector<unsigned> renderOrder() const;
+    std::string role(unsigned surface) const;
+    std::string role() const;
     const std::vector<std::string> &roles() const;
     void setRole(const std::string& role);
-    void registerLayer(unsigned layer);
+    void appendRole(const std::string& role);
     bool addSurface(const std::string& role, unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
     bool removeRole(const std::string& role);
@@ -67,17 +71,18 @@ class WMClient
   private:
     std::string id;
     unsigned layer;
-    std::string wm_layer_name;
+    std::string main_role;
     std::string area;
     unsigned surface; // currently, main application has only one surface.
     std::vector<std::string> role_list;
     std::vector<unsigned> surface_render_order;
     std::unordered_map<std::string, unsigned> service2surfaces;
+    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;
+    std::unordered_map<std::string, std::string> evname2afb_event;
 #else
-    std::unordered_map<std::string, struct afb_event> event2list;
+    std::unordered_map<std::string, struct afb_event> evname2afb_event;
 #endif
 };
 } // namespace wm