X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwm_client.hpp;h=65c68b9eb53f151b4572d188d6a7cfac21a93635;hb=b7957f3fc1e5f5ce0525d62c67da64457ef1d9e0;hp=0b5abe12dd382995f66776cf5700ad3148cc8265;hpb=741a9924776e40293b91eff00ec91d5a72f5da7f;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 0b5abe1..65c68b9 100644
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -20,6 +20,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+#include "wm_error.hpp"
 
 extern "C"
 {
@@ -42,21 +43,22 @@ class WMClient
     WMClient(const std::string &appid, unsigned layer,
             unsigned surface, const std::string &role);
     WMClient(const std::string &appid, const std::string &role);
+    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;
-    const std::string& getWMLayerName();
     unsigned surfaceID() const;
-    std::vector<unsigned> renderOrder() const;
-    std::string role(unsigned surface) const;
-    const std::vector<std::string> &roles() const;
-    void setRole(const std::string& role);
-    void registerLayer(unsigned layer);
-    bool addSurface(const std::string& role, unsigned surface);
+    // void setRole(const std::string& role);
+    // void appendRole(const std::string& role);
+    WMError addSurface(unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
-    bool removeRole(const std::string& role);
+    // bool removeRole(const std::string& role);
+    std::vector<unsigned> renderOrder() const;
+    WMError setRenderOrder(const std::vector<std::string>& order);
 
 #if GTEST_ENABLED
     bool subscribe(afb_req req, const std::string &event_name);
@@ -68,10 +70,10 @@ 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<std::string> role_list;
     std::vector<unsigned> surface_render_order;
     std::unordered_map<std::string, unsigned> service2surfaces;
     std::unordered_map<std::string, unsigned> role2surface;