X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.hpp;h=759135793108a80cb0c1d208c89007b679d9f6c4;hb=c3291c967516a188789a860821471d8c872fbb47;hp=3ad9cc738b6423a2f5f8ece0d670c1dd5a060e54;hpb=9d8002a41299d8755ed548f96be89eefe660c1bd;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.hpp b/src/window_manager.hpp index 3ad9cc7..7591357 100644 --- a/src/window_manager.hpp +++ b/src/window_manager.hpp @@ -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 +} 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 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); @@ -279,7 +285,7 @@ class WindowManager std::unordered_map area2size; std::unordered_map roleold2new; std::unordered_map rolenew2old; - + std::shared_ptr lm; PMWrapper pmw; static const char* kDefaultOldRoleDb;