X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=ac3050b75264eeae998b56b8312b709c5ed80ff7;hb=7a4a02d048910615cb15c26fc5534ad471a8d5ac;hp=d0d79306060effc257037278c1ae24a6dfd0de63;hpb=c2110a3ec8fa74f2fc37e4909db547aa4a36c851;p=apps%2Fagl-service-windowmanager.git diff --git a/src/main.cpp b/src/main.cpp index d0d7930..ac3050b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,10 +31,16 @@ typedef struct WMClientCtxt { std::string name; std::string role; + void* lcm_obs_ctx; // POI: LCM + WMClientCtxt(const char *appName, const char* appRole) + : name(appName), role(appRole), lcm_obs_ctx(nullptr) {}; + WMClientCtxt() : lcm_obs_ctx(nullptr) {}; + + void set_name_role(const char *appName, const char* appRole) { - name = appName; - role = appRole; + name = appName; + role = appRole; } } WMClientCtxt; @@ -56,7 +62,7 @@ int afb_instance::init() return this->wmgr.init(); } -int _binding_init() +static int _binding_init() { HMI_NOTICE("WinMan ver. %s", WINMAN_VERSION_STRING); @@ -78,7 +84,7 @@ error: return -1; } -int binding_init() noexcept +static int binding_init (afb_api_t api) noexcept { try { @@ -98,33 +104,49 @@ static void cbRemoveClientCtxt(void *data) { return; } - HMI_DEBUG("remove app %s", ctxt->name.c_str()); - // Policy Manager does not know this app was killed, - // so notify it by deactivate request. - g_afb_instance->wmgr.api_deactivate_window( - ctxt->name.c_str(), ctxt->role.c_str(), - [](const char *) {}); + if (!ctxt->name.empty()) { + HMI_DEBUG("remove app %s", ctxt->name.c_str()); + + // Policy Manager does not know this app was killed, + // so notify it by deactivate request. + g_afb_instance->wmgr.api_deactivate_window( + ctxt->name.c_str(), ctxt->role.c_str(), + [](const char *) {}); + + g_afb_instance->wmgr.removeClient(ctxt->name); + } + + // POI: LCM + g_afb_instance->wmgr.amgr.lcm_clear_context(ctxt->lcm_obs_ctx); - g_afb_instance->wmgr.removeClient(ctxt->name); delete ctxt; } -static void createSecurityContext(afb_req req, const char* appid, const char* role) +static WMClientCtxt* getWMClientContext(afb_req_t req) { - WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req); - if (!ctxt) - { + WMClientCtxt *ctx = static_cast(afb_req_context_get(req)); + if (!ctx) { // Create Security Context at first time - const char *new_role = g_afb_instance->wmgr.convertRoleOldToNew(role); - WMClientCtxt *ctxt = new WMClientCtxt(appid, new_role); - HMI_DEBUG("create session for %s", ctxt->name.c_str()); + ctx = new WMClientCtxt(); + HMI_DEBUG("create session without name & role"); afb_req_session_set_LOA(req, 1); - afb_req_context_set(req, ctxt, cbRemoveClientCtxt); + afb_req_context_set(req, ctx, cbRemoveClientCtxt); } + return ctx; } -void windowmanager_requestsurface(afb_req req) noexcept +static void createSecurityContext(afb_req_t req, const char* appid, const char* role) +{ + WMClientCtxt *ctx = getWMClientContext(req); + if (ctx && ctx->name.empty()) + { + HMI_DEBUG("create session for name=\"%s\" & role=\"role\"", appid, role); + ctx->set_name_role(appid, role); + } +} + +void windowmanager_requestsurface(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -170,7 +192,7 @@ void windowmanager_requestsurface(afb_req req) noexcept } } -void windowmanager_requestsurfacexdg(afb_req req) noexcept +void windowmanager_requestsurfacexdg(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -223,7 +245,7 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept } } -void windowmanager_activatewindow(afb_req req) noexcept +void windowmanager_activatewindow(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -273,7 +295,7 @@ void windowmanager_activatewindow(afb_req req) noexcept } } -void windowmanager_deactivatewindow(afb_req req) noexcept +void windowmanager_deactivatewindow(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -316,7 +338,7 @@ void windowmanager_deactivatewindow(afb_req req) noexcept } } -void windowmanager_enddraw(afb_req req) noexcept +void windowmanager_enddraw(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -350,7 +372,7 @@ void windowmanager_enddraw(afb_req req) noexcept } } -void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept +void windowmanager_getdisplayinfo_thunk(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -377,7 +399,7 @@ void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept } } -void windowmanager_getareainfo_thunk(afb_req req) noexcept +void windowmanager_getareainfo_thunk(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -414,7 +436,7 @@ void windowmanager_getareainfo_thunk(afb_req req) noexcept } } -void windowmanager_wm_subscribe(afb_req req) noexcept +void windowmanager_wm_subscribe(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -449,7 +471,7 @@ void windowmanager_wm_subscribe(afb_req req) noexcept } } -void windowmanager_ping(afb_req req) noexcept +void windowmanager_ping(afb_req_t req) noexcept { std::lock_guard guard(binding_m); @@ -464,7 +486,7 @@ void windowmanager_ping(afb_req req) noexcept } } -void windowmanager_debug_terminate(afb_req req) noexcept +void windowmanager_debug_terminate(afb_req_t req) noexcept { std::lock_guard guard(binding_m); if (g_afb_instance == nullptr) @@ -491,18 +513,108 @@ void windowmanager_debug_terminate(afb_req req) noexcept } } -const struct afb_verb_v2 windowmanager_verbs[] = { - {"requestSurface", windowmanager_requestsurface, nullptr, nullptr, AFB_SESSION_NONE}, - {"requestSurfaceXDG", windowmanager_requestsurfacexdg, nullptr, nullptr, AFB_SESSION_NONE}, - {"activateWindow", windowmanager_activatewindow, nullptr, nullptr, AFB_SESSION_NONE}, - {"deactivateWindow", windowmanager_deactivatewindow, nullptr, nullptr, AFB_SESSION_NONE}, - {"endDraw", windowmanager_enddraw, nullptr, nullptr, AFB_SESSION_NONE}, - {"getDisplayInfo", windowmanager_getdisplayinfo_thunk, nullptr, nullptr, AFB_SESSION_NONE}, - {"getAreaInfo", windowmanager_getareainfo_thunk, nullptr, nullptr, AFB_SESSION_NONE}, - {"wm_subscribe", windowmanager_wm_subscribe, nullptr, nullptr, AFB_SESSION_NONE}, - {"ping", windowmanager_ping, nullptr, nullptr, AFB_SESSION_NONE}, - {"debug_terminate", windowmanager_debug_terminate, nullptr, nullptr, AFB_SESSION_NONE}, - {}}; - -extern "C" const struct afb_binding_v2 afbBindingV2 = { - "windowmanager", nullptr, nullptr, windowmanager_verbs, nullptr, binding_init, nullptr, 0}; +/* AGL Lifecycle Management API */ +static void lcm_register_activity_observer (afb_req_t req) +{ + std::lock_guard guard(binding_m); + if (g_afb_instance == nullptr) { + afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); + return; + } + + WMClientCtxt* wc_ctx = getWMClientContext(req); + if (wc_ctx == nullptr) { + afb_req_fail(req, "failed", "WMClientCtxt cannot create."); + } else { + // register new activity observer + // { + // id: "app id of target to observe", + // type: "type of lifecycle, APP, HMI or GUI to observe", + // filter: { states which observer wants to know } + // } + g_afb_instance->wmgr.amgr.api_register_activity_observer(req, wc_ctx->lcm_obs_ctx); + afb_req_success(req, NULL, "success"); + } +} + +static void lcm_unregister_activity_observer (afb_req_t req) +{ + std::lock_guard guard(binding_m); + if (g_afb_instance == nullptr) + { + afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); + return; + } + + WMClientCtxt* wc_ctx = getWMClientContext(req); + if (wc_ctx == nullptr) { + afb_req_fail(req, "failed", "WMClientCtxt not exsit."); + return; + } + + // unregister activity observer + // { + // id: "uniq id of observer" + // } + g_afb_instance->wmgr.amgr.api_unregister_activity_observer(req, wc_ctx->lcm_obs_ctx); + + afb_req_success(req, NULL, "success"); +} + +static void lcm_get_activity_status(afb_req_t req) +{ + std::lock_guard guard(binding_m); + + if (g_afb_instance == nullptr) { + afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); + } else { + json_object *object = afb_req_json(req); + json_object *j_target = nullptr; + if (!json_object_object_get_ex(object, "target", &j_target)) { + afb_req_fail(req, "failed", "Need const char* argument target"); + return; + } + + const char *target_id = json_object_get_string(j_target); + + auto ret = g_afb_instance->wmgr.amgr.api_get_activity_status(target_id); + + if (ret.is_err()) { + afb_req_fail(req, "failed", ret.unwrap_err()); + } else { + afb_req_success(req, ret.unwrap(), "success"); + } + } +} + +const afb_verb_t windowmanager_verbs[] = { + { .verb = "requestSurface", .callback = windowmanager_requestsurface }, + { .verb = "requestSurfaceXDG", .callback = windowmanager_requestsurfacexdg }, + { .verb = "activateWindow", .callback = windowmanager_activatewindow }, + { .verb = "deactivateWindow", .callback = windowmanager_deactivatewindow }, + { .verb = "endDraw", .callback = windowmanager_enddraw }, + { .verb = "getDisplayInfo", .callback = windowmanager_getdisplayinfo_thunk }, + { .verb = "getAreaInfo", .callback = windowmanager_getareainfo_thunk }, + { .verb = "wm_subscribe", .callback = windowmanager_wm_subscribe }, + { .verb = "ping", .callback = windowmanager_ping }, + { .verb = "debug_terminate", .callback = windowmanager_debug_terminate }, + /* AGL Lifecycle Management API */ + { .verb = "registerActivityObserver", .callback = lcm_register_activity_observer }, + { .verb = "unregisterActivityObserver", .callback = lcm_unregister_activity_observer }, + { .verb = "getActivityStatus", .callback = lcm_get_activity_status }, + {} }; + +extern "C" const afb_binding_t afbBindingExport = { + .api = "windowmanager", + .specification = "windowmanager", + .info = "windowmanager", + .verbs = windowmanager_verbs, + .preinit = nullptr, + .init = binding_init, + .onevent = nullptr, + .userdata = nullptr, + .provide_class = nullptr, + .require_class = nullptr, + .require_api = nullptr, + .noconcurrency = 0 +};