{
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;
return this->wmgr.init();
}
-int _binding_init()
+static int _binding_init()
{
HMI_NOTICE("WinMan ver. %s", WINMAN_VERSION_STRING);
return -1;
}
-int binding_init() noexcept
+static int binding_init (afb_api_t api) noexcept
{
try
{
{
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_surface(
- 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<WMClientCtxt *>(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<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_requestsurfacexdg(afb_req req) noexcept
+void windowmanager_requestsurfacexdg(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_activatewindow(afb_req req) noexcept
+void windowmanager_activatewindow(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
char* appid = afb_req_get_application_id(req);
if(appid)
{
- g_afb_instance->wmgr.api_activate_surface(
+ g_afb_instance->wmgr.api_activate_window(
appid, a_drawing_name, a_drawing_area,
[&req](const char *errmsg) {
if (errmsg != nullptr)
}
}
-void windowmanager_deactivatewindow(afb_req req) noexcept
+void windowmanager_deactivatewindow(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
char* appid = afb_req_get_application_id(req);
if(appid)
{
- g_afb_instance->wmgr.api_deactivate_surface(
+ g_afb_instance->wmgr.api_deactivate_window(
appid, a_drawing_name,
[&req](const char *errmsg) {
if (errmsg != nullptr)
}
}
-void windowmanager_enddraw(afb_req req) noexcept
+void windowmanager_enddraw(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept
+void windowmanager_getdisplayinfo_thunk(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_getareainfo_thunk(afb_req req) noexcept
+void windowmanager_getareainfo_thunk(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_wm_subscribe(afb_req req) noexcept
+void windowmanager_wm_subscribe(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_list_drawing_names(afb_req req) noexcept
-{
- /* std::lock_guard<std::mutex> guard(binding_m);
-
- if (g_afb_instance == nullptr)
- {
- afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
- return;
- }
-
- try
- {
-
- nlohmann::json j = g_afb_instance->wmgr.id_alloc.name2id;
- auto ret = wm::Ok(json_tokener_parse(j.dump().c_str()));
- if (ret.is_err())
- {
- afb_req_fail(req, "failed", ret.unwrap_err());
- return;
- }
-
- afb_req_success(req, ret.unwrap(), "success");
- }
- catch (std::exception &e)
- {
- afb_req_fail_f(req, "failed", "Uncaught exception while calling list_drawing_names: %s", e.what());
- return;
- } */
- afb_req_success(req, NULL, "not-implemented");
-}
-
-void windowmanager_ping(afb_req req) noexcept
+void windowmanager_ping(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
}
}
-void windowmanager_debug_status(afb_req req) noexcept
+void windowmanager_debug_terminate(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-
- /* if (g_afb_instance == nullptr)
+ if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
try
{
- json_object *jr = json_object_new_object();
- json_object_object_add(jr, "surfaces",
- to_json(g_afb_instance->wmgr.controller->sprops));
- json_object_object_add(jr, "layers", to_json(g_afb_instance->wmgr.controller->lprops));
+ if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr)
+ {
+ raise(SIGKILL); // afb-daemon kills it's pgroup using TERM, which
+ // doesn't play well with perf
+ }
- afb_req_success(req, jr, "success");
+ afb_req_success(req, NULL, "success");
}
catch (std::exception &e)
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_status: %s", e.what());
+ afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_terminate: %s", e.what());
return;
- } */
- afb_req_fail(req, NULL, "not-implemented");
+ }
}
-void windowmanager_debug_layers(afb_req req) noexcept
+/* AGL Lifecycle Management API */
+static void lcm_register_activity_observer (afb_req_t req)
{
- /* std::lock_guard<std::mutex> guard(binding_m);
-
- if (g_afb_instance == nullptr)
- {
- afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
- return;
- }
-
- try
- {
- auto ret = wm::Ok(json_tokener_parse(g_afb_instance->wmgr.layers.to_json().dump().c_str()));
-
- afb_req_success(req, ret, "success");
- }
- catch (std::exception &e)
- {
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_layers: %s", e.what());
- return;
- } */
- afb_req_fail(req, NULL, "not-implemented");
+ std::lock_guard<std::mutex> 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");
+ }
}
-void windowmanager_debug_surfaces(afb_req req) noexcept
+static void lcm_unregister_activity_observer (afb_req_t req)
{
- /* std::lock_guard<std::mutex> guard(binding_m);
-
- if (g_afb_instance == nullptr)
- {
- afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
- return;
- }
-
- try
- {
-
- auto ret = wm::Ok(to_json(g_afb_instance->wmgr.controller->sprops));
- if (ret.is_err())
- {
- afb_req_fail(req, "failed", ret.unwrap_err());
- return;
- }
-
- afb_req_success(req, ret.unwrap(), "success");
- }
- catch (std::exception &e)
- {
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_surfaces: %s", e.what());
- return;
- } */
- afb_req_fail(req, NULL, "not-implemented");
+ std::lock_guard<std::mutex> 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");
}
-void windowmanager_debug_terminate(afb_req req) noexcept
+static void lcm_get_activity_status(afb_req_t req)
{
- std::lock_guard<std::mutex> guard(binding_m);
- if (g_afb_instance == nullptr)
- {
- afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
- return;
+ std::lock_guard<std::mutex> 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;
}
- try
- {
+ const char *target_id = json_object_get_string(j_target);
- if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr)
- {
- raise(SIGKILL); // afb-daemon kills it's pgroup using TERM, which
- // doesn't play well with perf
- }
+ auto ret = g_afb_instance->wmgr.amgr.api_get_activity_status(target_id);
- afb_req_success(req, NULL, "success");
- }
- catch (std::exception &e)
- {
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_terminate: %s", e.what());
- return;
+ if (ret.is_err()) {
+ afb_req_fail(req, "failed", ret.unwrap_err());
+ } else {
+ afb_req_success(req, ret.unwrap(), "success");
}
+ }
}
-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},
- {"list_drawing_names", windowmanager_list_drawing_names, nullptr, nullptr, AFB_SESSION_NONE},
- {"ping", windowmanager_ping, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_status", windowmanager_debug_status, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_layers", windowmanager_debug_layers, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_surfaces", windowmanager_debug_surfaces, 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};
+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
+};
Code Review / apps / agl-service-windowmanager.git / blobdiff