diff options
author | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-13 12:02:42 +0200 |
---|---|---|
committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-14 14:04:51 +0200 |
commit | a414f394e06111d761ca6ac0aa783d59a42c6ea8 (patch) | |
tree | 66cb7b9a9043afac02d0dde08817f642e5355750 /src/layers.cpp | |
parent | 69a5f240268953b43aa89fdf414589ae3421aefc (diff) |
Remove remnants of obsolete surface management by their IDs
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r-- | src/layers.cpp | 97 |
1 files changed, 19 insertions, 78 deletions
diff --git a/src/layers.cpp b/src/layers.cpp index a0665b7..5b28c15 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -26,12 +26,6 @@ namespace wm { using json = nlohmann::json; layer::layer(nlohmann::json const &j) { - if (j["type"] == "range") { - this->id_min = j["first_surface_id"]; - this->id_max = j["last_surface_id"]; - } else { - this->id_min = this->id_max = j["surface_id"]; - } this->role = j["role"]; this->name = j["name"]; this->layer_id = j["layer_id"]; @@ -73,27 +67,31 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { std::transform(std::cbegin(m), std::cend(m), std::inserter(stl.mapping, stl.mapping.end()), - [](nlohmann::json const &j) { return layer(j); }); + [](nlohmann::json const &j) { + return std::pair<int, struct layer>( + j.value("layer_id", -1), layer(j)); + }); // XXX: add sanity checks here? // * check for double IDs // * check for double names/roles stl.layers.reserve(m.size()); - std::transform( - std::cbegin(stl.mapping), std::cend(stl.mapping), - std::back_inserter(stl.layers), [&stl](struct layer const &k) { - stl.roles.emplace_back(std::make_pair(k.role, k.layer_id)); - return unsigned(k.layer_id); - }); + std::transform(std::cbegin(stl.mapping), std::cend(stl.mapping), + std::back_inserter(stl.layers), + [&stl](std::pair<int, struct layer> const &k) { + stl.roles.emplace_back( + std::make_pair(k.second.role, k.second.layer_id)); + return unsigned(k.second.layer_id); + }); std::sort(stl.layers.begin(), stl.layers.end()); for (auto i : stl.mapping) { - if (i.name.empty()) { + if (i.second.name.empty()) { return Err<struct layer_map>("Found mapping w/o name"); } - if (i.layer_id == -1 || i.id_min == -1 || i.id_max == -1) { + if (i.second.layer_id == -1) { return Err<struct layer_map>("Found invalid/unset IDs in mapping"); } } @@ -101,30 +99,7 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { auto msi = j.find("main_surface"); if (msi != j.end()) { stl.main_surface_name = msi->value("surface_role", ""); - stl.main_surface = - stl.main_surface_name.empty() ? int((*msi)["surface_id"]) : -1; - } - - // Check lookup - auto jtests = j.value("tests", json()); - - if (!jtests.empty()) { - logdebug("Embedded tests..."); - std::vector<std::pair<int, int>> tests; - tests.reserve(jtests.size()); - std::transform(std::cbegin(jtests), std::cend(jtests), - std::back_inserter(tests), [](json const &j) { - return std::make_pair(j["surface_id"], - j["expect_layer_id"]); - }); - - for (auto sid : tests) { - int lid = stl.get_layer_id(sid.first).value_or(-1); - logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second); - if (lid != sid.second) { - return Err<layer_map>("ID Map embedded test failed!"); - } - } + stl.main_surface = -1; } return Ok(stl); @@ -133,40 +108,12 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { } } -// Helper to allow std::lower_bound with a int key only -inline bool - operator<(struct layer const &a, int b) { - return a.id_max < b; -} - -namespace { -optional<layer> get_surface_id_to_layer(struct layer_map const *s2l, - int surface_id) { - auto i = std::lower_bound(std::cbegin(s2l->mapping), std::cend(s2l->mapping), - surface_id); - - if (i != s2l->mapping.end()) { - // std::less only checks for layer::id_max, so check - // that we are actually inside of an interval here. - if (i->id_min <= surface_id) { - return optional<layer>(*i); - } - } - - return nullopt; -} -} // namespace - optional<int> layer_map::get_layer_id(int surface_id) { - auto e = get_surface_id_to_layer(this, surface_id); - if (!e) { - auto i = this->surfaces.find(surface_id); - if (i != this->surfaces.end()) { - return optional<int>(int(i->second)); - } - return nullopt; + auto i = this->surfaces.find(surface_id); + if (i != this->surfaces.end()) { + return optional<int>(i->second); } - return optional<int>(e->layer_id); + return nullopt; } optional<int> layer_map::get_layer_id(std::string const &role) { @@ -181,11 +128,6 @@ optional<int> layer_map::get_layer_id(std::string const &role) { return nullopt; } -optional<genivi::rect> layer_map::get_layer_rect(int surface_id) { - auto e = get_surface_id_to_layer(this, surface_id); - return e ? optional<genivi::rect>(e->rect) : nullopt; -} - json layer::to_json() const { auto is_full = this->rect == genivi::full_rect; @@ -202,7 +144,6 @@ json layer::to_json() const { } return { - {"id_min", this->id_min}, {"id_max", this->id_max}, {"name", this->name}, {"role", this->role}, {"layer_id", this->layer_id}, {"area", r}, }; @@ -211,7 +152,7 @@ json layer::to_json() const { json layer_map::to_json() const { json j{}; for (auto const &i : this->mapping) { - j.push_back(i.to_json()); + j.push_back(i.second.to_json()); } return j; } |