X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=acf3b769ca77d004e0c3825408a35da09b7df459;hb=b7a4072188f9370c456d65832634c1f136e18f32;hp=d2842792a09e5b313a460736e4efc3c97dcf2b9e;hpb=8511ed4c4badc890e1e458d93f6471d667e65e6f;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index d284279..acf3b76 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -130,6 +130,8 @@ WindowManager::WindowManager() this->lc = std::make_shared(root); + HMI_DEBUG("Layer Controller initialized"); + /* try { { @@ -166,6 +168,11 @@ int WindowManager::init() // 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); + }; + this->lc->init(lmcb); this->loadOldRoleDb(); // Store my context for calling callback from PolicyManager @@ -194,7 +201,7 @@ int WindowManager::init() css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height()); double scale = static_cast(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) { @@ -253,30 +260,40 @@ result WindowManager::api_request_surface(char const *appid, char const *dr // 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("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("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 @@ -287,9 +304,7 @@ result WindowManager::api_request_surface(char const *appid, char const *dr // 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)) { @@ -336,7 +351,9 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr } } - auto rname = this->lookup_id(role); + this->lc->createNewLayer(lid); + + auto rname = this->id_alloc.lookup(str); if (rname) { @@ -355,7 +372,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr // 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); @@ -423,7 +440,7 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un 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 @@ -470,14 +487,11 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ } 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; @@ -506,7 +520,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ /* * Do allocate tasks */ - ret = this->doTransition(req_num); + ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { @@ -558,7 +572,7 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin /* * Do allocate tasks */ - ret = this->doTransition(req_num); + ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { @@ -646,7 +660,7 @@ result WindowManager::api_get_area_info(char const *drawing_name) 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("Surface does not exist"); @@ -719,6 +733,25 @@ void WindowManager::send_event(char const *evname, char const *label, char const */ 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); @@ -809,6 +842,7 @@ void WindowManager::timerHandler() void WindowManager::startTransitionWrapper(vector &actions) { WMError ret; + // req_num is guaranteed by Window Manager unsigned req_num = g_app_list.currentRequestNumber(); if (actions.empty()) @@ -830,8 +864,8 @@ void WindowManager::startTransitionWrapper(vector &actions) 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) @@ -846,7 +880,9 @@ void WindowManager::startTransitionWrapper(vector &actions) 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); @@ -898,15 +934,6 @@ void WindowManager::processError(WMError error) ******* Private Functions ******* */ -optional WindowManager::lookup_id(char const *name) -{ - return this->id_alloc.lookup(string(name)); -} -optional WindowManager::lookup_name(int id) -{ - return this->id_alloc.lookup(id); -} - /** * init_layers() */ @@ -1046,9 +1073,9 @@ void WindowManager::emit_syncdraw(char const *label, char const *area, int x, in 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) @@ -1076,7 +1103,7 @@ void WindowManager::activate(int id) 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")) || @@ -1126,7 +1153,7 @@ void WindowManager::deactivate(int id) 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")) || @@ -1200,13 +1227,6 @@ WMError WindowManager::setRequest(const string& appid, const string &role, const 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) { /* @@ -1269,6 +1289,7 @@ WMError WindowManager::startTransition(unsigned req_num) return ret; } + g_app_list.reqDump(); for (const auto &action : actions) { if (action.visible == TaskVisible::VISIBLE) @@ -1296,12 +1317,14 @@ WMError WindowManager::startTransition(unsigned req_num) // 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->commitChange(); ret = WMError::NO_LAYOUT_CHANGE; } return ret; @@ -1327,17 +1350,14 @@ WMError WindowManager::doEndDraw(unsigned req_num) 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, @@ -1348,7 +1368,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) //this->lc_enddraw(act.role.c_str()); } } - this->layout_commit(); + this->lc->commitChange(); HMI_SEQ_INFO(req_num, "emit flushDraw"); @@ -1374,7 +1394,8 @@ WMError WindowManager::layoutChange(const WMAction &action) // 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) { @@ -1383,14 +1404,14 @@ WMError WindowManager::layoutChange(const WMAction &action) 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); @@ -1400,17 +1421,18 @@ WMError WindowManager::visibilityChange(const WMAction &action) 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) @@ -1435,7 +1457,7 @@ void WindowManager::emitScreenUpdated(unsigned req_num) { 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); @@ -1495,7 +1517,7 @@ void WindowManager::processNextRequest() 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)); @@ -1608,7 +1630,7 @@ int WindowManager::loadOldRoleDb() 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";