X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapplist.hpp;h=bb80961ff67d7dbb2cd0db82dea3706f87365879;hb=7f6ceaf920b5cb0d5984b8e8294f8ce0f52dfbbb;hp=f91e7c89f1661abd1b4051c7887de7aaad9c6531;hpb=6d0e22de7814f4fbf2201d84d207eec570e821cd;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/applist.hpp b/src/applist.hpp
index f91e7c8..bb80961 100644
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -21,85 +21,58 @@
 #include <map>
 #include <memory>
 //#include <experimental/optional>
-#include "windowmanager-client.hpp"
+#include "wm-client.hpp"
+#include "request.hpp"
 
-namespace wm {
+namespace wm
+{
 
 /* using std::experimental::nullopt;
 using std::experimental::optional; */
 
-typedef enum Task{
-    TASK_ALLOCATE,
-    TASK_RELEASE
-}ResourceTask;
-
-struct WMTrigger {
-    std::string appid;
-    std::string role;
-    std::string area;
-    Task task;
-};
-
-struct WMAction
-{
-    std::string appid;
-    std::string role;
-    std::string area;
-    bool end_draw_finished;
-};
-
-struct WMRequest
+class AppList
 {
-    WMRequest();
-    explicit WMRequest(std::string appid, std::string role,
-        std::string area, ResourceTask task);
-    virtual ~WMRequest();
-    WMRequest(const WMRequest &obj);
-
-    unsigned seq_num;
-    struct WMTrigger trigger;
-    std::vector<struct WMAction> sync_draw_req;
-};
-
-class  AppList {
-public:
+  public:
     AppList();
     virtual ~AppList();
     AppList(const AppList &obj) = delete;
 
     // Client Database Interface
     void addClient(const std::string &appid, const std::string &role);
+    void addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role);
     void removeClient(const std::string &appid);
-    bool contains(const std::string &appid);
-    int  countClient();
+    bool contains(const std::string &appid) const;
+    int  countClient() const;
     std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
+    void removeSurface(unsigned surface);
 
     // Request Interface
-    unsigned currentSequenceNumber();
-    unsigned getSequenceNumber(const std::string &appid);
+    unsigned currentRequestNumber() const;
+    unsigned getRequestNumber(const std::string &appid) const;
     unsigned addAllocateRequest(WMRequest req);
     /* TODO: consider, which is better WMClient or std::string appid?
     if appid is key to manage resources, it is better to select std::string
     otherwise WMClient is better, IMO */
-    bool     requestFinished();
-    bool     setAction(unsigned request_seq, const std::string &appid, const std::string &role, const std::string &area);
-    bool     setEndDrawFinished(unsigned request_seq, const std::string &appid, const std::string &role);
-    bool     endDrawFullfilled(unsigned request_seq);
-    void     removeRequest(unsigned request_seq);
-    void     next();
-    bool     haveRequest();
+    bool requestFinished() const;
+    bool setAction(unsigned req_num, const struct WMAction &action);
+    bool setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
+    bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);
+    bool endDrawFullfilled(unsigned req_num);
+    void removeRequest(unsigned req_num);
+    void next();
+    bool haveRequest() const;
 
-    struct WMTrigger getRequest(unsigned request_seq);
-    const std::vector<struct WMAction>& getActions(unsigned request_seq);
+    struct WMTrigger getRequest(unsigned req_num);
+    const std::vector<struct WMAction> &getActions(unsigned req_num);
 
-    void    client_dump();
-    void    req_dump();
+    void clientDump();
+    void reqDump();
 
-private:
-  std::vector<WMRequest> req_list;
-  std::unordered_map<std::string, std::shared_ptr<WMClient>> client_list;
-  unsigned current_seq;
+  private:
+    std::vector<WMRequest> req_list;
+    std::unordered_map<std::string, std::shared_ptr<WMClient>> app2client;
+    unsigned current_req;
 };
 
-}
+} // namespace wm
 #endif // ALLOCATE_LIST_HPP
\ No newline at end of file