clang-format

[staging/windowmanager.git] / src / layers.cpp

diff --git a/src/layers.cpp b/src/layers.cpp
index 464e20b..931fd5e 100644 (file)
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -39,8 +39,7 @@ layer::layer(nlohmann::json const &j) {
    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"],
       };
    }
 }
@@ -52,21 +51,19 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
 
       std::transform(std::cbegin(m), std::cend(m),
                      std::inserter(stl.mapping, stl.mapping.end()),
-                     [](nlohmann::json const &j) {
-                        return layer(j);
-                     });
+                     [](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::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);
+         });
 
       // XXX need to sort layers?
       for (auto i : stl.mapping) {
@@ -80,8 +77,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
@@ -93,9 +91,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) {
@@ -139,7 +136,7 @@ optional<layer> get_surface_id_to_layer(struct layer_map const *s2l,
 
 optional<int> layer_map::get_layer_id(int surface_id) {
    auto e = get_surface_id_to_layer(this, surface_id);
-   if (! e) {
+   if (!e) {
       auto i = this->surfaces.find(surface_id);
       if (i != this->surfaces.end()) {
          return optional<int>(int(i->second));