diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.cpp | 226 | ||||
| -rw-r--r-- | src/app.hpp | 8 |
2 files changed, 215 insertions, 19 deletions
diff --git a/src/app.cpp b/src/app.cpp index 7a0804d..48c6740 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -545,7 +545,7 @@ WMError App::lm_release(const struct WMAction &action) return WMError::SUCCESS; } -WMError App::lm_layout_change(const struct WMAction &action) +/* WMError App::lm_layout_change(const struct WMAction &action) { const char *msg = this->check_surface_exist(action.role.c_str()); @@ -556,7 +556,7 @@ WMError App::lm_layout_change(const struct WMAction &action) } this->lm_layout_change(action.role.c_str()); return WMError::SUCCESS; -} +} */ WMError App::doTransition(unsigned req_num) { @@ -585,17 +585,17 @@ WMError App::checkPolicy(unsigned req_num) ret = WMError::NO_ENTRY; return ret; } - bool is_activate = (trigger.task == Task::TASK_ALLOCATE); std::string req_area = trigger.area; // >>>> Compatible with current window manager until policy manager coming - if (is_activate) + if (trigger.task == Task::TASK_ALLOCATE) { + HMI_SEQ_DEBUG(req_num, "Check split or not"); const char *msg = this->check_surface_exist(trigger.role.c_str()); if (msg) { - HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), msg); + HMI_SEQ_ERROR(req_num, msg); ret = WMError::LAYOUT_CHANGE_FAIL; return ret; } @@ -609,6 +609,7 @@ WMError App::checkPolicy(unsigned req_num) if (split) { + HMI_SEQ_DEBUG(req_num, "Split happens"); // Get current visible role std::string add_role = this->lookup_name(state.main).value(); // Set next area @@ -626,7 +627,15 @@ WMError App::checkPolicy(unsigned req_num) HMI_SEQ_INFO(req_num, "Additional split app %s, role: %s, area: %s", add_name.c_str(), add_role.c_str(), add_area.c_str()); // Set split action - WMError ret = g_app_list.setAction(req_num, add_name, add_role, add_area); + bool visible = true; + bool end_draw_finished = false; + WMAction split_action{ + add_name, + add_role, + add_area, + visible, + end_draw_finished}; + WMError ret = g_app_list.setAction(req_num, split_action); if (ret != WMError::SUCCESS) { HMI_SEQ_ERROR(req_num, "Failed to set action"); @@ -635,14 +644,23 @@ WMError App::checkPolicy(unsigned req_num) g_app_list.reqDump(); } } + else + { + HMI_SEQ_DEBUG(req_num, "split doesn't happen"); + } - // Set invisible task - this->setInvisibleTask(trigger.role, split); + // Set invisible task(Remove if policy manager finish) + ret = this->setInvisibleTask(trigger.role, split); + if(ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret)); + return ret; + } /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); - ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate); + ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, trigger.task); g_app_list.reqDump(); return ret; @@ -694,12 +712,188 @@ WMError App::startTransition(unsigned req_num) return ret; } -void App::setInvisibleTask(const std::string &role, bool split) +WMError App::setInvisibleTask(const std::string &role, bool split) { - ; + unsigned req = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req, "set current visible app to invisible task"); + // This task is copied from original actiavete surface + const char *drawing_name = role.c_str(); + auto const &surface_id = this->lookup_id(drawing_name); + auto layer_id = this->layers.get_layer_id(*surface_id); + auto o_state = *this->layers.get_layout_state(*surface_id); + struct LayoutState &state = *o_state; + std::string add_name, add_role; + std::string add_area = ""; + int surface; + bool visible = false; + bool end_draw_finished = true; + bool found = false; + + for (auto const &l : this->layers.mapping) + { + if (l.second.layer_id <= *layer_id) + { + continue; + } + if (l.second.state.main != -1) + { + //this->deactivate(l.second.state.main); + surface = l.second.state.main; + add_role = *this->id_alloc.lookup(surface); + add_name = g_app_list.getAppID(surface, add_role, &found); + if(!found){ + return WMError::NOT_REGISTERED; + } + HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, act); + l.second.state.main = -1; + } + + if (l.second.state.sub != -1) + { + //this->deactivate(l.second.state.sub); + surface = l.second.state.sub; + add_role = *this->id_alloc.lookup(surface); + add_name = g_app_list.getAppID(surface, add_role, &found); + if (!found) + { + return WMError::NOT_REGISTERED; + } + HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, act); + l.second.state.sub = -1; + } + } + + // change current state here, but this is hack + auto layer = this->layers.get_layer(*layer_id); + + if (state.main == -1) + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + //this->surface_set_layout(*surface_id); + state = nl; + + //compositor::rect area_rect = this->area_info[*surface_id]; + }); + } + else + { + if (0 == strcmp(drawing_name, "HomeScreen")) + { + // Nothing To do + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + }); + } + else + { + if (split) + { + this->try_layout( + state, + LayoutState{state.main, *surface_id}, + [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutSplit); + std::string main = + std::move(*this->id_alloc.lookup(state.main)); + if (state.sub != *surface_id) + { + if (state.sub != -1) + { + //this->deactivate(state.sub); + WMAction deact_sub; + deact_sub.role = main; + deact_sub.area = add_area; + deact_sub.appid = g_app_list.getAppID(state.sub, main, &found); + if(!found){ + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + + /* std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); + std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); + compositor::rect area_rect_main = this->area_info[state.main]; + compositor::rect area_rect_sub = this->area_info[*surface_id]; + // >>> HACK + HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split"); + std::string request_role = drawing_name; + //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer + std::string hack_appid = "navigation"; + std::string hack_role = main; + std::string hack_area = str_area_main; + //g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true); + // >>> HACK */ + }); + } + else + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + + //this->surface_set_layout(*surface_id); + if (state.main != *surface_id) + { + // this->deactivate(state.main); + WMAction deact_main; + deact_main.role = std::move(*this->id_alloc.lookup(state.main)); + ; + deact_main.area = add_area; + deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found); + if (!found) + { + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_main.visible = visible; + deact_main.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_main); + } + if (state.sub != -1) + { + if (state.sub != *surface_id) + { + //this->deactivate(state.sub); + WMAction deact_sub; + deact_sub.role = std::move(*this->id_alloc.lookup(state.sub)); + ; + deact_sub.area = add_area; + deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); + if (!found) + { + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + }); + } + } + } + + return WMError::SUCCESS; } -void App::lm_layout_change(const char *drawing_name) +/* void App::lm_layout_change(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); auto layer_id = this->layers.get_layer_id(*surface_id); @@ -853,7 +1047,7 @@ void App::lm_layout_change(const char *drawing_name) } } } -} +} */ const char *App::check_surface_exist(const char *drawing_name) { @@ -1046,7 +1240,7 @@ void App::check_flushdraw(int surface_id) } } -void App::lm_enddraw(const char *drawing_name) +/* void App::lm_enddraw(const char *drawing_name) { HMI_DEBUG("wm", "end draw %s", drawing_name); for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) @@ -1060,7 +1254,7 @@ void App::lm_enddraw(const char *drawing_name) this->emit_flushdraw(drawing_name); } } -} +} */ WMError App::doEndDraw(unsigned req_num) { @@ -1112,6 +1306,8 @@ WMError App::doEndDraw(unsigned req_num) this->emit_flushdraw(act_flush.role.c_str()); } } + + return ret; } WMError App::setSurfaceSize(unsigned surface, const std::string &area) diff --git a/src/app.hpp b/src/app.hpp index 235cd01..e2f8d44 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -268,7 +268,7 @@ struct App WMError doTransition(unsigned sequence_number); WMError checkPolicy(unsigned req_num); WMError startTransition(unsigned req_num); - void setInvisibleTask(const std::string &role, bool split); + WMError setInvisibleTask(const std::string &role, bool split); WMError doEndDraw(unsigned req_num); WMError layoutChange(const WMAction &action); @@ -293,10 +293,10 @@ struct App // The following function is temporary. // Then will be removed when layermanager is finished - void lm_layout_change(const char *drawing_name); - WMError lm_layout_change(const struct WMAction &action); + //void lm_layout_change(const char *drawing_name); + //WMError lm_layout_change(const struct WMAction &action); WMError lm_release(const struct WMAction &action); - void lm_enddraw(const char *drawing_name); + //void lm_enddraw(const char *drawing_name); private: std::unordered_map<std::string, struct compositor::rect> area2size; |