namespace wm
{
-const unsigned kTimeOut = 10000000UL; /* 10s */
+static const unsigned kTimeOut = 3000000UL; /* 3s */
/* DrawingArea name used by "{layout}.{area}" */
const char kNameLayoutNormal[] = "normal";
{
// firsttime set into sd_event
int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
- CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
+ CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
if (ret < 0)
{
HMI_ERROR("wm", "Could't set timer");
}
}
-WMError App::lm_release(const struct WMAction &action)
-{
- //auto const &surface_id = this->lookup_id(drawing_name);
- WMError ret = WMError::LAYOUT_CHANGE_FAIL;
- unsigned req_num = g_app_list.currentRequestNumber();
- auto const &surface_id = this->lookup_id(action.role.c_str());
- if (!surface_id)
- {
- HMI_SEQ_ERROR(req_num, "Surface does not exist");
- return ret;
- }
-
- if (*surface_id == this->layers.main_surface)
- {
- HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface");
- return ret;
- }
-
- auto o_state = *this->layers.get_layout_state(*surface_id);
-
- if (o_state == nullptr)
- {
- HMI_SEQ_ERROR(req_num, "Could not find layer for surface");
- return ret;
- }
-
- struct LayoutState &state = *o_state;
-
- if (state.main == -1)
- {
- HMI_SEQ_ERROR(req_num, "No surface active");
- return ret;
- }
-
- // Check against main_surface, main_surface_name is the configuration item.
- if (*surface_id == this->layers.main_surface)
- {
- HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id);
- //reply(nullptr);
- return WMError::SUCCESS;
- }
- if ((state.main == *surface_id) && (state.sub == *surface_id))
- {
- HMI_SEQ_ERROR(req_num, "Surface is not active");
- return ret;
- }
-
- if (state.main == *surface_id)
- {
- if (state.sub != -1)
- {
- this->try_layout(
- state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) {
- std::string sub = std::move(*this->lookup_name(state.sub));
-
- this->deactivate(*surface_id);
- this->surface_set_layout(state.sub);
- state = nl;
-
- this->layout_commit();
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[state.sub];
- this->emit_syncdraw(sub.c_str(), str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.sub);
- });
- }
- else
- {
- this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) {
- this->deactivate(*surface_id);
- state = nl;
- this->layout_commit();
- });
- }
- }
- else if (state.sub == *surface_id)
- {
- this->try_layout(
- state, LayoutState{state.main, -1}, [&](LayoutState const &nl) {
- std::string main = std::move(*this->lookup_name(state.main));
-
- this->deactivate(*surface_id);
- this->surface_set_layout(state.main);
- state = nl;
-
- this->layout_commit();
- std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
- compositor::rect area_rect = this->area_info[state.main];
- this->emit_syncdraw(main.c_str(), str_area.c_str(),
- area_rect.x, area_rect.y, area_rect.w, area_rect.h);
- this->enqueue_flushdraw(state.main);
- });
- }
- return WMError::SUCCESS;
-}
-
WMError App::doTransition(unsigned req_num)
{
HMI_SEQ_DEBUG(req_num, "check policy");
std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
// Change request area
req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
- HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", trigger.area, req_area);
+ HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen",
+ trigger.area, req_area);
// set another action
std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found);
if (!found)
HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!");
req_area = "fullscreen";
}
- TaskVisible task_visible = (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE;
+ TaskVisible task_visible =
+ (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE;
ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible);
g_app_list.reqDump();
if (!found)
{
ret = WMError::NO_ENTRY;
- HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret));
+ HMI_SEQ_ERROR(req_num,
+ "Window Manager bug :%s : Action is not set", errorDescription(ret));
return ret;
}
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
{
unsigned requested_num = g_app_list.getRequestNumber(appid);
if (requested_num != 0)
{
- HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
+ HMI_SEQ_INFO(requested_num,
+ "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
return REQ_REJECTED;
}
return WMError::SUCCESS;
}
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+void App::api_activate_surface(char const *appid, char const *drawing_name,
+ char const *drawing_area, const reply_func &reply)
{
ST();
}
}
-void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply)
+void App::api_deactivate_surface(char const *appid, char const *drawing_name,
+ const reply_func &reply)
{
ST();
}
}
-void App::enqueue_flushdraw(int surface_id)
-{
- this->check_flushdraw(surface_id);
- HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id);
- this->pending_end_draw.push_back(surface_id);
-}
-
-void App::check_flushdraw(int surface_id)
-{
- auto i = std::find(std::begin(this->pending_end_draw),
- std::end(this->pending_end_draw), surface_id);
- if (i != std::end(this->pending_end_draw))
- {
- auto n = this->lookup_name(surface_id);
- HMI_ERROR("wm", "Application %s (%d) has pending EndDraw call(s)!",
- n ? n->c_str() : "unknown-name", surface_id);
- std::swap(this->pending_end_draw[std::distance(
- std::begin(this->pending_end_draw), i)],
- this->pending_end_draw.back());
- this->pending_end_draw.resize(this->pending_end_draw.size() - 1);
- }
-}
-
WMError App::doEndDraw(unsigned req_num)
{
// get actions
ret = this->layoutChange(act);
if(ret != WMError::SUCCESS)
{
- HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+ HMI_SEQ_WARNING(req_num,
+ "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
return ret;
}
ret = this->visibilityChange(act);
if (ret != WMError::SUCCESS)
{
- HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+ HMI_SEQ_WARNING(req_num,
+ "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
return ret;
}
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
}
}
-void App::deactivate_main_surface()
-{
- this->layers.main_surface = -1;
- std::string appid = "HomeScreen";
- this->api_deactivate_surface(appid.c_str(), this->layers.main_surface_name.c_str(), [](const char *) {});
-}
-
bool App::can_split(struct LayoutState const &state, int new_id)
{
if (state.main != -1 && state.main != new_id)
return false;
}
-void App::try_layout(struct LayoutState & /*state*/,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply)
-{
- if (this->policy.layout_is_valid(new_layout))
- {
- apply(new_layout);
- }
-}
-
/**
* controller_hooks
*/
Code Review / apps / agl-service-windowmanager.git / blobdiff