X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.hpp;h=b591149da2b1b7f6cfb45cf53a21700943429b17;hb=9fabd6550e183283363b61f71092477342a357d1;hp=7f9a3b825956e2c9c1b5374268ee7dfc888aa7e4;hpb=3d1703f9a5c9d6a356b561ea7528c70a1dc4fe2d;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index 7f9a3b8..b591149 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -21,13 +21,18 @@
 #include <memory>
 #include <unordered_map>
 #include <experimental/optional>
+#include "util.hpp"
 #include "controller_hooks.hpp"
-#include "layers.hpp"
+#include "wm_layer.hpp"
 #include "layout.hpp"
 #include "wayland_ivi_wm.hpp"
-#include "hmi-debug.h"
+#include "pm_wrapper.hpp"
 #include "request.hpp"
 #include "wm_error.hpp"
+extern "C"
+{
+#include <afb/afb-binding.h>
+}
 
 struct json_object;
 
@@ -65,6 +70,7 @@ extern const char kKeyWidthPixel[];
 extern const char kKeyHeightPixel[];
 extern const char kKeyWidthMm[];
 extern const char kKeyHeightMm[];
+extern const char kKeyScale[];
 extern const char kKeyIds[];
 
 struct id_allocator
@@ -86,7 +92,7 @@ struct id_allocator
         unsigned sid = this->next++;
         this->id2name[sid] = name;
         this->name2id[name] = sid;
-        HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str());
+        HMI_DEBUG("allocated new id %u with name %s", sid, name.c_str());
         return sid;
     }
 
@@ -95,7 +101,7 @@ struct id_allocator
     {
         this->id2name[sid] = name;
         this->name2id[name] = sid;
-        HMI_DEBUG("wm", "register id %u with name %s", sid, name.c_str());
+        HMI_DEBUG("register id %u with name %s", sid, name.c_str());
         return;
     }
 
@@ -226,8 +232,11 @@ class WindowManager
     void removeClient(const std::string &appid);
     void exceptionProcessForTransition();
     const char* convertRoleOldToNew(char const *role);
+
     // Do not use this function
     void timerHandler();
+    void startTransitionWrapper(std::vector<WMAction> &actions);
+    void processError(WMError error);
 
   private:
     bool pop_pending_events();
@@ -254,13 +263,11 @@ class WindowManager
     WMError doTransition(unsigned sequence_number);
     WMError checkPolicy(unsigned req_num);
     WMError startTransition(unsigned req_num);
-    WMError setInvisibleTask(const std::string &role, bool split);
 
     WMError doEndDraw(unsigned req_num);
     WMError layoutChange(const WMAction &action);
     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();
@@ -271,13 +278,13 @@ class WindowManager
 
     const char *check_surface_exist(const char *role);
 
-    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;
 
+    PMWrapper pmw;
+
     static const char* kDefaultOldRoleDb;
 };