clang-tidy once more

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

diff --git a/src/app.cpp b/src/app.cpp
index ee3a600..871222f 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -4,6 +4,7 @@
 
 #include "app.hpp"
 #include "json_helper.hpp"
+#include "layers.hpp"
 #include "layout.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
@@ -20,80 +21,107 @@
 
 namespace wm {
 
-#ifndef NDEBUG
-#define DB(expr)                                                               \
-   std::cerr << __FILE__ << ":" << __LINE__ << ":" << __func__ << ": " << expr \
-             << "\n"
-#else
-#define DB(expr)
-#endif
-
 namespace {
 App *g_app;
 
 using json = nlohmann::json;
 
-// We ned to manually unwrap numbers
-template <typename T>
-result<T> get(json const &j) {
-   T r;
-   std::istringstream s(j.get<std::string>());
-   s >> r;
-   return s.fail() ? Err<T>("Could not read int") : Ok(r);
-}
-
 struct wm::area area_from_json(json const &j) {
+   DB(j);
    return wm::area{
       j["name"].get<std::string>(),
       {
-         get<uint32_t>(j["width"]).unwrap(),
-         get<uint32_t>(j["height"]).unwrap(),
-         get<int32_t>(j["x"]).unwrap(),
-         get<int32_t>(j["y"]).unwrap(),
+         get<uint32_t>(j["width"]), get<uint32_t>(j["height"]),
+         get<int32_t>(j["x"]), get<int32_t>(j["y"]),
       },
-      get<uint32_t>(j["zorder"]).unwrap(),
+      get<uint32_t>(j["zorder"]),
    };
 }
 
-struct layout layout_from_json(json const &j) {
+result<struct layout> layout_from_json(json const &j) {
+   DB(j);
    auto &ja = j["areas"];
 
    auto l = wm::layout{j["name"].get<std::string>(), uint32_t(ja.size()), {}};
 
+   if (ja.size() > layout::MAX_N_AREAS) {
+      return Err<struct layout>("Invalid number of areas in layout");
+   }
+
    logdebug("Loading layout '%s' with %u areas", l.name.c_str(),
             unsigned(ja.size()));
 
    std::transform(std::cbegin(ja), std::cend(ja), std::begin(l.areas),
                   area_from_json);
 
-   return l;
+   return Ok(l);
 }
 
 struct result<layouts_type> load_layout(char const *filename) {
+   DB("loading layout from " << filename);
+
    json jlayouts;
    std::ifstream i(filename);
    i >> jlayouts;
 
-   size_t nlayouts = jlayouts.size();
-   auto layouts = layouts_type(nlayouts);
-
+   auto layouts = layouts_type();
    std::transform(std::cbegin(jlayouts), std::cend(jlayouts),
-                  std::begin(layouts), layout_from_json);
+                  std::back_inserter(layouts), layout_from_json);
 
    return Ok(layouts);
 }
 
+struct result<surface_id_to_layer_map>
+   load_layer_ids(char const *filename) {
+   DB("loading IDs from " << filename);
+
+   json jids;
+   std::ifstream i(filename);
+   i >> jids;
+
+   auto m = to_surface_id_to_layer_map(jids["mappings"]);
+
+   if (m.is_ok()) {
+      auto i = m.unwrap();
+
+      auto jtests = jids.value("tests", json());
+
+      std::vector<std::pair<int, int>> tests;
+      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) {
+         if (i.get_layer_for_surface(sid.first).value_or(-1) != sid.second) {
+            return Err<surface_id_to_layer_map>("ID Map embedded test failed!");
+         }
+      }
+   }
+
+   return m;
+}
+
 }  // namespace
 
 App::App(wl::display *d)
-   : api{this},
-     display{d},
-     controller{},
-     outputs(),
-     layouts() {
-     // layouts(load_layout("../layout.json").unwrap()) {
+   : api{this}, display{d}, controller{} {
+   // layouts(load_layout("../layout.json").unwrap()) {
    assert(g_app == nullptr);
    g_app = this;
+
+   auto a = load_layout("../layout.json");
+   auto b = a.map_err([](char const *e) -> char const * {
+      DB("Could not load layout: " << e);
+      return e;
+   });
+
+   auto c = load_layer_ids("../ids.json");
+   auto e = c.map_err([](char const *e) -> char const * {
+      DB("Could not load ids: " << e);
+      return e;
+   });
 }
 
 App::~App() { g_app = nullptr; }