Fix source rectangle changes every state change

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

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 0d6faeb..0173bb9 100644 (file)
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -42,18 +42,26 @@ 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() = default;
 
     std::string appID() const;
-    unsigned surfaceID(const std::string &role) const;
     unsigned layerID() const;
-    std::string role(unsigned surface) const;
+    unsigned surfaceID() const;
+    std::vector<unsigned> renderOrder() 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);
+    //bool addSurface(unsigned surface);
+    void attachServiceSurface(const std::string &name, unsigned surface);
+    void removeServiceSurface(const std::string &name);
+    void setRenderOrder();
+    void setRenderOrder(const std::vector<std::string> &render_order);
+    void setRenderOrder(const std::vector<unsigned> &render_order);
+    void setArea(const std::string& area);
     bool removeSurfaceIfExist(unsigned surface);
-    bool removeRole(const std::string& role);
+    void removeRole(const std::string& role);
 
-#ifndef GTEST_ENABLED
+#if GTEST_ENABLED
     bool subscribe(afb_req req, const std::string &event_name);
     void emitError(WM_CLIENT_ERROR_EVENT ev);
 #endif
@@ -63,12 +71,16 @@ class WMClient
   private:
     std::string id;
     unsigned layer;
-    std::unordered_map<std::string, unsigned> role2surface;
+    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;
 #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