-//
-// Created by m on 7/27/17.
-//
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
#include <algorithm>
using json = nlohmann::json;
-surface_id_to_layer::surface_id_to_layer(nlohmann::json const &j) {
- // DB(j);
+layer::layer(nlohmann::json const &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->layer_id = j["layer_id"];
+ this->rect = genivi::full_rect;
+ if (j["area"]["type"] == "rect") {
+ auto jr = j["area"]["rect"];
+ this->rect = genivi::rect{
+ jr["width"], jr["height"],
+ jr["x"], jr["y"],
+ };
+ }
}
-struct result<struct surface_id_to_layer_map> to_surface_id_to_layer_map(
- nlohmann::json const &j) {
- DB(j);
+struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
try {
- surface_id_to_layer_map stl{};
+ 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 = surface_id_to_layer(j);
- stl.layers.push_back(unsigned(k.layer_id));
- return k;
- });
+ 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?
for (auto i : stl.mapping) {
if (i.name.empty()) {
- return Err<struct surface_id_to_layer_map>(
- "Found mapping w/o name");
+ return Err<struct layer_map>("Found mapping w/o name");
}
if (i.layer_id == -1 || i.id_min == -1 || i.id_max == -1) {
- return Err<struct surface_id_to_layer_map>(
- "Found invalid/unset IDs in mapping");
+ return Err<struct layer_map>("Found invalid/unset IDs in mapping");
}
}
+ auto msi = j.find("main_surface");
+ if (msi != j.end()) {
+ stl.main_surface = (*msi)["surface_id"];
+ }
+
// Check lookup
auto jtests = j.value("tests", json());
- if (! jtests.empty()) {
- DB("Embedded tests...");
+ 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(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_for_surface(sid.first).value_or(-1);
- DB("this=" << sid.first << ", that=" << lid
- << ", expect=" << sid.second);
+ 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<surface_id_to_layer_map>(
- "ID Map embedded test failed!");
+ return Err<layer_map>("ID Map embedded test failed!");
}
}
}
return Ok(stl);
} catch (std::exception &e) {
- return Err<struct surface_id_to_layer_map>(e.what());
+ return Err<struct layer_map>(e.what());
}
}
// Helper to allow std::lower_bound with a int key only
inline bool
- operator<(struct surface_id_to_layer const &a, int b) {
+ operator<(struct layer const &a, int b) {
return a.id_max < b;
}
-optional<int> surface_id_to_layer_map::get_layer_for_surface(int surface_id) {
- auto i = std::lower_bound(std::cbegin(this->mapping),
- std::cend(this->mapping), surface_id);
+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 != this->mapping.end()) {
- // std::less only checks for surface_id_to_layer::id_max, so check
+ 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<int>(i->layer_id);
+ return optional<layer>(*i);
}
}
return nullopt;
}
+}
+
+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;
+}
+
+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;
+
+ json r{};
+ if (is_full) {
+ r = {{"type", "full"}};
+ } else {
+ r = {{"type", "rect"},
+ {"rect",
+ {{"x", this->rect.x},
+ {"y", this->rect.y},
+ {"width", this->rect.w},
+ {"height", this->rect.h}}}};
+ }
+
+ return {
+ {"id_min", this->id_min},
+ {"id_max", this->id_max},
+ {"name", this->name},
+ {"layer_id", this->layer_id},
+ {"area", r},
+ };
+}
+
+json layer_map::to_json() const {
+ json j{};
+ for (auto const &i : this->mapping) {
+ j.push_back(i.to_json());
+ }
+ return j;
+}
} // namespace wm
Code Review / staging / windowmanager.git / blobdiff