X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fwm_layer.cpp;h=1948b61c469e76b9af0e4fd47a325865bd464b3b;hb=f5001e404097c3e55ed9fad207036c55d11f5c8d;hp=87fff498e6ee72dd543aa415948541f12063034c;hpb=621314943d21cdb3b7e51a4c3d0faefc44658a11;p=apps%2Fagl-service-windowmanager.git diff --git a/src/wm_layer.cpp b/src/wm_layer.cpp index 87fff49..1948b61 100644 --- a/src/wm_layer.cpp +++ b/src/wm_layer.cpp @@ -15,62 +15,129 @@ */ #include - +#include +#include +#include "wm_client.hpp" #include "wm_layer.hpp" -#include "wayland_ivi_wm.hpp" #include "json_helper.hpp" -#include "hmi-debug.h" +#include "util.hpp" using std::string; using std::vector; +using std::unordered_map; + +#define BG_LAYER_NAME "BackGroundLayer" namespace wm { LayerState::LayerState() - : _ivi_layer_id_list(), - area2ivi_layer_id() + : render_order(), + area2appid() {} -LayerSetting::LayerSetting(const string& name, MANAGEMENT_TYPE type, unsigned begin, unsigned end) - : name(name), type(type), - role_list(), area_list(), id_list(), - id_begin(begin), id_end(end) -{} -void LayerSetting::appendRole(const string& role) +void LayerState::attachIdToArea(const string& area, const WMClient& client) { - this->role_list.push_back(role); + this->area2appid[area] = client.appID(); + this->render_order.push_back(client.layerID()); } -void LayerSetting::appendArea(const string& area) +const unordered_map LayerState::popCurrentState() { - this->area_list.push_back(area); + unordered_map tmp = this->area2appid; + this->area2appid.clear(); + this->render_order.clear(); + return tmp; +} + +const unordered_map LayerState::getCurrentState() +{ + return this->area2appid; +} + +const vector LayerState::getIviIdList() +{ + return this->render_order; +} + +void LayerState::addLayer(unsigned layer) +{ + this->render_order.push_back(layer); +} + +void LayerState::removeLayer(unsigned layer) +{ + auto fwd_itr = std::remove_if( + this->render_order.begin(), this->render_order.end(), + [layer](unsigned elm) { + return elm == layer; + } + ); + this->render_order.erase(fwd_itr, this->render_order.end()); +} + +void LayerState::setArea(const string& app, const string& area) +{ + this->area2appid[area] = app; +} + +WMLayer::WMLayer(json_object* j) : tmp_state(), state() +{ + this->name = jh::getStringFromJson(j, "name"); + this->role_list = jh::getStringFromJson(j, "role"); + const char* type = jh::getStringFromJson(j, "type"); + this->id_begin = static_cast(jh::getIntFromJson(j, "id_range_begin")); + this->id_end = static_cast(jh::getIntFromJson(j, "id_range_end")); + + if (name.size() == 0 || !type) + { + HMI_ERROR("Parse Error!!"); + exit(1); + } + if(this->id_begin > this->id_end) + { + HMI_ERROR("INVALID"); + exit(1); + } + string str_type = type; + this->type = (str_type == "tile") ? MANAGEMENT_TYPE::TILE : MANAGEMENT_TYPE::STACK; } -unsigned LayerSetting::getNewLayerID(const string& role) +unsigned WMLayer::getNewLayerID(const string& role) { unsigned ret = 0; - auto found = std::find(role_list.cbegin(), role_list.cend(), role); - if(found == role_list.cend()) + + // generate new layer id; + if(this->hasRole(role)) + { + if(this->id_list.size() == 0) + { + ret = this->idBegin(); + this->id_list.push_back(ret); + } + else + { + ret = this->id_list.back() + 1; + } + HMI_INFO("Generate new id: %d", ret); + } + else { return ret; } - // generate new ivi layer id - ret = id_list.back() + 1; - HMI_INFO("wm", "generate ivi_layer_id : %d on the layer: %s", ret, this->name.c_str()); auto id_found = std::find(id_list.begin(), id_list.end(), ret); if( (ret > this->idEnd()) || (id_found != id_list.cend()) ) { - HMI_NOTICE("wm", "id %d is not available then generate new id", ret); - ret = 0; + HMI_NOTICE("id %d is not available then generate new id", ret); + ret = 0; // reset for(unsigned i = this->idBegin(); i < this->idEnd(); i++) { auto ret_found = std::find(id_list.begin(), id_list.end(), i); if(ret_found == id_list.cend()) { - HMI_INFO("wm", "set new id: %d", i); + HMI_INFO("set new id: %d", i); ret = i; break; } @@ -83,12 +150,28 @@ unsigned LayerSetting::getNewLayerID(const string& role) } else { - HMI_ERROR("wm", "failed to get New ID"); + HMI_ERROR("failed to get New ID"); } return ret; } -void LayerSetting::removeLayerID(unsigned id) +const string& WMLayer::layerName() +{ + return this->name; +} + +WMError WMLayer::setLayerState(const LayerState& l) +{ + this->tmp_state = l; + return WMError::SUCCESS; +} + +void WMLayer::appendArea(const string& area) +{ + this->area_list.push_back(area); +} + +void WMLayer::removeLayerID(unsigned id) { auto fwd_itr = std::remove_if(this->id_list.begin(), this->id_list.end(), [id](unsigned elm) { @@ -97,27 +180,37 @@ void LayerSetting::removeLayerID(unsigned id) this->id_list.erase(fwd_itr, this->id_list.end()); } -WMLayer::WMLayer() - : before_state(), - state(), - setting{} +bool WMLayer::hasLayerID(unsigned id) { - // this->setting = std::make_unique(name, type, begin, end); + bool ret = (id > this->idBegin() && id < this->idEnd()); + if(!ret) + return ret; + auto itr = std::find(this->id_list.begin(), this->id_list.end(), id); + return (itr != this->id_list.end()) ? true : false; } -unsigned WMLayer::getNewLayerID(const std::string& role) +bool WMLayer::hasRole(const string& role) { - return this->setting->getNewLayerID(role); + // TODO : use virtual to avoid compare + if(this->name == BG_LAYER_NAME) + return false; + auto re = std::regex(this->role_list); + if (std::regex_match(role, re)) + { + HMI_DEBUG("role %s matches layer %s", role.c_str(), this->name.c_str()); + return true; + } + return false; } -WMError WMLayer::setLayerState(const LayerState& l) +/* WMError WMLayer::commitChange() { - return WMError::SUCCESS; + this->state = this->tmp_state; } -bool WMLayer::checkIDBelongTo(unsigned id) +void WMLayer::undo() { - return (id > this->setting->idBegin() && id < this->setting->idEnd()); + this->tmp_state = this->state; } - + */ } // namespace wm