X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fwindow_manager.hpp;h=759135793108a80cb0c1d208c89007b679d9f6c4;hb=4ba2fdbfb065c971f4a0b9b1dbab8957e7fba38d;hp=6cbd355c51a902d1f161ea18c3f5192c2e0c9321;hpb=c1d85371b1eb693128cf9553c356ea77e609d9a3;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index 6cbd355..7591357 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TMCAGLWM_APP_HPP
-#define TMCAGLWM_APP_HPP
+#ifndef WINDOW_MANAGER_HPP
+#define WINDOW_MANAGER_HPP
 
 #include <atomic>
 #include <memory>
@@ -26,9 +26,14 @@
 #include "layout.hpp"
 #include "wayland_ivi_wm.hpp"
 #include "pm_wrapper.hpp"
-#include "hmi-debug.h"
+#include "util.hpp"
 #include "request.hpp"
 #include "wm_error.hpp"
+#include "wm_layer_control.hpp"
+extern "C"
+{
+#include <afb/afb-binding.h>
+}
 
 struct json_object;
 
@@ -88,7 +93,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;
     }
 
@@ -97,7 +102,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;
     }
 
@@ -212,6 +217,7 @@ class WindowManager
 
     result<int> api_request_surface(char const *appid, char const *role);
     char const *api_request_surface(char const *appid, char const *role, char const *ivi_id);
+    bool api_set_role(char const *appid, char const *role, unsigned pid);
     void api_activate_surface(char const *appid, char const *role, char const *drawing_area, const reply_func &reply);
     void api_deactivate_surface(char const *appid, char const *role, const reply_func &reply);
     void api_enddraw(char const *appid, char const *role);
@@ -224,6 +230,7 @@ class WindowManager
     // Events from the compositor we are interested in
     void surface_created(uint32_t surface_id);
     void surface_removed(uint32_t surface_id);
+    void surface_properties(uint32_t surface_id, uint32_t pid);
 
     void removeClient(const std::string &appid);
     void exceptionProcessForTransition();
@@ -278,7 +285,7 @@ class WindowManager
     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;
-
+    std::shared_ptr<LayerControl> lm;
     PMWrapper pmw;
 
     static const char* kDefaultOldRoleDb;
@@ -286,4 +293,4 @@ class WindowManager
 
 } // namespace wm
 
-#endif // TMCAGLWM_APP_HPP
+#endif // WINDOW_MANAGER_HPP