this->lc = std::make_shared<LayerControl>(root);
+ HMI_DEBUG("Layer Controller initialized");
+
/* try
{
{
// TODO: application requests by old role,
// so create role map (old, new)
// Load old_role.db
+ LayerControlCallbacks lmcb;
+ lmcb.surfaceCreated = [&](unsigned pid, unsigned surface){
+ this->surface_created(surface);
+ };
+ lmcb.surfaceDestroyed = [&](unsigned surface){
+ this->surface_removed(surface);
+ };
+ this->lc->init(lmcb);
this->loadOldRoleDb();
// Store my context for calling callback from PolicyManager
css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
double scale = static_cast<double>(dp_bg.height()) / css_bg.h;
- this->lc->setupArea(scale);
+ this->lc->setupArea(dp_bg, scale);
/* this->display->add_global_handler(
"wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) {
// so convert role old to new
const char *role = this->convertRoleOldToNew(drawing_name);
string l_name;
+ string s_appid = appid;
+ string s_role = role;
- // auto lid = this->layers.get_layer_id(string(role));
- unsigned l_id = this->lc->getNewLayerID(role, &l_name);
- if (l_id == 0)
+ if(!g_app_list.contains(s_appid))
{
- /**
- * register drawing_name as fallback and make it displayed.
- */
- // lid = this->layers.get_layer_id(string("fallback"));
- l_id = this->lc->getNewLayerID("fallback", &l_name);
- HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ // auto lid = this->layers.get_layer_id(string(role));
+ unsigned l_id = this->lc->getNewLayerID(s_role, &l_name);
if (l_id == 0)
{
- return Err<int>("Designated role does not match any role, fallback is disabled");
+ /**
+ * register drawing_name as fallback and make it displayed.
+ */
+ // lid = this->layers.get_layer_id(string("fallback"));
+ l_id = this->lc->getNewLayerID("fallback", &l_name);
+ HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+ if (l_id == 0)
+ {
+ return Err<int>("Designated role does not match any role, fallback is disabled");
+ }
}
+ this->lc->createNewLayer(l_id);
+ // add client into the db
+ g_app_list.addClient(s_appid, l_id, s_role);
}
// generate surface ID for ivi-shell application
- auto rname = this->lookup_id(role);
+ auto rname = this->id_alloc.lookup(string(role));
if (!rname)
{
// name does not exist yet, allocate surface id...
auto id = int(this->id_alloc.generate_id(role));
+ this->tmp_surface2app[id] = s_appid;
+
// this->layers.add_surface(id, *lid);
// set the main_surface[_name] here and now
// HMI_DEBUG("Set main_surface id to %u", id);
// }
- // add client into the db
- string appid_str(appid);
- g_app_list.addClient(appid_str, l_id, l_name, id, string(role));
+
/* if(g_app_list.contains(appid_str))
{
}
}
- auto rname = this->lookup_id(role);
+ this->lc->createNewLayer(lid);
+
+ auto rname = this->id_alloc.lookup(str);
if (rname)
{
// add client into the db
string appid_str(appid);
- g_app_list.addClient(appid_str, lid, l_name, sid, string(role));
+ g_app_list.addClient(appid_str, lid, string(role));
// Set role map of (new, old)
this->rolenew2old[role] = string(drawing_name);
else{
HMI_INFO("Create new client: %s, surface: %d into layer: %d with role: %s",
id.c_str(), surface, lid, role.c_str());
- g_app_list.addClient(id, lid, l_name, surface, role);
+ g_app_list.addClient(id, lid, role);
}
// register pair drawing_name and ivi_id
}
auto client = g_app_list.lookUpClient(id);
- unsigned srfc = client->surfaceID(role);
- if(srfc == 0)
- {
- HMI_ERROR("role sould be set with surface");
- reply("role sould be set with surface");
- return;
- }
- g_app_list.removeFloatingSurface(client->surfaceID());
+ // unsigned srfc = client->surfaceID(role);
+ // unsigned layer = client->layerID();
+
+ // g_app_list.removeFloatingSurface(client->surfaceID());
+ // g_app_list.removeFloatingSurface(client);
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
/*
* Do allocate tasks
*/
- ret = this->doTransition(req_num);
+ ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
{
/*
* Do allocate tasks
*/
- ret = this->doTransition(req_num);
+ ret = this->checkPolicy(req_num);
if (ret != WMError::SUCCESS)
{
const char *role = this->convertRoleOldToNew(drawing_name);
// Check drawing name, surface/layer id
- auto const &surface_id = this->lookup_id(role);
+ auto const &surface_id = this->id_alloc.lookup(string(role));
if (!surface_id)
{
return Err<json_object *>("Surface does not exist");
*/
void WindowManager::surface_created(uint32_t surface_id)
{
+ if(this->tmp_surface2app.count(surface_id) != 0)
+ {
+ string appid = this->tmp_surface2app[surface_id];
+ this->tmp_surface2app.erase(surface_id);
+ if(g_app_list.contains(appid))
+ {
+ auto client = g_app_list.lookUpClient(appid);
+ WMError ret = client->addSurface(surface_id);
+ HMI_INFO("Add surface %d to \"%s\"", appid.c_str());
+ if(ret != WMError::SUCCESS)
+ {
+ HMI_ERROR("Failed to add surface to client %s", client->appID().c_str());
+ }
+ }
+ }
+ else
+ {
+ HMI_NOTICE("Unknown surface %d", surface_id);
+ }
/* this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
auto layer_id = this->layers.get_layer_id(surface_id);
void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
{
WMError ret;
+ // req_num is guaranteed by Window Manager
unsigned req_num = g_app_list.currentRequestNumber();
if (actions.empty())
if ("" != act.role)
{
bool found;
- auto const &surface_id = this->lookup_id(act.role.c_str());
- string appid = g_app_list.getAppID(*surface_id, act.role, &found);
+ auto const &surface_id = this->id_alloc.lookup(act.role);
+ string appid = g_app_list.getAppID(*surface_id, &found);
if (!found)
{
if (TaskVisible::INVISIBLE == act.visible)
goto error;
}
}
- act.appid = appid;
+ auto client = g_app_list.lookUpClient(appid);
+ act.req_num = req_num;
+ act.client = client;
}
ret = g_app_list.setAction(req_num, act);
******* Private Functions *******
*/
-optional<int> WindowManager::lookup_id(char const *name)
-{
- return this->id_alloc.lookup(string(name));
-}
-optional<string> WindowManager::lookup_name(int id)
-{
- return this->id_alloc.lookup(id);
-}
-
/**
* init_layers()
*/
void WindowManager::emit_syncdraw(const string &role, const string &area)
{
-/* rect rect = this->layers.getAreaSize(area);
+ 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.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
}
void WindowManager::emit_flushdraw(char const *label)
this->controller->surfaces[id]->set_visibility(1);
*/
char const *label =
- this->lookup_name(id).value_or("unknown-name").c_str();
+ this->id_alloc.lookup(id).value_or("unknown-name").c_str();
/* // FOR CES DEMO >>>
if ((0 == strcmp(label, "radio")) ||
if (ip != this->controller->sprops.end())
{*/
char const *label =
- this->lookup_name(id).value_or("unknown-name").c_str();
+ this->id_alloc.lookup(id).value_or("unknown-name").c_str();
/*// FOR CES DEMO >>>
if ((0 == strcmp(label, "radio")) ||
return WMError::SUCCESS;
}
-WMError WindowManager::doTransition(unsigned req_num)
-{
- HMI_SEQ_DEBUG(req_num, "check policy");
- WMError ret = this->checkPolicy(req_num);
- return ret;
-}
-
WMError WindowManager::checkPolicy(unsigned req_num)
{
/*
return ret;
}
+ g_app_list.reqDump();
for (const auto &action : actions)
{
if (action.visible == TaskVisible::VISIBLE)
// Make it deactivate here
for (const auto &x : actions)
{
- if (g_app_list.contains(x.appid))
+ this->lc->visibilityChange(x);
+ /* if (g_app_list.contains(x.appid))
{
auto client = g_app_list.lookUpClient(x.appid);
- this->deactivate(client->surfaceID(x.role));
- }
+ //this->deactivate(client->surfaceID(x.role));
+ } */
}
+ this->lc->renderLayers();
ret = WMError::NO_LAYOUT_CHANGE;
}
return ret;
if(act.visible != TaskVisible::NO_CHANGE)
{
// layout change
- if(!g_app_list.contains(act.appid)){
- ret = WMError::NOT_REGISTERED;
- }
- ret = this->layoutChange(act);
+ ret = this->lc->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);
+ ret = this->lc->visibilityChange(act);
if (ret != WMError::SUCCESS)
{
HMI_SEQ_WARNING(req_num,
//this->lc_enddraw(act.role.c_str());
}
}
- this->layout_commit();
+ this->lc->renderLayers();
HMI_SEQ_INFO(req_num, "emit flushDraw");
// Visibility is not change -> no redraw is required
return WMError::SUCCESS;
}
- auto client = g_app_list.lookUpClient(action.appid);
+ WMError ret = this->lc->layoutChange(action);
+ /* auto client = g_app_list.lookUpClient(action.appid);
unsigned surface = client->surfaceID(action.role);
if (surface == 0)
{
return WMError::NOT_REGISTERED;
}
// Layout Manager
- WMError ret = this->setSurfaceSize(surface, action.area);
+ WMError ret = this->setSurfaceSize(surface, action.area); */
return ret;
}
WMError WindowManager::visibilityChange(const WMAction &action)
{
HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Change visibility");
- if(!g_app_list.contains(action.appid)){
+ /* if(!g_app_list.contains(action.appid)){
return WMError::NOT_REGISTERED;
}
auto client = g_app_list.lookUpClient(action.appid);
HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
"client doesn't have surface with role(%s)", action.role.c_str());
return WMError::NOT_REGISTERED;
- }
+ } */
+ WMError ret = this->lc->visibilityChange(action);
- if (action.visible != TaskVisible::INVISIBLE)
+/* if (action.visible != TaskVisible::INVISIBLE)
{
this->activate(surface); // Layout Manager task
}
else
{
this->deactivate(surface); // Layout Manager task
- }
- return WMError::SUCCESS;
+ } */
+ return ret;
}
WMError WindowManager::setSurfaceSize(unsigned surface, const string &area)
{
if(action.visible != TaskVisible::INVISIBLE)
{
- json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
+ json_object_array_add(jarray, json_object_new_string(action.client->appID().c_str()));
}
}
json_object_object_add(j, kKeyIds, jarray);
if (g_app_list.haveRequest())
{
HMI_SEQ_DEBUG(req_num, "Process next request");
- WMError rc = doTransition(req_num);
+ WMError rc = checkPolicy(req_num);
if (rc != WMError::SUCCESS)
{
HMI_SEQ_ERROR(req_num, errorDescription(rc));
const char *WindowManager::check_surface_exist(const char *drawing_name)
{
- auto const &surface_id = this->lookup_id(drawing_name);
+ auto const &surface_id = this->id_alloc.lookup(string(drawing_name));
if (!surface_id)
{
return "Surface does not exist";
Code Review / apps / agl-service-windowmanager.git / blobdiff