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

diff --git a/src/layers.cpp b/src/layers.cpp
index 931fd5e..a0665b7 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -42,6 +42,28 @@ layer::layer(nlohmann::json const &j) {
          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) {
@@ -65,7 +87,8 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
             return unsigned(k.layer_id);
          });
 
-      // XXX need to sort layers?
+      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");
@@ -132,7 +155,7 @@ 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);
@@ -179,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},
    };
 }