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());
}
this->lm_layout_change(action.role.c_str());
return WMError::SUCCESS;
-}
+} */
WMError App::doTransition(unsigned req_num)
{
* Check Policy
*/
// get current trigger
- bool found;
+ bool found = false;
+ bool split = false;
WMError ret = WMError::LAYOUT_CHANGE_FAIL;
auto trigger = g_app_list.getRequest(req_num, &found);
if (!found)
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;
}
struct LayoutState &state = *o_state;
unsigned curernt_sid = state.main;
- bool can_split = this->can_split(state, *surface_id);
+ split = this->can_split(state, *surface_id);
- if (can_split)
+ 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
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");
g_app_list.reqDump();
}
}
- // >>>> This will be removed
-
- /* get new status from Policy Manager */
- if (can_split)
- {
- // Get current visible role
- std::string add_role = this->lookup_name(state.main).value();
- // Set next area
- std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
- // Change request area
- req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
- // set another action
- std::string add_name = "navigation";
-
- 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
- bool visible = true;
- bool end_draw_finished = false;
- WMAction new_act{add_name, add_role, add_area, visible, end_draw_finished};
- WMError ret = g_app_list.setAction(req_num, new_act);
- if (ret != WMError::SUCCESS)
- {
- HMI_SEQ_ERROR(req_num, "Failed to set action");
- return ret;
- }
- g_app_list.reqDump();
- }
+ else
+ {
+ HMI_SEQ_DEBUG(req_num, "split doesn't happen");
}
- // >>>> This will be removed
- // Set invisible task
- this->setInvisibleTask(trigger.role, can_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;
return ret;
}
-void App::lm_layout_change(const char *drawing_name)
+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)
+ {
+ HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
+ state = LayoutState{*surface_id};
+ /* 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"))
+ {
+ if (split)
+ {
+ 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 = LayoutState{state.main, *surface_id};
+ }
+ else
+ {
+ 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 doesn'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 = LayoutState{*surface_id};
+ }
+ }
+ }
+
+ return WMError::SUCCESS;
+}
+
+/* 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);
}
}
}
-}
+} */
const char *App::check_surface_exist(const char *drawing_name)
{
}
}
-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++)
this->emit_flushdraw(drawing_name);
}
}
-}
+} */
WMError App::doEndDraw(unsigned req_num)
{
this->emit_flushdraw(act_flush.role.c_str());
}
}
-}
-void App::processRequest()
-{
- unsigned req = g_app_list.currentRequestNumber();
- HMI_SEQ_DEBUG(req, "Do next request");
- WMError rc = doTransition(req);
- if(rc != WMError::SUCCESS)
- {
- HMI_SEQ_ERROR(req, errorDescription(rc));
- }
+ return ret;
}
WMError App::setSurfaceSize(unsigned surface, const std::string &area)
WMError App::layoutChange(const WMAction &action)
{
- if(act.visible == false)
+ if (action.visible == false)
{
return WMError::SUCCESS;
}
Code Review / apps / agl-service-windowmanager.git / blobdiff