static sd_event_source *g_timer_ev_src = nullptr;
+static AppList g_app_list;
+
namespace
{
void App::timerHandler()
{
- unsigned req_num = app_list->currentRequestNumber();
+ unsigned req_num = g_app_list.currentRequestNumber();
HMI_SEQ_DEBUG(req_num, "Timer expired remove Request");
- app_list->reqDump();
- app_list->removeRequest(req_num);
- app_list->next();
- app_list->reqDump();
- if (app_list->haveRequest())
+ 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();
}
void App::removeClient(const std::string &appid)
{
HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str());
- app_list->removeClient(appid);
+ g_app_list.removeClient(appid);
}
bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname)
{
- if(!app_list->contains(appid)){
+ if(!g_app_list.contains(appid)){
HMI_DEBUG("wm", "Client %s is not registered", appid.c_str());
return false;
}
- auto client = app_list->lookUpClient(appid);
+ auto client = g_app_list.lookUpClient(appid);
return client->subscribe(req, evname);
}
layers(),
id_alloc{},
pending_events(false),
- policy{},
- app_list(std::make_unique<AppList>())
+ policy{}
+ //g_app_list(new AppList())
+ //g_app_list(std::make_unique<AppList>())
{
try
{
void App::set_timer()
{
- HMI_SEQ_DEBUG(app_list->currentRequestNumber(), "Timer set activate");
+ HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
if (g_timer_ev_src == nullptr)
{
// firsttime set into sd_event
void App::stop_timer()
{
- unsigned req_num = app_list->currentRequestNumber();
+ unsigned req_num = g_app_list.currentRequestNumber();
HMI_SEQ_DEBUG(req_num, "Timer stop");
int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF);
if (rc < 0)
{
//auto const &surface_id = this->lookup_id(drawing_name);
WMError ret = WMError::LAYOUT_CHANGE_FAIL;
- unsigned req_num = app_list->currentRequestNumber();
+ unsigned req_num = g_app_list.currentRequestNumber();
auto const &surface_id = this->lookup_id(action.role.c_str());
if (!surface_id)
{
TODO: emit syncDraw with application*/
if (msg)
{
- HMI_SEQ_DEBUG(app_list->currentRequestNumber(), msg);
+ HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg);
return WMError::LAYOUT_CHANGE_FAIL;
}
this->lm_layout_change(action.role.c_str());
// get current trigger
bool found;
bool is_activate = true;
- auto trigger = app_list->getRequest(req_num, &found);
+ auto trigger = g_app_list.getRequest(req_num, &found);
if(!found)
{
WMError err = WMError::NO_ENTRY;
(json_object*?) newLayout = checkPolicy(trigger);
(vector<struct WMAction>&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout)
for(const auto& x : actions){
- app_list->setAciton(req_num, x)
+ g_app_list.setAciton(req_num, x)
}
or
- translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num);
+ translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num);
/* The following error check is not necessary because main.cpp will reject the message form not registered object
} */
{
is_activate = false;
}
- WMError ret = app_list->setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
- app_list->reqDump();
+ WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
+ g_app_list.reqDump();
if (ret != WMError::SUCCESS)
{
// layer manager task
bool sync_draw_happen = false;
- for (const auto &y : app_list->getActions(req_num, &found))
+ for (const auto &y : g_app_list.getActions(req_num, &found))
{
if (!found)
{
{
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());
- app_list->removeRequest(req_num);
+ g_app_list.removeRequest(req_num);
break;
// TODO: if transition fails, what should we do?
}
- /* app_list->lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
+ /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
}
else
{
if (!ret)
{
HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str());
- app_list->removeRequest(req_num);
+ g_app_list.removeRequest(req_num);
break;
// TODO: if transition fails, what should we do?
}
- /* app_list->lookUpClient(y.appid)->emit_invisible(y.role, y.area); */
+ /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */
}
}
}
else
{
- app_list->removeRequest(req_num); // HACK!!!
+ g_app_list.removeRequest(req_num); // HACK!!!
}
return ret;
}
std::string hack_appid = "navigation";
std::string hack_role = main;
std::string hack_area = str_area_main;
- app_list->setAction(app_list->currentRequestNumber(), hack_appid, hack_role, hack_area, true);
- //app_list->setEndDrawFinished(app_list->currentRequestNumber(), request_role, request_role);
- //app_list->setEndDrawFinished(app_list->currentRequestNumber(), hack_appid, hack_role); // This process is illegal
+ g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true);
+ //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), request_role, request_role);
+ //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), hack_appid, hack_role); // This process is illegal
// >>> HACK
this->emit_syncdraw(main.c_str(), str_area_main.c_str(),
area_rect_main.x, area_rect_main.y,
std::string role = drawing_name;
std::string area = drawing_area;
- if (!app_list->contains(id))
+ if (!g_app_list.contains(id))
{
reply("app doesn't request 'requestSurface' yet");
return;
}
- auto client = app_list->lookUpClient(id);
+ auto client = g_app_list.lookUpClient(id);
unsigned srfc = client->surfaceID(role);
if(srfc == INVALID_SURFACE_ID){
reply("role should be set with surface");
return;
}
- app_list->removeFloatingSurface(client->surfaceID(role));
+ g_app_list.removeFloatingSurface(client->surfaceID(role));
/*
* Queueing Phase
*/
- unsigned current = app_list->currentRequestNumber();
- unsigned requested_num = app_list->getRequestNumber(id);
+ unsigned current = g_app_list.currentRequestNumber();
+ unsigned requested_num = g_app_list.getRequestNumber(id);
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());
}
WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
- unsigned new_req = app_list->addAllocateRequest(req);
- app_list->reqDump();
+ unsigned new_req = g_app_list.addAllocateRequest(req);
+ g_app_list.reqDump();
HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
std::string role = drawing_name;
std::string area = ""; //drawing_area;
- if (!app_list->contains(id))
+ if (!g_app_list.contains(id))
{
reply("app doesn't request 'requestSurface' yet");
return;
}
- auto client = app_list->lookUpClient(id);
+ auto client = g_app_list.lookUpClient(id);
/*
* Queueing Phase
*/
- unsigned current = app_list->currentRequestNumber();
- unsigned requested_num = app_list->getRequestNumber(id);
+ unsigned current = g_app_list.currentRequestNumber();
+ unsigned requested_num = g_app_list.getRequestNumber(id);
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());
}
WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE);
- unsigned new_req = app_list->addAllocateRequest(req);
- app_list->reqDump();
+ unsigned new_req = g_app_list.addAllocateRequest(req);
+ g_app_list.reqDump();
HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
{
// get actions
bool found;
- auto actions = app_list->getActions(req_num, &found);
+ auto actions = g_app_list.getActions(req_num, &found);
if (!found)
{
WMError err = WMError::NO_ENTRY;
/* do
{
// emit flush Draw
- //emitFlushDrawToAll(&app_list, req_num);
+ //emitFlushDrawToAll(&g_app_list, req_num);
// emit status change event
- } while (!app_list->requestFinished());*/
+ } while (!g_app_list.requestFinished());*/
}
void App::process_request()
{
- unsigned req = app_list->currentRequestNumber();
+ unsigned req = g_app_list.currentRequestNumber();
HMI_SEQ_DEBUG(req, "Do next request");
WMError rc = do_transition(req);
if(rc != WMError::SUCCESS){
{
std::string id(appid);
std::string role(drawing_name);
- unsigned current_req = app_list->currentRequestNumber();
- bool result = app_list->setEndDrawFinished(current_req, id, role);
+ unsigned current_req = g_app_list.currentRequestNumber();
+ bool result = g_app_list.setEndDrawFinished(current_req, id, role);
if (!result)
{
return;
}
- if (app_list->endDrawFullfilled(current_req))
+ if (g_app_list.endDrawFullfilled(current_req))
{
// do task for endDraw
//this->stop_timer();
this->stop_timer();
- app_list->removeRequest(current_req);
+ g_app_list.removeRequest(current_req);
HMI_SEQ_INFO(current_req, "Finish request");
- app_list->next();
- if (app_list->haveRequest())
+ g_app_list.next();
+ if (g_app_list.haveRequest())
{
this->process_request();
}
*/
void App::surface_created(uint32_t surface_id)
{
- // For set role function
- HMI_DEBUG("wm", "Get surface pid");
- this->controller->get_surface_properties(surface_id);
-
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
this->controller->layers[*layer_id]->add_surface(surface_id);
this->layout_commit();
+ // For set role function
+ HMI_DEBUG("wm", "Get surface pid");
+ this->controller->get_surface_properties(surface_id);
+
// activate the main_surface right away
/*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id);
{
HMI_DEBUG("wm", "surface_id is %u", surface_id);
- app_list->removeSurface(surface_id);
+ g_app_list.removeSurface(surface_id);
}
void App::surface_properties(unsigned surface_id, unsigned pid)
{
HMI_DEBUG("wm", "get surface properties");
- this->app_list->addFloatingSurface(surface_id, pid);
+ g_app_list.addFloatingSurface(surface_id, pid);
}
void App::emit_activated(char const *label)
// add client into the db
std::string appid_str(appid);
std::string role(drawing_name);
- //app_list->addClient(appid_str, role);
- app_list->addClient(appid_str, *lid, id, role);
+ //g_app_list.addClient(appid_str, role);
+ g_app_list.addClient(appid_str, *lid, id, role);
return Ok<int>(id);
}
if(0 != pid){
// search floating surfaceID from pid if pid is designated.
// It is not good that application request with its pid
- wm_err = app_list->popFloatingSurface(pid, &surface);
+ wm_err = g_app_list.popFloatingSurface(pid, &surface);
}
else{
// get floating surface with appid. If WM queries appid from pid,
// WM can bind surface and role with appid(not implemented yet)
- //wm_err = app_list->popFloatingSurface(id);
+ //wm_err = g_app_list.popFloatingSurface(id);
}
if(wm_err != WMError::SUCCESS){
HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
- app_list->addFloatingClient(id, *lid, role);
+ g_app_list.addFloatingClient(id, *lid, role);
HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str());
return ret;
}
ret = true;
- if (app_list->contains(id))
+ if (g_app_list.contains(id))
{
HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.",
role.c_str(), surface, id.c_str());
- wm_err = app_list->appendRole(id, role, surface);
+ wm_err = g_app_list.appendRole(id, role, surface);
if(wm_err != WMError::SUCCESS){
HMI_INFO("wm", errorDescription(wm_err));
}
else{
HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s",
id.c_str(), surface, *lid, role.c_str());
- app_list->addClient(id, *lid, surface, role);
+ g_app_list.addClient(id, *lid, surface, role);
}
+
+ // register pair drawing_name and ivi_id
+ this->id_alloc.register_name_id(role.c_str(), surface);
+ this->layers.add_surface(surface, *lid);
+
+ // this surface is already created
+ HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid);
+
+ this->controller->layers[*lid]->add_surface(surface);
+ this->layout_commit();
+
return ret;
}
Code Review / apps / agl-service-windowmanager.git / blobdiff