X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=a0665b78679818cffdc453da35d1e2ad62ff0727;hb=69a5f240268953b43aa89fdf414589ae3421aefc;hp=8f794510782c5dabd7a8b50fdc0343bf6405d29b;hpb=d08e5d1a943b65ece5ca519c200ab2c0359f51d7;p=staging%2Fwindowmanager.git

diff --git a/src/layers.cpp b/src/layers.cpp
index 8f79451..a0665b7 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <algorithm>
+#include <regex>
 
 #include "json_helper.hpp"
 #include "layers.hpp"
@@ -31,31 +32,63 @@ layer::layer(nlohmann::json const &j) {
    } else {
       this->id_min = this->id_max = j["surface_id"];
    }
-   this->name = j["name"].get<std::string>();
+   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"],
+         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) {
    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");
@@ -67,7 +100,9 @@ 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 = (*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
@@ -79,9 +114,8 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
          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"]);
+                           return std::make_pair(j["surface_id"],
+                                                 j["expect_layer_id"]);
                         });
 
          for (auto sid : tests) {
@@ -121,11 +155,30 @@ optional<layer> get_surface_id_to_layer(struct layer_map const *s2l,
 
    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) {
@@ -149,11 +202,9 @@ 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},
    };
 }