X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=b5659e27ab2b843cf9a20b13738c455453817229;hb=c447b8902934dc59166d5ae2b558fbb886b01887;hp=744df8b37b0b51479516fdabbeb083102bf6c03b;hpb=2357c437b260d0d8cb927e6878f1226bfafb9d0b;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/main.cpp b/src/main.cpp index 744df8b..b5659e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,11 +18,9 @@ #include #include #include -#include -#include "app.hpp" -#include "result.hpp" +#include "../include/json.hpp" +#include "window_manager.hpp" #include "json_helper.hpp" -#include "util.hpp" #include "wayland_ivi_wm.hpp" extern "C" @@ -31,21 +29,23 @@ extern "C" #include } -typedef struct wmClientCtxt +typedef struct WMClientCtxt { std::string name; - wmClientCtxt(const char *appName) + std::string role; + WMClientCtxt(const char *appName, const char* appRole) { 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() : display{new wl::display}, wmgr{this->display.get()} {} int init(); }; @@ -55,7 +55,7 @@ std::mutex binding_m; int afb_instance::init() { - return this->app.init(); + return this->wmgr.init(); } int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events, @@ -75,8 +75,8 @@ int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events, { { STN(display_read_events); - g_afb_instance->app.display->read_events(); - g_afb_instance->app.set_pending_events(); + g_afb_instance->wmgr.display->read_events(); + g_afb_instance->wmgr.set_pending_events(); } { // We want do dispatch pending wayland events from within @@ -176,34 +176,55 @@ int binding_init() noexcept 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()); + auto pSid = g_afb_instance->wmgr.id_alloc.lookup(ctxt->role.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); + auto o_state = *g_afb_instance->wmgr.layers.get_layout_state(sid); + if (o_state != nullptr) + { + if (o_state->main == sid) + { + o_state->main = -1; + } + else if (o_state->sub == sid) + { + o_state->sub = -1; + } + } + g_afb_instance->wmgr.id_alloc.remove_id(sid); + g_afb_instance->wmgr.layers.remove_surface(sid); + g_afb_instance->wmgr.controller->sprops.erase(sid); + g_afb_instance->wmgr.controller->surfaces.erase(sid); HMI_DEBUG("wm", "delete surfaceID %d", sid); } + g_afb_instance->wmgr.removeClient(ctxt->name); delete ctxt; } +static void createSecurityContext(afb_req req, const char* appid, const char* role) +{ + WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req); + if (!ctxt) + { + // 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("wm", "create session for %s", ctxt->name.c_str()); + afb_req_session_set_LOA(req, 1); + afb_req_context_set(req, ctxt, cbRemoveClientCtxt); + } +} + void windowmanager_requestsurface(afb_req req) noexcept { std::lock_guard guard(binding_m); @@ -225,40 +246,17 @@ void windowmanager_requestsurface(afb_req req) noexcept return; } - /* Create Security Context */ - bool isFirstReq = checkFirstReq(req); - if (!isFirstReq) - { - 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)) - { - 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; - } - } - - 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 - { - HMI_DEBUG("wm", "session already created for %s", a_drawing_name); - } - + const char *appid = afb_req_get_application_id(req); + auto ret = g_afb_instance->wmgr.api_request_surface( + appid, a_drawing_name); if (ret.is_err()) { afb_req_fail(req, "failed", ret.unwrap_err()); return; } + createSecurityContext(req, appid, a_drawing_name); + afb_req_success(req, json_object_new_int(ret.unwrap()), "success"); } catch (std::exception &e) @@ -299,14 +297,18 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept return; } char const *a_ivi_id = json_object_get_string(j_ivi_id); + char const *appid = afb_req_get_application_id(req); + auto ret = g_afb_instance->wmgr.api_request_surface( + appid, a_drawing_name, a_ivi_id); - auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, a_ivi_id); if (ret != nullptr) { afb_req_fail(req, "failed", ret); return; } + createSecurityContext(req, appid, a_drawing_name); + afb_req_success(req, NULL, "success"); } catch (std::exception &e) @@ -316,7 +318,7 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept } } -void windowmanager_activatesurface(afb_req req) noexcept +void windowmanager_activatewindow(afb_req req) noexcept { std::lock_guard guard(binding_m); #ifdef ST @@ -344,25 +346,28 @@ 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"); - }); + g_afb_instance->wmgr.api_activate_surface( + afb_req_get_application_id(req), + 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"); + }); } catch (std::exception &e) { - HMI_WARNING("wm", "failed", "Uncaught exception while calling activatesurface: %s", e.what()); + HMI_WARNING("wm", "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 req) noexcept { std::lock_guard guard(binding_m); #ifdef ST @@ -383,20 +388,22 @@ 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"); - }); + g_afb_instance->wmgr.api_deactivate_surface( + afb_req_get_application_id(req), 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"); + }); } catch (std::exception &e) { - HMI_WARNING("wm", "Uncaught exception while calling deactivatesurface: %s", e.what()); + HMI_WARNING("wm", "failed: Uncaught exception while calling deactivatesurface: %s", e.what()); + g_afb_instance->wmgr.exceptionProcessForTransition(); return; } } @@ -423,11 +430,13 @@ void windowmanager_enddraw(afb_req req) noexcept } afb_req_success(req, NULL, "success"); - g_afb_instance->app.api_enddraw(a_drawing_name); + g_afb_instance->wmgr.api_enddraw( + afb_req_get_application_id(req), a_drawing_name); } catch (std::exception &e) { - HMI_WARNING("wm", "failed", "Uncaught exception while calling enddraw: %s", e.what()); + HMI_WARNING("wm", "failed: Uncaught exception while calling enddraw: %s", e.what()); + g_afb_instance->wmgr.exceptionProcessForTransition(); return; } } @@ -446,7 +455,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()); @@ -486,7 +495,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()); @@ -524,8 +533,8 @@ void windowmanager_wm_subscribe(afb_req req) noexcept 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]; + const char *event_name = g_afb_instance->wmgr.kListEventName[event_type]; + struct afb_event event = g_afb_instance->wmgr.map_afb_event[event_name]; int ret = afb_req_subscribe(req, event); if (ret) { @@ -556,7 +565,7 @@ void windowmanager_list_drawing_names(afb_req req) noexcept try { - nlohmann::json j = g_afb_instance->app.id_alloc.name2id; + 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()) { @@ -588,7 +597,7 @@ void windowmanager_ping(afb_req req) noexcept try { - g_afb_instance->app.api_ping(); + g_afb_instance->wmgr.api_ping(); afb_req_success(req, NULL, "success"); } @@ -616,8 +625,8 @@ void windowmanager_debug_status(afb_req req) noexcept 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)); + to_json(g_afb_instance->wmgr.controller->sprops)); + json_object_object_add(jr, "layers", to_json(g_afb_instance->wmgr.controller->lprops)); afb_req_success(req, jr, "success"); } @@ -642,7 +651,7 @@ void windowmanager_debug_layers(afb_req req) noexcept try { - auto ret = wm::Ok(json_tokener_parse(g_afb_instance->app.layers.to_json().dump().c_str())); + auto ret = wm::Ok(json_tokener_parse(g_afb_instance->wmgr.layers.to_json().dump().c_str())); afb_req_success(req, ret, "success"); } @@ -668,7 +677,7 @@ void windowmanager_debug_surfaces(afb_req req) noexcept try { - auto ret = wm::Ok(to_json(g_afb_instance->app.controller->sprops)); + auto ret = wm::Ok(to_json(g_afb_instance->wmgr.controller->sprops)); if (ret.is_err()) { afb_req_fail(req, "failed", ret.unwrap_err()); @@ -717,8 +726,8 @@ 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}, - {"activatesurface", windowmanager_activatesurface, nullptr, nullptr, AFB_SESSION_NONE}, - {"deactivatesurface", windowmanager_deactivatesurface, 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},