X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=9219766de6952b49c52f28c292b6448e4ab6cc36;hb=5710504a95125fdf504c80ca6c445218514633fb;hp=0d01080c1be1ceb3aeb548305f32c6c1270bd21d;hpb=626b0fc7a92da537f4914afcd3ff390f855785c4;p=staging%2Fwindowmanager.git

diff --git a/src/layers.cpp b/src/layers.cpp
index 0d01080..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 <algorithm>
+#include <regex>
 
 #include "json_helper.hpp"
 #include "layers.hpp"
@@ -12,94 +25,130 @@ namespace wm {
 
 using json = nlohmann::json;
 
-surface_id_to_layer::surface_id_to_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"]);
-   } else {
-      this->id_min = this->id_max = get<int>(j["surface_id"]);
+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<std::string>();
-   this->layer_id = get<int>(j["layer_id"]);
 }
 
-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"];
+
+      std::transform(std::cbegin(m), std::cend(m),
+                     std::inserter(stl.mapping, stl.mapping.end()),
+                     [](nlohmann::json const &j) {
+                        return std::pair<int, struct layer>(
+                           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(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;
-         });
-      // XXX need to sort layers?
+      std::transform(std::cbegin(stl.mapping), std::cend(stl.mapping),
+                     std::back_inserter(stl.layers),
+                     [&stl](std::pair<int, struct layer> 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<struct surface_id_to_layer_map>(
-               "Found mapping w/o name");
+         if (i.second.name.empty()) {
+            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");
+         if (i.second.layer_id == -1) {
+            return Err<struct layer_map>("Found invalid/unset IDs in mapping");
          }
       }
 
-      // Check lookup
-      auto jtests = j.value("tests", json());
-
-      if (! jtests.empty()) {
-         DB("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"]));
-                 });
-
-         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);
-            if (lid != sid.second) {
-               return Err<surface_id_to_layer_map>(
-                       "ID Map embedded test failed!");
-            }
-         }
+      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<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) {
-   return a.id_max < b;
+optional<int> layer_map::get_layer_id(int surface_id) {
+   auto i = this->surfaces.find(surface_id);
+   if (i != this->surfaces.end()) {
+      return optional<int>(i->second);
+   }
+   return nullopt;
 }
 
-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);
-
-   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<int>(i->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;
 }
 
+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 {
+      {"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