From: Kazumasa Mitsunari Date: Fri, 10 Aug 2018 06:15:16 +0000 (+0900) Subject: Move to launcher when the top application is terminated X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=1a23bad65e9825a143c716f1e148dc7fcedf028d;p=apps%2Fagl-service-windowmanager-2017.git Move to launcher when the top application is terminated * Re-activate top surface when under app is terminated, but not works well... Change-Id: Ia2c70bb2d042e023fb3b39141df9e5b4ba0fc0dd Signed-off-by: Kazumasa Mitsunari --- diff --git a/src/window_manager.cpp b/src/window_manager.cpp index aa9a459..e785e4b 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -37,6 +37,7 @@ const char kNameLayoutSplit[] = "split"; const char kNameAreaFull[] = "full"; const char kNameAreaMain[] = "main"; const char kNameAreaSub[] = "sub"; +const char kNameAreaDefault[] = "normal.full"; /* Key for json obejct */ const char kKeyDrawingName[] = "drawing_name"; @@ -626,14 +627,23 @@ void WindowManager::onApplicationTerminated(const WMClientCtxt& ctxt) { return; } + struct LayoutState priv; + bool found = false; auto client = g_app_list.lookUpClient(ctxt.name); unsigned sid = client->surfaceID(ctxt.role); - if (sid != 0) + if(sid == 0) { + auto pSid = this->id_alloc.lookup(ctxt.role.c_str()); + if(pSid) { + sid = *pSid; + } + } + // reset state + if(sid != 0) { - // update state auto o_state = *this->layers.get_layout_state(sid); if (o_state != nullptr) { + priv = *o_state; if (o_state->main == sid) { o_state->main = -1; @@ -645,8 +655,33 @@ void WindowManager::onApplicationTerminated(const WMClientCtxt& ctxt) } this->id_alloc.remove_id(sid); this->layers.remove_surface(sid); - HMI_DEBUG("wm", "delete surfaceID %d", sid); + HMI_INFO("wm", "delete surfaceID %d", sid); + } + + // Recovery Phase + if(priv.main == sid) + { + HMI_DEBUG("wm", "go to launcher"); + if(ctxt.role != "launcher") + { + // goto launcher + auto pSid = this->id_alloc.lookup("launcher"); + std::string app = g_app_list.getAppID(*pSid, "launcher", &found); + if(found) + { + this->api_activate_surface(app.c_str(), "launcher", kNameAreaDefault, + [](const char*){}); + } + } + } + else if(priv.main != sid && priv.sub != sid) + { + // re-show top surface + this->deactivate(priv.main); + this->activate(priv.main); + this->layout_commit(); } + else {} g_app_list.removeClient(ctxt.name); }