*/
#include <algorithm>
+#include <regex>
#include "json_helper.hpp"
#include "layers.hpp"
using json = nlohmann::json;
layer::layer(nlohmann::json const &j) {
- DB(j);
if (j["type"] == "range") {
- this->id_min = get<int>(j["first_surface_id"]);
- this->id_max = get<int>(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<int>(j["surface_id"]);
+ this->id_min = this->id_max = j["surface_id"];
}
- this->name = j["name"].get<std::string>();
- this->layer_id = get<int>(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<int32_t>(jr["width"]), get<int32_t>(jr["height"]),
- get<int32_t>(jr["x"]), get<int32_t>(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<int>("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<struct layer_map> 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<struct layer_map>("Found mapping w/o name");
auto msi = j.find("main_surface");
if (msi != j.end()) {
- stl.main_surface = get<int>((*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<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(
- get<int>(j["surface_id"]),
- get<int>(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<layer_map>("ID Map embedded test failed!");
}
return nullopt;
}
-}
+} // namespace
optional<int> layer_map::get_layer_id(int surface_id) {
auto e = get_surface_id_to_layer(this, surface_id);
- return e ? optional<int>(e->layer_id) : nullopt;
+ if (!e) {
+ auto i = this->surfaces.find(surface_id);
+ if (i != this->surfaces.end()) {
+ return optional<int>(int(i->second));
+ }
+ return nullopt;
+ }
+ return optional<int>(e->layer_id);
+}
+
+optional<int> 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<int>(r.second);
+ }
+ }
+ logdebug("role %s does NOT match any layer", role.c_str());
+ return nullopt;
}
optional<genivi::rect> layer_map::get_layer_rect(int surface_id) {
}
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},
};
}