X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=a0665b78679818cffdc453da35d1e2ad62ff0727;hb=69a5f240268953b43aa89fdf414589ae3421aefc;hp=6eae48a7da79ec99517e7c393d240ea3c94c53ab;hpb=04c862b9957ea86959bd533cb1ac497ddb52759d;p=staging%2Fwindowmanager.git diff --git a/src/layers.cpp b/src/layers.cpp index 6eae48a..a0665b7 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -14,11 +14,8 @@ * limitations under the License. */ -// -// Created by m on 7/27/17. -// - #include +#include #include "json_helper.hpp" #include "layers.hpp" @@ -29,39 +26,69 @@ namespace wm { using json = nlohmann::json; layer::layer(nlohmann::json const &j) { - DB(j); if (j["type"] == "range") { - this->id_min = get(j["first_surface_id"]); - this->id_max = get(j["last_surface_id"]); + this->id_min = j["first_surface_id"]; + this->id_max = j["last_surface_id"]; } else { - this->id_min = this->id_max = get(j["surface_id"]); + this->id_min = this->id_max = j["surface_id"]; } - this->name = j["name"].get(); - this->layer_id = get(j["layer_id"]); + this->role = j["role"]; + this->name = j["name"]; + this->layer_id = j["layer_id"]; this->rect = genivi::full_rect; if (j["area"]["type"] == "rect") { auto jr = j["area"]["rect"]; this->rect = genivi::rect{ - get(jr["width"]), get(jr["height"]), - get(jr["x"]), get(jr["y"]), + jr["width"], jr["height"], jr["x"], jr["y"], }; } + auto split_layouts = j.find("split_layouts"); + if (split_layouts != j.end()) { + auto &sls = j["split_layouts"]; + // this->layouts.reserve(sls.size()); + std::transform(std::cbegin(sls), std::cend(sls), + std::back_inserter(this->layouts), [this](json const &sl) { + struct split_layout l { + sl["name"], sl["main_match"], sl["sub_match"], + sl.value("priority", 0) + }; + logdebug( + "layer %d add split_layout \"%s\" (main: \"%s\") (sub: " + "\"%s\") (prio: %d)", this->layer_id, + l.name.c_str(), l.main_match.c_str(), + l.sub_match.c_str(), l.prio); + return l; + }); + //std::sort(std::begin(this->layouts), std::end(this->layouts), + // [](struct split_layout const &a, struct split_layout const &b) { + // return a.prio < b.prio; + // }); + } } struct result to_layer_map(nlohmann::json const &j) { - DB(j); try { layer_map stl{}; auto m = j["mappings"]; - stl.layers.reserve(m.size()); + std::transform(std::cbegin(m), std::cend(m), std::inserter(stl.mapping, stl.mapping.end()), - [&stl](nlohmann::json const &j) { - auto k = layer(j); - stl.layers.push_back(unsigned(k.layer_id)); - return k; - }); - // XXX need to sort layers? + [](nlohmann::json const &j) { return 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::sort(stl.layers.begin(), stl.layers.end()); + for (auto i : stl.mapping) { if (i.name.empty()) { return Err("Found mapping w/o name"); @@ -73,27 +100,27 @@ struct result to_layer_map(nlohmann::json const &j) { auto msi = j.find("main_surface"); if (msi != j.end()) { - stl.main_surface = get((*msi)["surface_id"]); + 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()) { - DB("Embedded tests..."); + logdebug("Embedded tests..."); std::vector> tests; tests.reserve(jtests.size()); std::transform(std::cbegin(jtests), std::cend(jtests), std::back_inserter(tests), [](json const &j) { - return std::make_pair( - get(j["surface_id"]), - get(j["expect_layer_id"])); + 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); - DB("this=" << sid.first << ", that=" << lid - << ", expect=" << sid.second); + logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second); if (lid != sid.second) { return Err("ID Map embedded test failed!"); } @@ -128,11 +155,30 @@ optional get_surface_id_to_layer(struct layer_map const *s2l, return nullopt; } -} +} // namespace optional layer_map::get_layer_id(int surface_id) { auto e = get_surface_id_to_layer(this, surface_id); - return e ? optional(e->layer_id) : nullopt; + if (!e) { + auto i = this->surfaces.find(surface_id); + if (i != this->surfaces.end()) { + return optional(int(i->second)); + } + return nullopt; + } + return optional(e->layer_id); +} + +optional layer_map::get_layer_id(std::string const &role) { + for (auto const &r : this->roles) { + auto re = std::regex(r.first); + if (std::regex_match(role, re)) { + logdebug("role %s matches layer %d", role.c_str(), r.second); + return optional(r.second); + } + } + logdebug("role %s does NOT match any layer", role.c_str()); + return nullopt; } optional layer_map::get_layer_rect(int surface_id) { @@ -156,17 +202,15 @@ json layer::to_json() const { } return { - {"id_min", this->id_min}, - {"id_max", this->id_max}, - {"name", this->name}, - {"layer_id", this->layer_id}, - {"area", r}, + {"id_min", this->id_min}, {"id_max", this->id_max}, + {"name", this->name}, {"role", this->role}, + {"layer_id", this->layer_id}, {"area", r}, }; } json layer_map::to_json() const { json j{}; - for (auto const &i: this->mapping) { + for (auto const &i : this->mapping) { j.push_back(i.to_json()); } return j;