X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=ac3050b75264eeae998b56b8312b709c5ed80ff7;hb=refs%2Fheads%2Fsandbox%2Fruke47%2Flifecycle;hp=744df8b37b0b51479516fdabbeb083102bf6c03b;hpb=2357c437b260d0d8cb927e6878f1226bfafb9d0b;p=apps%2Fagl-service-windowmanager.git diff --git a/src/main.cpp b/src/main.cpp index 744df8b..ac3050b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,12 +18,8 @@ #include #include #include -#include -#include "app.hpp" -#include "result.hpp" +#include "window_manager.hpp" #include "json_helper.hpp" -#include "util.hpp" -#include "wayland_ivi_wm.hpp" extern "C" { @@ -31,21 +27,29 @@ extern "C" #include } -typedef struct wmClientCtxt +typedef struct WMClientCtxt { std::string name; - wmClientCtxt(const char *appName) + 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; + name = appName; + role = appRole; } -} wmClientCtxt; +} WMClientCtxt; struct afb_instance { - std::unique_ptr display; - wm::App app; + wm::WindowManager wmgr; - afb_instance() : display{new wl::display}, app{this->display.get()} {} + afb_instance() : wmgr() {} + ~afb_instance() = default; int init(); }; @@ -55,104 +59,21 @@ std::mutex binding_m; int afb_instance::init() { - return this->app.init(); -} - -int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events, - void * /*data*/) -{ - ST(); - - if ((events & EPOLLHUP) != 0) - { - HMI_ERROR("wm", "The compositor hung up, dying now."); - delete g_afb_instance; - g_afb_instance = nullptr; - goto error; - } - - if ((events & EPOLLIN) != 0u) - { - { - STN(display_read_events); - g_afb_instance->app.display->read_events(); - g_afb_instance->app.set_pending_events(); - } - { - // We want do dispatch pending wayland events from within - // the API context - STN(winman_ping_api_call); - afb_service_call("windowmanager", "ping", json_object_new_object(), - [](void *c, int st, json_object *j) { - STN(winman_ping_api_call_return); - }, - nullptr); - } - } - - return 0; - -error: - sd_event_source_unref(evs); - if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) - { - exit(1); - } - return -1; + return this->wmgr.init(); } -int _binding_init() +static int _binding_init() { - HMI_NOTICE("wm", "WinMan ver. %s", WINMAN_VERSION_STRING); + HMI_NOTICE("WinMan ver. %s", WINMAN_VERSION_STRING); - if (g_afb_instance != nullptr) - { - HMI_ERROR("wm", "Wayland context already initialized?"); - return 0; - } - - if (getenv("XDG_RUNTIME_DIR") == nullptr) - { - HMI_ERROR("wm", "Environment variable XDG_RUNTIME_DIR not set"); - goto error; - } - - { - // wait until wayland compositor starts up. - int cnt = 0; - g_afb_instance = new afb_instance; - while (!g_afb_instance->display->ok()) - { - cnt++; - if (20 <= cnt) - { - HMI_ERROR("wm", "Could not connect to compositor"); - goto error; - } - HMI_ERROR("wm", "Wait to start weston ..."); - sleep(1); - delete g_afb_instance; - g_afb_instance = new afb_instance; - } - } + g_afb_instance = new afb_instance; if (g_afb_instance->init() == -1) { - HMI_ERROR("wm", "Could not connect to compositor"); + HMI_ERROR("Could not connect to compositor"); goto error; } - { - int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr, - g_afb_instance->display->get_fd(), EPOLLIN, - display_event_callback, g_afb_instance); - if (ret < 0) - { - HMI_ERROR("wm", "Could not initialize afb_instance event handler: %d", -ret); - goto error; - } - } - atexit([] { delete g_afb_instance; }); return 0; @@ -163,7 +84,7 @@ error: return -1; } -int binding_init() noexcept +static int binding_init (afb_api_t api) noexcept { try { @@ -171,45 +92,63 @@ int binding_init() noexcept } catch (std::exception &e) { - HMI_ERROR("wm", "Uncaught exception in binding_init(): %s", e.what()); + HMI_ERROR("Uncaught exception in binding_init(): %s", e.what()); } return -1; } -static bool checkFirstReq(afb_req req) -{ - wmClientCtxt *ctxt = (wmClientCtxt *)afb_req_context_get(req); - return (ctxt) ? false : true; -} - static void cbRemoveClientCtxt(void *data) { - wmClientCtxt *ctxt = (wmClientCtxt *)data; + WMClientCtxt *ctxt = (WMClientCtxt *)data; if (ctxt == nullptr) { return; } - HMI_DEBUG("wm", "remove app %s", ctxt->name.c_str()); - // Lookup surfaceID and remove it because App is dead. - auto pSid = g_afb_instance->app.id_alloc.lookup(ctxt->name.c_str()); - if (pSid) - { - auto sid = *pSid; - g_afb_instance->app.id_alloc.remove_id(sid); - g_afb_instance->app.layers.remove_surface(sid); - g_afb_instance->app.controller->sprops.erase(sid); - g_afb_instance->app.controller->surfaces.erase(sid); - HMI_DEBUG("wm", "delete surfaceID %d", sid); + + 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); + delete ctxt; } -void windowmanager_requestsurface(afb_req req) noexcept +static WMClientCtxt* getWMClientContext(afb_req_t req) +{ + WMClientCtxt *ctx = static_cast(afb_req_context_get(req)); + if (!ctx) { + // Create Security Context at first time + ctx = new WMClientCtxt(); + HMI_DEBUG("create session without name & role"); + afb_req_session_set_LOA(req, 1); + afb_req_context_set(req, ctx, cbRemoveClientCtxt); + } + return ctx; +} + +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); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -225,41 +164,26 @@ void windowmanager_requestsurface(afb_req req) noexcept return; } - /* Create Security Context */ - bool isFirstReq = checkFirstReq(req); - if (!isFirstReq) + char *appid = afb_req_get_application_id(req); + if(appid) { - wmClientCtxt *ctxt = (wmClientCtxt *)afb_req_context_get(req); - HMI_DEBUG("wm", "You're %s.", ctxt->name.c_str()); - if (ctxt->name != std::string(a_drawing_name)) + auto ret = g_afb_instance->wmgr.api_request_surface( + appid, a_drawing_name); + if (ret.is_err()) { - afb_req_fail_f(req, "failed", "Don't request with other name: %s for now", a_drawing_name); - HMI_DEBUG("wm", "Don't request with other name: %s for now", a_drawing_name); - return; + afb_req_fail(req, "failed", ret.unwrap_err()); } - } - - auto ret = g_afb_instance->app.api_request_surface(a_drawing_name); - - if (isFirstReq) - { - wmClientCtxt *ctxt = new wmClientCtxt(a_drawing_name); - HMI_DEBUG("wm", "create session for %s", ctxt->name.c_str()); - afb_req_session_set_LOA(req, 1); - afb_req_context_set(req, ctxt, cbRemoveClientCtxt); + else + { + createSecurityContext(req, appid, a_drawing_name); + afb_req_success(req, json_object_new_int(ret.unwrap()), "success"); + } + free(appid); } else { - HMI_DEBUG("wm", "session already created for %s", a_drawing_name); - } - - if (ret.is_err()) - { - afb_req_fail(req, "failed", ret.unwrap_err()); - return; + afb_req_fail(req, "failed", nullptr); } - - afb_req_success(req, json_object_new_int(ret.unwrap()), "success"); } catch (std::exception &e) { @@ -268,12 +192,9 @@ 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); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -299,15 +220,23 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept return; } char const *a_ivi_id = json_object_get_string(j_ivi_id); - - auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, a_ivi_id); - if (ret != nullptr) + char *appid = afb_req_get_application_id(req); + if(appid) { - afb_req_fail(req, "failed", ret); - return; - } + auto ret = g_afb_instance->wmgr.api_request_surface( + appid, a_drawing_name, a_ivi_id); - afb_req_success(req, NULL, "success"); + if (ret != nullptr) + { + afb_req_fail(req, "failed", ret); + } + else + { + createSecurityContext(req, appid, a_drawing_name); + afb_req_success(req, NULL, "success"); + } + free(appid); + } } catch (std::exception &e) { @@ -316,12 +245,9 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept } } -void windowmanager_activatesurface(afb_req req) noexcept +void windowmanager_activatewindow(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -344,30 +270,34 @@ void windowmanager_activatesurface(afb_req req) noexcept return; } - g_afb_instance->app.api_activate_surface(a_drawing_name, a_drawing_area, - [&req](const char *errmsg) { - if (errmsg != nullptr) - { - HMI_ERROR("wm", errmsg); - afb_req_fail(req, "failed", errmsg); - return; - } - afb_req_success(req, NULL, "success"); - }); + char* appid = afb_req_get_application_id(req); + if(appid) + { + g_afb_instance->wmgr.api_activate_window( + appid, a_drawing_name, a_drawing_area, + [&req](const char *errmsg) { + if (errmsg != nullptr) + { + HMI_ERROR(errmsg); + afb_req_fail(req, "failed", errmsg); + return; + } + afb_req_success(req, NULL, "success"); + }); + free(appid); + } } catch (std::exception &e) { - HMI_WARNING("wm", "failed", "Uncaught exception while calling activatesurface: %s", e.what()); + HMI_WARNING("failed: Uncaught exception while calling activatesurface: %s", e.what()); + g_afb_instance->wmgr.exceptionProcessForTransition(); return; } } -void windowmanager_deactivatesurface(afb_req req) noexcept +void windowmanager_deactivatewindow(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -383,30 +313,34 @@ void windowmanager_deactivatesurface(afb_req req) noexcept return; } - g_afb_instance->app.api_deactivate_surface(a_drawing_name, - [&req](const char *errmsg) { - if (errmsg != nullptr) - { - HMI_ERROR("wm", errmsg); - afb_req_fail(req, "failed", errmsg); - return; - } - afb_req_success(req, NULL, "success"); - }); + char* appid = afb_req_get_application_id(req); + if(appid) + { + g_afb_instance->wmgr.api_deactivate_window( + appid, a_drawing_name, + [&req](const char *errmsg) { + if (errmsg != nullptr) + { + HMI_ERROR(errmsg); + afb_req_fail(req, "failed", errmsg); + return; + } + afb_req_success(req, NULL, "success"); + }); + free(appid); + } } catch (std::exception &e) { - HMI_WARNING("wm", "Uncaught exception while calling deactivatesurface: %s", e.what()); + HMI_WARNING("failed: Uncaught exception while calling deactivatesurface: %s", e.what()); + g_afb_instance->wmgr.exceptionProcessForTransition(); return; } } -void windowmanager_enddraw(afb_req req) noexcept +void windowmanager_enddraw(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -423,21 +357,24 @@ void windowmanager_enddraw(afb_req req) noexcept } afb_req_success(req, NULL, "success"); - g_afb_instance->app.api_enddraw(a_drawing_name); + char* appid = afb_req_get_application_id(req); + if(appid) + { + g_afb_instance->wmgr.api_enddraw(appid, a_drawing_name); + free(appid); + } } catch (std::exception &e) { - HMI_WARNING("wm", "failed", "Uncaught exception while calling enddraw: %s", e.what()); + HMI_WARNING("failed: Uncaught exception while calling enddraw: %s", e.what()); + g_afb_instance->wmgr.exceptionProcessForTransition(); return; } } -void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept +void windowmanager_getdisplayinfo_thunk(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -446,7 +383,7 @@ void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept try { - auto ret = g_afb_instance->app.api_get_display_info(); + auto ret = g_afb_instance->wmgr.api_get_display_info(); if (ret.is_err()) { afb_req_fail(req, "failed", ret.unwrap_err()); @@ -462,12 +399,9 @@ 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); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -486,7 +420,7 @@ void windowmanager_getareainfo_thunk(afb_req req) noexcept } char const *a_drawing_name = json_object_get_string(j_drawing_name); - auto ret = g_afb_instance->app.api_get_area_info(a_drawing_name); + auto ret = g_afb_instance->wmgr.api_get_area_info(a_drawing_name); if (ret.is_err()) { afb_req_fail(req, "failed", ret.unwrap_err()); @@ -502,12 +436,9 @@ 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); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -523,10 +454,9 @@ void windowmanager_wm_subscribe(afb_req req) noexcept afb_req_fail(req, "failed", "Need char const* argument event"); return; } - int event_type = json_object_get_int(j); - const char *event_name = g_afb_instance->app.kListEventName[event_type]; - struct afb_event event = g_afb_instance->app.map_afb_event[event_name]; - int ret = afb_req_subscribe(req, event); + int event_id = json_object_get_int(j); + int ret = g_afb_instance->wmgr.api_subscribe(req, event_id); + if (ret) { afb_req_fail(req, "failed", "Error: afb_req_subscribe()"); @@ -541,70 +471,24 @@ void windowmanager_wm_subscribe(afb_req req) noexcept } } -void windowmanager_list_drawing_names(afb_req req) noexcept +void windowmanager_ping(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif - 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->app.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; - } -} - -void windowmanager_ping(afb_req req) noexcept -{ - std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); return; } - - try + else { - - g_afb_instance->app.api_ping(); - afb_req_success(req, NULL, "success"); } - catch (std::exception &e) - { - afb_req_fail_f(req, "failed", "Uncaught exception while calling ping: %s", e.what()); - return; - } } -void windowmanager_debug_status(afb_req req) noexcept +void windowmanager_debug_terminate(afb_req_t req) noexcept { std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif if (g_afb_instance == nullptr) { afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); @@ -614,122 +498,123 @@ void windowmanager_debug_status(afb_req req) noexcept try { - json_object *jr = json_object_new_object(); - json_object_object_add(jr, "surfaces", - to_json(g_afb_instance->app.controller->sprops)); - json_object_object_add(jr, "layers", to_json(g_afb_instance->app.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; } } -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 guard(binding_m); -#ifdef ST - ST(); -#endif - 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->app.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; - } + 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"); + } } -void windowmanager_debug_surfaces(afb_req req) noexcept +static void lcm_unregister_activity_observer (afb_req_t req) { - std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif - 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->app.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; - } + 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"); } -void windowmanager_debug_terminate(afb_req req) noexcept +static void lcm_get_activity_status(afb_req_t req) { - std::lock_guard guard(binding_m); -#ifdef ST - ST(); -#endif - if (g_afb_instance == nullptr) - { - afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?"); - return; + 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; } - 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}, - {"activatesurface", windowmanager_activatesurface, nullptr, nullptr, AFB_SESSION_NONE}, - {"deactivatesurface", windowmanager_deactivatesurface, 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 +};