HMI_SEQ_DEBUG(req_num, "Timer expired remove Request");
g_app_list.reqDump();
g_app_list.removeRequest(req_num);
- g_app_list.next();
- g_app_list.reqDump();
- if (g_app_list.haveRequest())
- {
- this->process_request();
- }
+ this->processNextRequest();
}
void App::removeClient(const std::string &appid)
h = this->controller->output_size.h + 1 + h;
}
- if (sub_surface_id)
+ /* if (sub_surface_id)
{
if (o_layer_id != this->layers.get_layer_id(*sub_surface_id))
{
this->area_info[*sub_surface_id].y = y;
this->area_info[*sub_surface_id].w = w;
this->area_info[*sub_surface_id].h = h;
- }
+ } */
HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
layer_id);
this->display->flush();
}
-void App::set_timer()
+void App::setTimer()
{
HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
if (g_timer_ev_src == nullptr)
}
}
-void App::stop_timer()
+void App::stopTimer()
{
unsigned req_num = g_app_list.currentRequestNumber();
HMI_SEQ_DEBUG(req_num, "Timer stop");
{
const char *msg = this->check_surface_exist(action.role.c_str());
- /*
- lm_.updateLayout(action);
- TODO: emit syncDraw with application*/
if (msg)
{
HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg);
return WMError::SUCCESS;
}
-WMError App::do_transition(unsigned req_num)
+WMError App::doTransition(unsigned req_num)
+{
+ HMI_SEQ_DEBUG(req_num, "check policy");
+ WMError ret = this->checkPolicy(req_num);
+ if (ret != WMError::SUCCESS)
+ {
+ return ret;
+ }
+ HMI_SEQ_DEBUG(req_num, "Start transition.");
+ ret = this->startTransition(req_num);
+ return ret;
+}
+
+WMError App::checkPolicy(unsigned req_num)
{
/*
* Check Policy
*/
// get current trigger
bool found;
- bool is_activate = true;
+ WMError ret = WMError::LAYOUT_CHANGE_FAIL;
auto trigger = g_app_list.getRequest(req_num, &found);
- if(!found)
+ if (!found)
{
- WMError err = WMError::NO_ENTRY;
- HMI_SEQ_ERROR(req_num, errorDescription(err));
- return err;
+ ret = WMError::NO_ENTRY;
+ return ret;
}
+ bool is_activate = (trigger.task == Task::TASK_ALLOCATE);
+ std::string req_area = trigger.area;
- /* get new status from Policy Manager
+ // >>>> Compatible with current window manager until policy manager coming
+ if (is_activate)
+ {
+ const char *msg = this->check_surface_exist(trigger.role.c_str());
- (json_object*?) newLayout = checkPolicy(trigger);
- (vector<struct WMAction>&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout)
- for(const auto& x : actions){
- g_app_list.setAciton(req_num, x)
- }
+ if (msg)
+ {
+ HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), msg);
+ ret = WMError::LAYOUT_CHANGE_FAIL;
+ return ret;
+ }
- or
+ auto const &surface_id = this->lookup_id(trigger.role.c_str());
+ auto o_state = *this->layers.get_layout_state(*surface_id);
+ struct LayoutState &state = *o_state;
- translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num);
+ unsigned curernt_sid = state.main;
+ bool can_split = this->can_split(state, *surface_id);
- /* The following error check is not necessary because main.cpp will reject the message form not registered object
- } */
+ 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 = g_app_list.getAppID(curernt_sid, add_role, &found);
+ if (!found)
+ {
+ HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %s", curernt_sid);
+ ret = WMError::NOT_REGISTERED;
+ return ret;
+ }
+ 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);
+ if (ret != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, "Failed to set action");
+ return ret;
+ }
+ 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();
+ }
+ }
+ // >>>> This will be removed
+
+ // Set invisible task
+ this->setInvisibleTask(trigger.role, can_split);
+
+ /* get new status from Policy Manager */
HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
- if (trigger.task == Task::TASK_RELEASE)
- {
- is_activate = false;
- }
- WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
+ ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate);
g_app_list.reqDump();
- if (ret != WMError::SUCCESS)
+ return ret;
+}
+
+WMError App::startTransition(unsigned req_num)
+{
+ bool sync_draw_happen = false;
+ bool found = false;
+ WMError ret = WMError::SUCCESS;
+ auto actions = g_app_list.getActions(req_num, &found);
+ if (!found)
{
- HMI_SEQ_ERROR(req_num, "Failed to set action");
+ ret = WMError::NO_ENTRY;
+ HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret));
return ret;
}
- // layer manager task
- bool sync_draw_happen = false;
- for (const auto &y : g_app_list.getActions(req_num, &found))
+ for (const auto &y : actions)
{
- if (!found)
- {
- WMError err = WMError::NO_ENTRY;
- HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err));
- return err;
- }
- /*
- do_task(y);
- */
- /* TODO
- but current we can't do do_task,
- so divide the processing into lm_layout_change and lm_release
- */
if (y.visible)
{
sync_draw_happen = true;
- ret = lm_layout_change(y);
- if (ret != WMError::SUCCESS)
- {
- HMI_SEQ_ERROR(req_num, "%s: appid: %s, role: %s, area: %s",
- errorDescription(ret), y.appid.c_str(), y.role.c_str(), y.area.c_str());
- g_app_list.removeRequest(req_num);
- break;
- // TODO: if transition fails, what should we do?
- }
- /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
- }
- else
- {
- ret = lm_release(y);
- if (!ret)
- {
- HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str());
- g_app_list.removeRequest(req_num);
- break;
- // TODO: if transition fails, what should we do?
- }
- /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */
+ this->emit_syncdraw(y.role, y.area);
+ /* TODO: emit event for app not subscriber
+ if(g_app_list.contains(y.appid))
+ g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
}
}
- if (ret != WMError::SUCCESS)
- {
- //this->emit_error(req_num, 0 /*error_num*/, "error happens"); // test
- }
- else if (sync_draw_happen)
+ if (sync_draw_happen)
{
- this->set_timer();
+ this->setTimer();
}
else
{
- g_app_list.removeRequest(req_num); // HACK!!!
+ // deactivate only, no syncDraw
+ // Make it deactivate here
+ for (const auto &z : actions)
+ {
+ if (g_app_list.contains(z.appid))
+ {
+ auto client = g_app_list.lookUpClient(z.appid);
+ this->deactivate(client->surfaceID(z.role));
+ }
+ }
+ ret = NO_LAYOUT_CHANGE;
}
return ret;
}
//reply(nullptr);
}
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area,
+ Task task, unsigned* req_num)
{
- ST();
-
- /*
- * Check Phase
- */
-
- std::string id = appid;
- std::string role = drawing_name;
- std::string area = drawing_area;
-
- if (!g_app_list.contains(id))
+ if (!g_app_list.contains(appid))
{
- reply("app doesn't request 'requestSurface' yet");
- return;
+ return WMError::NOT_REGISTERED;
}
- auto client = g_app_list.lookUpClient(id);
+ auto client = g_app_list.lookUpClient(appid);
/*
* Queueing Phase
*/
unsigned current = g_app_list.currentRequestNumber();
- unsigned requested_num = g_app_list.getRequestNumber(id);
+ unsigned requested_num = g_app_list.getRequestNumber(appid);
if (requested_num != 0)
{
- HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str());
- reply("already requested");
- return;
+ HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
+ return REQ_REJECTED;
}
- WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
+ WMRequest req = WMRequest(appid, role, area, task);
unsigned new_req = g_app_list.addAllocateRequest(req);
+ *req_num = new_req;
g_app_list.reqDump();
- HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
+ HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", appid.c_str(), role.c_str(), area.c_str());
+
+ return WMError::SUCCESS;
+}
+
+void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+{
+ ST();
+
+ std::string id = appid;
+ std::string role = drawing_name;
+ std::string area = drawing_area;
+ Task task = Task::TASK_ALLOCATE;
+ unsigned req_num = 0;
+ WMError ret = WMError::UNKNOWN;
+
+ ret = this->setRequest(id, role, area, task, &req_num);
+
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_ERROR("wm", errorDescription(ret));
+ reply("Failed to set request");
+ return;
+ }
reply(nullptr);
- if (new_req != current)
+ if (req_num != g_app_list.currentRequestNumber())
{
// Add request, then invoked after the previous task is finished
- HMI_SEQ_DEBUG(new_req, "request is accepted");
+ HMI_SEQ_DEBUG(req_num, "request is accepted");
return;
}
/*
* Do allocate tasks
*/
- WMError ret = this->do_transition(new_req);
+ ret = this->doTransition(req_num);
if (ret != WMError::SUCCESS)
{
- HMI_SEQ_ERROR(new_req, errorDescription(ret));
//this->emit_error()
+ HMI_SEQ_ERROR(req_num, errorDescription(ret));
+ g_app_list.removeRequest(req_num);
+ g_app_list.next();
+ g_app_list.reqDump();
}
}
/*
* Do allocate tasks
*/
- WMError ret = this->do_transition(new_req);
+ WMError ret = this->doTransition(new_req);
if (ret != WMError::SUCCESS)
{
HMI_SEQ_ERROR(new_req, errorDescription(ret));
+ g_app_list.removeRequest(new_req);
+ g_app_list.next();
//this->emit_error()
}
}
}
}
-void App::do_enddraw(unsigned req_num)
+WMError App::doEndDraw(unsigned req_num)
{
// get actions
bool found;
auto actions = g_app_list.getActions(req_num, &found);
+ WMError ret = WMError::SUCCESS;
if (!found)
{
- WMError err = WMError::NO_ENTRY;
- HMI_SEQ_ERROR(req_num, errorDescription(err));
- return;
+ ret = WMError::NO_ENTRY;
+ return ret;
}
HMI_SEQ_INFO(req_num, "do endDraw");
+ // layout change and make it visible
+
+ // Temporary action
+ /* auto itr = actions.cend();
+ this->currentAppInvisible(itr->role); */
for (const auto &act : actions)
{
+ // layout change
+ if(!g_app_list.contains(act.appid)){
+ ret = WMError::NOT_REGISTERED;
+ }
+ ret = this->layoutChange(act);
+ if(ret != WMError::SUCCESS)
+ {
+ 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));
+ return ret;
+ }
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
- this->lm_enddraw(act.role.c_str());
+ //this->lm_enddraw(act.role.c_str());
}
HMI_SEQ_INFO(req_num, "emit flushDraw");
- /* do
+
+ for(const auto &act_flush : actions)
{
- // emit flush Draw
- //emitFlushDrawToAll(&g_app_list, req_num);
- // emit status change event
- } while (!g_app_list.requestFinished());*/
+ if(act_flush.visible)
+ {
+ this->emit_flushdraw(act_flush.role.c_str());
+ }
+ }
}
-void App::process_request()
+void App::processRequest()
{
unsigned req = g_app_list.currentRequestNumber();
HMI_SEQ_DEBUG(req, "Do next request");
- WMError rc = do_transition(req);
- if(rc != WMError::SUCCESS){
+ WMError rc = doTransition(req);
+ if(rc != WMError::SUCCESS)
+ {
HMI_SEQ_ERROR(req, errorDescription(rc));
}
}
+WMError App::setSurfaceSize(unsigned surface, const std::string &area)
+{
+ // Actually this function is under Layout Manager
+ /* compositor::rect size = this->lm.getAreaSize(area); // compositor::rect size = this->lm_.getAreaSize(area);
+
+ if (!this->controller->surface_exists(surface))
+ {
+ // Block until all pending request are processed by wayland display server
+ // because waiting for the surface of new app is created
+ this->display->roundtrip();
+ }
+ auto &s = this->controller->surfaces[surface];
+ s->set_destination_rectangle(size.x, size.y, size.w, size.h);
+ this->layout_commit();
+
+ // Update area information
+ this->area_info[surface].x = size.x;
+ this->area_info[surface].y = size.y;
+ this->area_info[surface].w = size.w;
+ this->area_info[surface].h = size.h;
+ HMI_DEBUG("wm", "Surface %d rect { %d, %d, %d, %d }",
+ surface, size.x, size.y, size.w, size.h); */
+ this->surface_set_layout(surface);
+
+ return WMError::SUCCESS;
+}
+
+WMError App::layoutChange(const WMAction &action)
+{
+ if(act.visible == false)
+ {
+ return WMError::SUCCESS;
+ }
+ auto client = g_app_list.lookUpClient(action.appid);
+ unsigned surface = client->surfaceID(action.role);
+ if (surface == 0)
+ {
+ HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
+ "client doesn't have surface with role(%s)", action.role.c_str());
+ return WMError::NOT_REGISTERED;
+ }
+ // Layout Manager
+ WMError ret = this->setSurfaceSize(surface, action.area);
+ return ret;
+}
+
+/* void App::currentAppInvisible(const std::string &role)
+{
+ 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;
+
+ // disable layers that are above our current layer
+ for (auto const &l : this->layers.mapping)
+ {
+ if (l.second.layer_id <= *layer_id)
+ {
+ continue;
+ }
+
+ bool flush = false;
+ if (l.second.state.main != -1)
+ {
+ this->deactivate(l.second.state.main);
+ l.second.state.main = -1;
+ flush = true;
+ }
+
+ if (l.second.state.sub != -1)
+ {
+ this->deactivate(l.second.state.sub);
+ l.second.state.sub = -1;
+ flush = true;
+ }
+
+ if (flush)
+ {
+ this->layout_commit();
+ }
+ }
+} */
+
+WMError App::visibilityChange(const WMAction &action)
+{
+ auto client = g_app_list.lookUpClient(action.appid);
+ unsigned surface = client->surfaceID(action.role);
+ if(surface == 0)
+ {
+ HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
+ "client doesn't have surface with role(%s)", action.role.c_str());
+ return WMError::NOT_REGISTERED;
+ }
+
+ if (action.visible)
+ {
+ this->activate(surface); // Layout Manager task
+ }
+ else
+ {
+ this->deactivate(surface); // Layout Manager task
+ }
+ return WMError::SUCCESS;
+}
+
void App::api_enddraw(char const *appid, char const *drawing_name)
{
- std::string id(appid);
- std::string role(drawing_name);
+ std::string id = appid;
+ std::string role = drawing_name;
unsigned current_req = g_app_list.currentRequestNumber();
bool result = g_app_list.setEndDrawFinished(current_req, id, role);
if (!result)
{
- HMI_ERROR("wm", "%s doesn't have Window Resource", id.c_str());
+ HMI_ERROR("wm", "%s is not in transition state", id.c_str());
return;
}
if (g_app_list.endDrawFullfilled(current_req))
{
// do task for endDraw
- //this->stop_timer();
- this->do_enddraw(current_req);
-
- this->stop_timer();
+ this->stopTimer();
+ WMError ret = this->doEndDraw(current_req);
- g_app_list.removeRequest(current_req);
- HMI_SEQ_INFO(current_req, "Finish request");
- g_app_list.next();
- if (g_app_list.haveRequest())
+ if(ret != WMError::SUCCESS)
{
- this->process_request();
+ //this->emit_error();
}
+ HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
+
+ g_app_list.removeRequest(current_req);
+
+ this->processNextRequest();
}
else
{
}
}
+void App::processNextRequest()
+{
+ g_app_list.next();
+ g_app_list.reqDump();
+ unsigned req_num = g_app_list.currentRequestNumber();
+ if (g_app_list.haveRequest())
+ {
+ HMI_SEQ_DEBUG(req_num, "Process next request");
+ WMError rc = doTransition(req_num);
+ if (rc != WMError::SUCCESS)
+ {
+ HMI_SEQ_ERROR(req_num, errorDescription(rc));
+ }
+ }
+ else
+ {
+ HMI_SEQ_DEBUG(req_num, "Nothing Request. Waiting Request");
+ }
+}
+
void App::api_ping() { this->dispatch_pending_events(); }
void App::send_event(char const *evname, char const *label)
this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
}
+void App::emit_syncdraw(const std::string &role, const std::string &area)
+{
+ int x = 0, y = 0, w = 0, h = 0;
+ //this->lm_get_area_info(area, &x, &y, &w, &h);
+ this->send_event(kListEventName[Event_SyncDraw],
+ role.c_str(), area.c_str(), x, y, w, h);
+}
+
void App::emit_flushdraw(char const *label)
{
this->send_event(kListEventName[Event_FlushDraw], label);
Code Review / apps / agl-service-windowmanager.git / blobdiff