Revert "Add PolicyManager as plugin"

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

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index ea4d56e..0fb1805 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef TMCAGLWM_APP_HPP
-#define TMCAGLWM_APP_HPP
+#ifndef WINDOW_MANAGER_HPP
+#define WINDOW_MANAGER_HPP
 
-#include <json-c/json.h>
 #include <atomic>
 #include <memory>
 #include <unordered_map>
@@ -30,6 +29,8 @@
 #include "request.hpp"
 #include "wm_error.hpp"
 
+struct json_object;
+
 namespace wl
 {
 struct display;
@@ -64,6 +65,7 @@ extern const char kKeyWidthPixel[];
 extern const char kKeyHeightPixel[];
 extern const char kKeyWidthMm[];
 extern const char kKeyHeightMm[];
+extern const char kKeyIds[];
 
 struct id_allocator
 {
@@ -152,6 +154,8 @@ class WindowManager
         Event_SyncDraw,
         Event_FlushDraw,
 
+        Event_ScreenUpdated,
+
         Event_Error,
 
         Event_Val_Max = Event_Error,
@@ -162,8 +166,9 @@ class WindowManager
         "inactive",
         "visible",
         "invisible",
-        "syncdraw",
-        "flushdraw",
+        "syncDraw",
+        "flushDraw",
+        "screenUpdated",
         "error"};
 
     struct controller_hooks chooks;
@@ -241,6 +246,8 @@ class WindowManager
     void emit_invisible(char const *label);
     void emit_visible(char const *label);
 
+    void activate(int id);
+    void deactivate(int id);
     WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
                              Task task, unsigned *req_num);
     WMError doTransition(unsigned sequence_number);
@@ -253,20 +260,27 @@ class WindowManager
     WMError visibilityChange(const WMAction &action);
     WMError setSurfaceSize(unsigned surface, const std::string& area);
     WMError changeCurrentState(unsigned req_num);
+    void    emitScreenUpdated(unsigned req_num);
 
     void setTimer();
     void stopTimer();
     void processNextRequest();
 
+    int loadOldRoleDb();
+    const char* convertRoleOldToNew(char const *drawing_name);
+
     const char *check_surface_exist(const char *drawing_name);
-    void activate(int id);
-    void deactivate(int id);
+
     bool can_split(struct LayoutState const &state, int new_id);
 
   private:
     std::unordered_map<std::string, struct compositor::rect> area2size;
+    std::unordered_map<std::string, std::string> roleold2new;
+    std::unordered_map<std::string, std::string> rolenew2old;
+
+    static const char* kDefaultOldRoleDb;
 };
 
 } // namespace wm
 
-#endif // TMCAGLWM_APP_HPP
+#endif // WINDOW_MANAGER_HPP