Ensure wm_subscribe returns the correct value

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

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 53383fb..7df4dea 100644 (file)
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -20,6 +20,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+#include "util.hpp"
 #include "wm_error.hpp"
 
 extern "C"
@@ -30,11 +31,6 @@ extern "C"
 namespace wm
 {
 
-enum WM_CLIENT_ERROR_EVENT
-{
-    UNKNOWN_ERROR
-};
-
 class WMClient
 {
   public:
@@ -49,18 +45,27 @@ class WMClient
 
     std::string appID() const;
     std::string role() const;
+    void setRole(const std::string& role);
     unsigned layerID() const;
+    void setLayerID(unsigned id);
     unsigned surfaceID() const;
     void registerSurface(unsigned surface);
+    void activate();
+    void deactivate();
+    std::string area() const {return this->app_area;};
+    void setArea(const std::string area) {this->app_area = area;}
     WMError addSurface(unsigned surface);
     bool isSourceSizeSet();
     void setSurfaceSizeCorrectly();
+    bool isActive() { return this->is_active;}
     bool removeSurfaceIfExist(unsigned surface);
 
-#if GTEST_ENABLED
     bool subscribe(afb_req_t req, const std::string &event_name);
-    void emitError(WM_CLIENT_ERROR_EVENT ev);
-#endif
+    void emitActive(bool active);
+    void emitVisible(bool visible);
+    void emitSyncDraw(const std::string& area, struct rect& r);
+    void emitFlushDraw();
+    void emitError(WMError error);
 
     void dumpInfo();
 
@@ -68,16 +73,17 @@ class WMClient
     std::string id;
     unsigned layer;
     bool is_source_set;
+    bool is_active;
     std::string main_role;
-    std::string area;
+    std::string app_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;
+    std::unordered_map<std::string, std::string> evname2afb_event;
 #else
-    std::unordered_map<std::string, afb_event_t> evname2list;
+    std::unordered_map<std::string, afb_event_t> evname2afb_event;
 #endif
 };
 } // namespace wm