return -1;
}
- // TODO: application requests by old role,
- // so create role map (old, new)
- // Load old_role.db
- this->loadOldRoleDb();
-
// Store my context for calling callback from PolicyManager
g_context = this;
double scale = static_cast<double>(dp_bg.height()) / css_bg.h;
this->lc->setupArea(dp_bg, scale);
- this->lc->createLayers();
-
return 0;
}
result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
+ string str_id = appid;
+ string role = drawing_name;
+ unsigned lid = 0;
- // auto lid = this->layers.get_layer_id(string(role));
- unsigned lid = this->lc->getLayerID(string(role));
- if (lid == 0)
+ if(!g_app_list.contains(str_id))
{
- /**
- * register drawing_name as fallback and make it displayed.
- */
- // lid = this->layers.get_layer_id(string("fallback"));
- lid = this->lc->getLayerID(string("fallback"));
- HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ lid = this->lc->getNewLayerID(role);
if (lid == 0)
{
- return Err<int>("Drawing name does not match any role, fallback is disabled");
+ // register drawing_name as fallback and make it displayed.
+ lid = this->lc->getNewLayerID(string("fallback"));
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ if (lid == 0)
+ {
+ return Err<int>("Designated role does not match any role, fallback is disabled");
+ }
}
+ this->lc->createNewLayer(lid);
+ // add client into the db
+ g_app_list.addClient(str_id, lid, role);
}
+ // generate surface ID for ivi-shell application
auto rname = this->id_alloc.lookup(role);
if (!rname)
{
// name does not exist yet, allocate surface id...
auto id = int(this->id_alloc.generate_id(role));
- // this->layers.add_surface(id, *lid);
- this->tmp_surface2app[id] = {string(appid), lid};
-
- // add client into the db
- string appid_str(appid);
- g_app_list.addClient(appid_str, lid, id, string(role));
-
- // Set role map of (new, old)
- this->rolenew2old[role] = string(drawing_name);
+ this->tmp_surface2app[id] = {str_id, lid};
return Ok<int>(id);
}
char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
char const *ivi_id)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
+ string str_id = appid;
+ string role = drawing_name;
unsigned sid = std::stol(ivi_id);
+ HMI_DEBUG("This API(requestSurfaceXDG) is for XDG Application using runXDG");
+ /*
+ * IVI-shell doesn't send surface_size event via ivi-wm protocol
+ * if the application is using XDG surface.
+ * So WM has to set surface size with original size here
+ */
WMError ret = this->lc->setXDGSurfaceOriginSize(sid);
if(ret != SUCCESS)
{
return "fail";
}
- // auto lid = this->layers.get_layer_id(string(role));
- auto lid = this->lc->getLayerID(string(role));
- if (lid == 0)
+ if(!g_app_list.contains(str_id))
{
- /**
- * register drawing_name as fallback and make it displayed.
- */
- lid = this->lc->getLayerID(string("fallback"));
- HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
- if (lid == 0)
+ unsigned l_id = this->lc->getNewLayerID(role);
+ if (l_id == 0)
{
- return "Drawing name does not match any role, fallback is disabled";
+ // register drawing_name as fallback and make it displayed.
+ l_id = this->lc->getNewLayerID("fallback");
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ if (l_id == 0)
+ {
+ return "Designated role does not match any role, fallback is disabled";
+ }
}
+ this->lc->createNewLayer(l_id);
+ // add client into the db
+ g_app_list.addClient(str_id, l_id, role);
}
auto rname = this->id_alloc.lookup(role);
// register pair drawing_name and ivi_id
this->id_alloc.register_name_id(role, sid);
- this->lc->addSurface(sid, lid);
-
- HMI_DEBUG("surface_id is %u, layer_id is %u", sid, lid);
-
- // add client into the list
- string appid_str(appid);
- g_app_list.addClient(appid_str, lid, sid, string(role));
- // Set role map of (new, old)
- this->rolenew2old[role] = string(drawing_name);
+ auto client = g_app_list.lookUpClient(str_id);
+ client->addSurface(sid);
return nullptr;
}
-void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
+void WindowManager::api_activate_window(char const *appid, char const *drawing_name,
char const *drawing_area, const reply_func &reply)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
string id = appid;
- string role = c_role;
+ string role = drawing_name;
string area = drawing_area;
if(!g_app_list.contains(id))
reply("app doesn't request 'requestSurface' or 'setRole' yet");
return;
}
-
auto client = g_app_list.lookUpClient(id);
+
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
WMError ret = WMError::UNKNOWN;
return;
}
- /*
- * Do allocate tasks
- */
+ // Do allocate tasks
+
ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
}
}
-void WindowManager::api_deactivate_surface(char const *appid, char const *drawing_name,
+void WindowManager::api_deactivate_window(char const *appid, char const *drawing_name,
const reply_func &reply)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
- /*
- * Check Phase
- */
+ // Check Phase
string id = appid;
- string role = c_role;
+ string role = drawing_name;
string area = ""; //drawing_area;
Task task = Task::TASK_RELEASE;
unsigned req_num = 0;
return;
}
- /*
- * Do allocate tasks
- */
+ // Do allocate tasks
ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
{
- // TODO: application requests by old role,
- // so convert role old to new
- const char *c_role = this->convertRoleOldToNew(drawing_name);
-
string id = appid;
- string role = c_role;
+ string role = drawing_name;
unsigned current_req = g_app_list.currentRequestNumber();
bool result = g_app_list.setEndDrawFinished(current_req, id, role);
// Undo state of PolicyManager
this->pmw.undoState();
+ this->lc->undoUpdate();
}
this->emitScreenUpdated(current_req);
HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
{
HMI_DEBUG("called");
- // TODO: application requests by old role,
- // so convert role old to new
- const char *role = this->convertRoleOldToNew(drawing_name);
+ string role = drawing_name;
// Check drawing name, surface/layer id
auto const &surface_id = this->id_alloc.lookup(role);
// requestSurface
if(this->tmp_surface2app.count(surface_id) != 0)
{
- unsigned layer_id = this->tmp_surface2app[surface_id].layer;
- this->lc->addSurface(surface_id, layer_id);
+ string appid = this->tmp_surface2app[surface_id].appid;
+ auto client = g_app_list.lookUpClient(appid);
+ if(client != nullptr)
+ {
+ WMError ret = client->addSurface(surface_id);
+ HMI_INFO("Add surface %d to \"%s\"", surface_id, appid.c_str());
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_ERROR("Failed to add surface to client %s", client->appID().c_str());
+ }
+ }
this->tmp_surface2app.erase(surface_id);
- HMI_DEBUG("surface_id is %u, layer_id is %u", surface_id, layer_id);
}
}
void WindowManager::removeClient(const string &appid)
{
HMI_DEBUG("Remove clinet %s from list", appid.c_str());
+ auto client = g_app_list.lookUpClient(appid);
+ this->lc->appTerminated(client);
g_app_list.removeClient(appid);
}
if ("" != act.role)
{
bool found;
- auto const &surface_id = this->id_alloc.lookup(act.role.c_str());
+ auto const &surface_id = this->id_alloc.lookup(act.role);
if(surface_id == nullopt)
{
goto proc_remove_request;
}
- string appid = g_app_list.getAppID(*surface_id, act.role, &found);
+ string appid = g_app_list.getAppID(*surface_id, &found);
if (!found)
{
if (TaskVisible::INVISIBLE == act.visible)
{
struct rect rect = this->lc->getAreaSize(area);
this->send_event(kListEventName[Event_SyncDraw],
- role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+ role, area, rect.x, rect.y, rect.w, rect.h);
}
void WindowManager::emit_flushdraw(const string& role)
}
string req_area = trigger.area;
- if (trigger.task == Task::TASK_ALLOCATE)
- {
- const char *msg = this->check_surface_exist(trigger.role.c_str());
-
- if (msg)
- {
- HMI_SEQ_ERROR(req_num, msg);
- return ret;
- }
- }
-
// Input event data to PolicyManager
if (0 > this->pmw.setInputEventData(trigger.task, trigger.role, trigger.area))
{
return ret;
}
+ g_app_list.reqDump();
for (const auto &action : actions)
{
if (action.visible == TaskVisible::VISIBLE)
{
sync_draw_happen = true;
-
- // TODO: application requests by old role,
- // so convert role new to old for emitting event
- string old_role = this->rolenew2old[action.role];
-
- this->emit_syncdraw(old_role, action.area);
+ this->emit_syncdraw(action.role, action.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); */
for (const auto &x : actions)
{
this->lc->visibilityChange(x);
- string old_role = this->rolenew2old[x.role];
- emit_deactivated(old_role.c_str());
+ emit_deactivated(x.role);
/* if (g_app_list.contains(x.client->appID()))
{
auto client = g_app_list.lookUpClient(x.client->appID());
this->deactivate(client->surfaceID(x.role));
} */
}
+ this->lc->renderLayers();
ret = WMError::NO_LAYOUT_CHANGE;
}
return ret;
}
ret = this->lc->visibilityChange(act);
- // Emit active/deactive event
- string old_role = this->rolenew2old[act.role];
if(act.visible == VISIBLE)
{
- emit_activated(old_role.c_str());
+ emit_visible(act.role);
+ emit_activated(act.role);
}
else
{
- emit_deactivated(old_role.c_str());
+ emit_invisible(act.role);
+ emit_deactivated(act.role);
}
if (ret != WMError::SUCCESS)
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
}
}
+ this->lc->renderLayers();
HMI_SEQ_INFO(req_num, "emit flushDraw");
{
if(act_flush.visible == TaskVisible::VISIBLE)
{
- // TODO: application requests by old role,
- // so convert role new to old for emitting event
- string old_role = this->rolenew2old[act_flush.role];
-
- this->emit_flushdraw(old_role.c_str());
+ this->emit_flushdraw(act_flush.role);
}
}
}
}
-const char* WindowManager::convertRoleOldToNew(char const *old_role)
-{
- const char *new_role = nullptr;
-
- for (auto const &on : this->roleold2new)
- {
- std::regex regex = std::regex(on.first);
- if (std::regex_match(old_role, regex))
- {
- // role is old. So convert to new.
- new_role = on.second.c_str();
- break;
- }
- }
-
- if (nullptr == new_role)
- {
- // role is new or fallback.
- new_role = old_role;
- }
-
- HMI_DEBUG("old:%s -> new:%s", old_role, new_role);
-
- return new_role;
-}
-
-int WindowManager::loadOldRoleDb()
-{
- // Get afm application installed dir
- char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
- HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
-
- string file_name;
- if (!afm_app_install_dir)
- {
- HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
- }
- else
- {
- file_name = string(afm_app_install_dir) + string("/etc/old_roles.db");
- }
-
- // Load old_role.db
- json_object* json_obj;
- int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
- if (0 > ret)
- {
- HMI_ERROR("Could not open old_role.db, so use default old_role information");
- json_obj = json_tokener_parse(kDefaultOldRoleDb);
- }
- HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj));
-
- // Perse apps
- json_object* json_cfg;
- if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
-
- int len = json_object_array_length(json_cfg);
- HMI_DEBUG("json_cfg len:%d", len);
- HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg));
-
- for (int i=0; i<len; i++)
- {
- json_object* json_tmp = json_object_array_get_idx(json_cfg, i);
-
- const char* old_role = jh::getStringFromJson(json_tmp, "name");
- if (nullptr == old_role)
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
-
- const char* new_role = jh::getStringFromJson(json_tmp, "new");
- if (nullptr == new_role)
- {
- HMI_ERROR("Parse Error!!");
- return -1;
- }
-
- this->roleold2new[old_role] = string(new_role);
- }
-
- // Check
- for(auto itr = this->roleold2new.begin();
- itr != this->roleold2new.end(); ++itr)
- {
- HMI_DEBUG(">>> role old:%s new:%s",
- itr->first.c_str(), itr->second.c_str());
- }
-
- // Release json_object
- json_object_put(json_obj);
-
- return 0;
-}
-
-const char *WindowManager::check_surface_exist(const char *drawing_name)
-{
- auto const &surface_id = this->id_alloc.lookup(drawing_name);
- if (!surface_id)
- {
- return "Surface does not exist";
- }
- return nullptr;
-}
-
-const char* WindowManager::kDefaultOldRoleDb = "{ \
- \"old_roles\": [ \
- { \
- \"name\": \"HomeScreen\", \
- \"new\": \"homescreen\" \
- }, \
- { \
- \"name\": \"Music\", \
- \"new\": \"music\" \
- }, \
- { \
- \"name\": \"MediaPlayer\", \
- \"new\": \"music\" \
- }, \
- { \
- \"name\": \"Video\", \
- \"new\": \"video\" \
- }, \
- { \
- \"name\": \"VideoPlayer\", \
- \"new\": \"video\" \
- }, \
- { \
- \"name\": \"WebBrowser\", \
- \"new\": \"browser\" \
- }, \
- { \
- \"name\": \"Radio\", \
- \"new\": \"radio\" \
- }, \
- { \
- \"name\": \"Phone\", \
- \"new\": \"phone\" \
- }, \
- { \
- \"name\": \"Navigation\", \
- \"new\": \"map\" \
- }, \
- { \
- \"name\": \"HVAC\", \
- \"new\": \"hvac\" \
- }, \
- { \
- \"name\": \"Settings\", \
- \"new\": \"settings\" \
- }, \
- { \
- \"name\": \"Dashboard\", \
- \"new\": \"dashboard\" \
- }, \
- { \
- \"name\": \"POI\", \
- \"new\": \"poi\" \
- }, \
- { \
- \"name\": \"Mixer\", \
- \"new\": \"mixer\" \
- }, \
- { \
- \"name\": \"Restriction\", \
- \"new\": \"restriction\" \
- }, \
- { \
- \"name\": \"^OnScreen.*\", \
- \"new\": \"on_screen\" \
- } \
- ] \
-}";
-
} // namespace wm
Code Review / apps / agl-service-windowmanager.git / blobdiff