X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=9219766de6952b49c52f28c292b6448e4ab6cc36;hb=5710504a95125fdf504c80ca6c445218514633fb;hp=d3ec7cf1ec60aac93b28c8ae1a2215ef4b47ea8a;hpb=397ad714d8a0ddc3f0b9d5cbcbd68aec9cbe55d0;p=staging%2Fwindowmanager.git diff --git a/src/layers.cpp b/src/layers.cpp index d3ec7cf..9219766 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -1,8 +1,21 @@ -// -// 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 +#include #include "json_helper.hpp" #include "layers.hpp" @@ -10,62 +23,132 @@ namespace wm { -surface_id_to_layer::surface_id_to_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"]); - } else { - this->id_min = this->id_max = get(j["surface_id"]); +using json = nlohmann::json; + +layer::layer(nlohmann::json const &j) { + 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{ + 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"] }; + logdebug( + "layer %d add split_layout \"%s\" (main: \"%s\") (sub: " + "\"%s\")", this->layer_id, + l.name.c_str(), l.main_match.c_str(), + l.sub_match.c_str()); + return l; + }); } - this->name = j["name"].get(); - this->layer_id = get(j["layer_id"]); } -struct result to_surface_id_to_layer_map( - nlohmann::json const &j) { - DB(j); +struct result to_layer_map(nlohmann::json const &j) { try { - surface_id_to_layer_map stl{}; - std::transform( - std::cbegin(j), std::cend(j), - std::inserter(stl.mapping, stl.mapping.end()), - [](nlohmann::json const &j) { return surface_id_to_layer(j); }); + layer_map stl{}; + auto m = j["mappings"]; + + std::transform(std::cbegin(m), std::cend(m), + std::inserter(stl.mapping, stl.mapping.end()), + [](nlohmann::json const &j) { + return std::pair( + 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](std::pair 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()) { - return Err( - "Found mapping w/o name"); + if (i.second.name.empty()) { + return Err("Found mapping w/o name"); } - if (i.layer_id == -1 || i.id_min == -1 || i.id_max == -1) { - return Err( - "Found invalid/unset IDs in mapping"); + if (i.second.layer_id == -1) { + return Err("Found invalid/unset IDs in mapping"); } } + + auto msi = j.find("main_surface"); + if (msi != j.end()) { + stl.main_surface_name = msi->value("surface_role", ""); + stl.main_surface = -1; + } + return Ok(stl); } catch (std::exception &e) { - return Err(e.what()); + return Err(e.what()); + } +} + +optional layer_map::get_layer_id(int surface_id) { + auto i = this->surfaces.find(surface_id); + if (i != this->surfaces.end()) { + return optional(i->second); } + return nullopt; } -// Helper to allow std::lower_bound with a int key only -inline bool - operator<(struct surface_id_to_layer const &a, int b) { - return a.id_max < b; +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 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); +json layer::to_json() const { + auto is_full = this->rect == genivi::full_rect; - if (i != this->mapping.end()) { - // std::less only checks for surface_id_to_layer::id_max, so check - // that we are actually inside of an interval here. - if (i->id_min <= surface_id) { - return optional(i->layer_id); - } + 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 nullopt; + return { + {"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) { + j.push_back(i.second.to_json()); + } + return j; } } // namespace wm