X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwm_layer_control.cpp;h=f3f709fbb6fea610ad3ef034ca31c363cfd770d1;hb=refs%2Ftags%2Fkoi%2F10.92.0;hp=951c840065fb16742bdf4e8d42d58582b1c08543;hpb=b1f7a756ff0fce7ff38d24b256476902f748be0b;p=apps%2Fagl-service-windowmanager.git diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index 951c840..f3f709f 100644 --- a/src/wm_layer_control.cpp +++ b/src/wm_layer_control.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 2018,2019 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +22,10 @@ #include "request.hpp" #include "json_helper.hpp" -#define LC_AREA_PATH "/etc/areas.db" -#define LC_LAYER_SETTING_PATH "/etc/layers.json" +#define LC_AREA_FILE "areas.json" +#define LC_LAYER_SETTING_FILE "layers.json" #define LC_DEFAULT_AREA "fullscreen" +#define LC_REMOTE_DEFAULT_AREA "remote.fullscreen" #define BACK_GROUND_LAYER "BackGroundLayer" using std::string; @@ -58,8 +60,8 @@ static void layerCallback_static(t_ilm_layer layer, LayerControl::LayerControl(const std::string& root) { - string area_path = root + LC_AREA_PATH; - string layer_path= root + LC_LAYER_SETTING_PATH; + string area_path(get_file_path(LC_AREA_FILE, root.c_str())); + string layer_path(get_file_path(LC_LAYER_SETTING_FILE, root.c_str())); // load layers.setting.json WMError ret = this->loadLayerSetting(layer_path); assert(ret == WMError::SUCCESS); @@ -102,6 +104,18 @@ WMError LayerControl::init(const LayerControlCallbacks& cb) // Currently, 0 is only available this->screenID = ids[0]; + if (1 < num) + { + // TODO: set remote screen id + HMI_INFO("There is remote screen (id:%d)", ids[1]); + this->remoteScreenID = ids[1]; + } + else + { + HMI_INFO("There is no remote screen"); + this->remoteScreenID = -1; + } + rc = ilm_getPropertiesOfScreen(this->screenID, &this->screen_prop); if(rc != ILM_SUCCESS) goto lc_init_error; @@ -118,48 +132,46 @@ lc_init_error: return WMError::FAIL; } -unsigned LayerControl::getLayerID(const string& role) +void LayerControl::createNewLayer(unsigned id, bool remote) +{ + HMI_INFO("create new ID :%d%s", id, remote ? " (For remote layer)" : ""); + struct rect rct = this->area2size[remote ? LC_REMOTE_DEFAULT_AREA : LC_DEFAULT_AREA]; + ilm_layerCreateWithDimension(&id, rct.w, rct.h); + //ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h); + ilm_layerSetDestinationRectangle(id, this->offset_x, this->offset_y, rct.w, rct.h); + ilm_layerSetOpacity(id, 1.0); + ilm_layerSetVisibility(id, ILM_FALSE); + ilm_commitChanges(); + auto wm_layer = getWMLayer(id); + wm_layer->addLayerToState(id); + wm_layer->setRemote(remote); + this->renderLayers(); +} + +unsigned LayerControl::getNewLayerID(const string& role, std::string* layer_name) { unsigned ret = 0; for(const auto& l: this->wm_layers) { - if(l->hasRole(role)) + ret = l->getNewLayerID(role); + if(ret != 0) { - ret = l->layerID(); + unsigned wmlid = l->getWMLayerID(); + this->lid2wmlid[ret] = wmlid; + if(layer_name) + { + *layer_name = l->layerName(); + } + break; } } return ret; } -void LayerControl::addSurface(unsigned surface, unsigned layer) -{ - ilm_layerAddSurface(layer, surface); - ilm_commitChanges(); -} - -void LayerControl::createLayers() -{ - for(const auto &layer : this->wm_layers) - { - unsigned id = layer->layerID(); - HMI_INFO("create new ID :%d", id); - struct rect rct = this->area2size[LC_DEFAULT_AREA]; - ilm_layerCreateWithDimension(&id, rct.w, rct.h); - //ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h); - ilm_layerSetDestinationRectangle(id, this->offset_x, this->offset_y, rct.w, rct.h); - ilm_layerSetOpacity(id, 1.0); - ilm_layerSetVisibility(id, ILM_TRUE); - ilm_commitChanges(); - /* auto wm_layer = getWMLayer(id); - wm_layer->addLayerToState(id); */ - } - this->renderLayers(); -} - shared_ptr LayerControl::getWMLayer(unsigned layer) { - unsigned uuid = this->lid2wmlid[layer]; - return this->wm_layers[uuid]; + unsigned wm_lid = this->lid2wmlid[layer]; + return this->wm_layers[wm_lid]; } std::shared_ptr LayerControl::getWMLayer(std::string layer_name) @@ -212,28 +224,82 @@ WMError LayerControl::renderLayers() HMI_INFO("Commit change"); WMError rc = WMError::SUCCESS; + bool haveRemoteDisplay = remoteScreenID > 0; + + // Check the number of layers + vector ivi_l_ids; + vector ivi_remote_l_ids; + for(auto& l : this->wm_layers) + { + auto state = l->getLayerState(); + HMI_DEBUG("layer %s", l->layerName().c_str()); + if (!l->isRemote()) + { + for(const auto& id : state.getIviIdList()) + { + HMI_DEBUG("Add %d", id); + ivi_l_ids.push_back(id); + } + } else if (haveRemoteDisplay) { + for(const auto& id : state.getIviIdList()) + { + HMI_DEBUG("Add remote %d", id); + ivi_remote_l_ids.push_back(id); + } + } + } + // Create render order - t_ilm_layer* id_array = new t_ilm_layer[this->wm_layers.size()]; + t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()]; if(id_array == nullptr) { HMI_WARNING("short memory"); + this->undoUpdate(); return WMError::FAIL; } int count = 0; - for(const auto& i : this->wm_layers) + for(const auto& i : ivi_l_ids) { - id_array[count] = i->layerID(); - ++count; + id_array[count++] = i; + } + + t_ilm_layer* remote_id_array = nullptr; + if(haveRemoteDisplay && ivi_remote_l_ids.size() != 0) { + remote_id_array = new t_ilm_layer[ivi_remote_l_ids.size()]; + if(remote_id_array == nullptr) + { + HMI_WARNING("short memory"); + this->undoUpdate(); + return WMError::FAIL; + } + count = 0; + for(const auto& i : ivi_remote_l_ids) + { + remote_id_array[count++] = i; + } } // Display - ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, this->wm_layers.size()); + ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size()); + if(ret == ILM_SUCCESS && haveRemoteDisplay) + { + ret = ilm_displaySetRenderOrder(this->remoteScreenID, remote_id_array, ivi_remote_l_ids.size()); + } if(ret != ILM_SUCCESS) { + this->undoUpdate(); rc = WMError::FAIL; } + else + { + for(auto& l : this->wm_layers) + { + l->update(); + } + } ilm_commitChanges(); delete id_array; + delete remote_id_array; return rc; } @@ -251,9 +317,18 @@ WMError LayerControl::setXDGSurfaceOriginSize(unsigned surface) return ret; } + +void LayerControl::undoUpdate() +{ + for(auto& l : this->wm_layers) + { + l->undo(); + } +} + WMError LayerControl::loadLayerSetting(const string &path) { - HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path); + HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path.c_str()); json_object *json_obj, *json_cfg; int ret = jh::inputJsonFilie(path.c_str(), &json_obj); @@ -278,7 +353,7 @@ WMError LayerControl::loadLayerSetting(const string &path) json_object *json_tmp = json_object_array_get_idx(json_cfg, i); HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp)); - this->wm_layers.emplace_back(std::make_shared(json_tmp)); + this->wm_layers.emplace_back(std::make_shared(json_tmp, i)); } json_object_put(json_obj); @@ -365,13 +440,45 @@ WMError LayerControl::layoutChange(const WMAction& action) HMI_SEQ_ERROR(action.req_num, "client may vanish"); return WMError::NOT_REGISTERED; } - unsigned surface = action.client->surfaceID(action.role); + unsigned layer = action.client->layerID(); + unsigned surface = action.client->surfaceID(); auto rect = this->getAreaSize(action.area); - HMI_DEBUG("Set layout %d, %d, %d, %d",rect.x, rect.y, rect.w, rect.h); - ilm_commitChanges(); + HMI_SEQ_INFO(action.req_num, "Set layout %d, %d, %d, %d",rect.x, rect.y, rect.w, rect.h); + + // Sometimes, ivi_wm_surface_size signal doesn't reach window manager, + // then, Window Manager set set source size = 0. + if(!action.client->isSourceSizeSet()) + { + ilmSurfaceProperties sp; + if (ILM_SUCCESS != ilm_getPropertiesOfSurface(surface, &sp)) + return WMError::FAIL; + + if (sp.origSourceHeight != sp.sourceHeight || + sp.origSourceWidth != sp.sourceWidth) + { + HMI_SEQ_NOTICE(action.req_num, "set source size w:%d h%d", sp.origSourceWidth, sp.origSourceHeight); + ilm_surfaceSetSourceRectangle(surface, 0, 0, sp.origSourceWidth, sp.origSourceHeight); + ilm_commitChanges(); + action.client->setSurfaceSizeCorrectly(); + } + } + ilm_surfaceSetDestinationRectangle(surface, rect.x, rect.y, rect.w, rect.h); ilm_commitChanges(); + action.client->setArea(action.area); + for(auto &wm_layer: this->wm_layers) + { + // Store the state who is assigned to the area + if(wm_layer->hasLayerID(layer)) + { + wm_layer->attachAppToArea(action.client->appID(), action.area); + /* TODO: manipulate state directly + LayerState ls = wm_layer->getLayerState(); + ls.seattachAppToAreatArea(action.client->appID(), action.area); + wm_layer->dump(); */ + } + } return WMError::SUCCESS; } @@ -387,16 +494,69 @@ WMError LayerControl::visibilityChange(const WMAction& action) if (action.visible == TaskVisible::VISIBLE) { - ret = this->makeVisible(action.client, action.role); + ret = this->makeVisible(action.client); } else if (action.visible == TaskVisible::INVISIBLE) { - ret = this->makeInvisible(action.client, action.role); + ret = this->makeInvisible(action.client); } ilm_commitChanges(); return ret; } +WMError LayerControl::updateAreaList(const ChangeAreaReq& req) +{ + // error check + for(const auto& elem : req.area_req) + { + if(this->area2size.find(elem.first) == this->area2size.end()) + { + HMI_ERROR("requested area %s is not registered in area list", elem.first.c_str()); + return WMError::NOT_REGISTERED; + } + } + // update list + for(const auto& elem : req.area_req) + { + this->area2size[elem.first] = elem.second; + } + if(req.save) + { + HMI_NOTICE("Not implemented"); + // TODO + } + return WMError::SUCCESS; +} + +WMError LayerControl::getUpdateAreaList(ChangeAreaReq *req) +{ + for(const auto& wm_layer : this->wm_layers) + { + // get area name and compare it with elem + for(const auto& area : req->area_req) + { + string app = wm_layer->attachedApp(area.first); + if(!app.empty()) + { + HMI_INFO("app %s changes area %s", app.c_str(), area.first.c_str()); + req->update_app2area[app] = area.first; + } + } + } + return WMError::SUCCESS; +} + +void LayerControl::appTerminated(const shared_ptr client) +{ + for(auto& l : this->wm_layers) + { + if(l->hasLayerID(client->layerID())) + { + l->appTerminated(client->layerID()); + } + } +} + void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created) { if (ILM_SURFACE == object) @@ -413,6 +573,7 @@ void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool c } this->cb.surfaceCreated(sp.creatorPid, id); ilm_surfaceAddNotification(id, surfaceCallback_static); + ilm_surfaceSetVisibility(id, ILM_TRUE); ilm_surfaceSetType(id, ILM_SURFACETYPE_DESKTOP); } else @@ -489,106 +650,112 @@ void LayerControl::dispatchLayerPropChangeEvent(unsigned id, } } -WMError LayerControl::makeVisible(const shared_ptr client, const string& role) +WMError LayerControl::makeVisible(const shared_ptr client) { WMError ret = WMError::SUCCESS; - // Don't check here the client is not nullptr - unsigned surface = client->surfaceID(role); + // Don't check here wheher client is nullptr or not + unsigned layer_id = client->layerID(); + auto layer = getWMLayer(layer_id); - this->moveForeGround(client, role); + if (!layer->isRemote()) + { + this->moveForeGround(client); + } + else if (0 > this->remoteScreenID) { + return ret; + } - ilm_surfaceSetVisibility(surface, ILM_TRUE); + ilm_layerSetVisibility(layer_id, ILM_TRUE); return ret; } -WMError LayerControl::makeInvisible(const shared_ptr client, const string& role) +WMError LayerControl::makeInvisible(const shared_ptr client) { WMError ret = WMError::SUCCESS; - unsigned surface = client->surfaceID(role); // Don't check here the client is not nullptr + // Don't check here the client is not nullptr + unsigned layer_id = client->layerID(); + auto layer = getWMLayer(layer_id); - bool mv_ok = this->moveBackGround(client, role); + bool set_invisible = true; + if (!layer->isRemote()) + { + if(this->moveBackGround(client)) + { + set_invisible = false; + } + else + { + HMI_INFO("make invisible client %s", client->appID().c_str()); + } + } + else if (0 > this->remoteScreenID) { + return ret; + } - if(!mv_ok) + if (set_invisible) { - HMI_INFO("make invisible client %s", client->appID().c_str()); - ilm_surfaceSetVisibility(surface, ILM_FALSE); + ilm_layerSetVisibility(layer_id, ILM_FALSE); } return ret; } -bool LayerControl::moveBackGround(const shared_ptr client, const string& role) +bool LayerControl::moveBackGround(const shared_ptr client) { bool ret = false; - const char* label = role.c_str(); - - if ((0 == strcmp(label, "radio")) || - (0 == strcmp(label, "music")) || - (0 == strcmp(label, "video")) || - (0 == strcmp(label, "map"))) - { - unsigned surface = client->surfaceID(role); - this->surface_bg.push_back(surface); - auto bg = this->getWMLayer(BACK_GROUND_LAYER); - auto layer = 0; - for(const auto& l : this->wm_layers) + + // Move background from foreground layer + auto bg = this->getWMLayer(BACK_GROUND_LAYER); + if(bg != nullptr) + { + HMI_DEBUG("client %s role %s", client->appID().c_str(), client->role().c_str()); + unsigned layer = client->layerID(); + if(bg->hasRole(client->role())) { - if(l->hasRole(role)) - { - layer = l->layerID(); - ilm_layerRemoveSurface(layer, surface); - ilm_layerAddSurface(bg->layerID(), surface); - ret = true; - break; - } + HMI_INFO("%s go to background", client->appID().c_str()); + bg->addLayerToState(layer); + auto wm_layer = this->getWMLayer(layer); + wm_layer->removeLayerFromState(layer); + /* TODO: manipulate state directly + LayerState bg_ls = bg->getLayerState(); + bg_ls.addLayer(layer); + LayerState ls = wm_layer->getLayerState(); + ls.removeLayer(layer); */ + bg->dump(); + wm_layer->dump(); + ret = true; } } - ilm_commitChanges(); return ret; } -bool LayerControl::moveForeGround(const shared_ptr client, const string& role) +bool LayerControl::moveForeGround(const shared_ptr client) { bool ret = false; - const char* label = role.c_str(); // Move foreground from foreground layer - if ((0 == strcmp(label, "radio")) || - (0 == strcmp(label, "music")) || - (0 == strcmp(label, "video")) || - (0 == strcmp(label, "map"))) + auto bg = this->getWMLayer(BACK_GROUND_LAYER); + if(bg != nullptr) { - for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) + if(bg->hasRole(client->role())) { - if (client->surfaceID(role) == *i) - { - // Remove id - unsigned surface = *i; - - this->surface_bg.erase(i); - - // Remove from BG layer (999) - HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, surface); - auto bg = this->getWMLayer(BACK_GROUND_LAYER); - unsigned layer = 0; - for(const auto& l : this->wm_layers) - { - if(l->hasRole(role)) - { - layer = l->layerID(); - break; - } - } - ilm_layerRemoveSurface(bg->layerID(), surface); - ilm_layerAddSurface(layer, surface); - ret = true; - break; - } + unsigned layer = client->layerID(); + HMI_INFO("%s go to foreground", client->appID().c_str()); + bg->removeLayerFromState(layer); + auto wm_layer = this->getWMLayer(layer); + wm_layer->addLayerToState(layer); + /* TODO: manipulate state directly + LayerState bg_ls = bg->getLayerState(); + bg_ls.removeLayer(layer); + LayerState ls = wm_layer->getLayerState(); + ls.addLayer(layer); */ + bg->dump(); + wm_layer->dump(); + ret = true; } } - ilm_commitChanges(); return ret; } -} // namespace wm \ No newline at end of file +} // namespace wm