app: add very c++-y layout parsing

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

diff --git a/src/app.cpp b/src/app.cpp
index b261c53..ee3a600 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -4,44 +4,120 @@
 
 #include "app.hpp"
 #include "json_helper.hpp"
+#include "layout.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
 
+#include <cstdio>
+#include <memory>
+
 #include <cassert>
 
 #include <json-c/json.h>
 
+#include <fstream>
+#include <json.hpp>
+
 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) {
+   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["zorder"]).unwrap(),
+   };
+}
+
+struct layout layout_from_json(json const &j) {
+   auto &ja = j["areas"];
+
+   auto l = wm::layout{j["name"].get<std::string>(), uint32_t(ja.size()), {}};
+
+   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;
+}
+
+struct result<layouts_type> load_layout(char const *filename) {
+   json jlayouts;
+   std::ifstream i(filename);
+   i >> jlayouts;
+
+   size_t nlayouts = jlayouts.size();
+   auto layouts = layouts_type(nlayouts);
+
+   std::transform(std::cbegin(jlayouts), std::cend(jlayouts),
+                  std::begin(layouts), layout_from_json);
+
+   return Ok(layouts);
+}
+
 }  // namespace
 
-App::App(wl::display *d) : api{this}, display{d}, controller{}, outputs() {
+App::App(wl::display *d)
+   : api{this},
+     display{d},
+     controller{},
+     outputs(),
+     layouts() {
+     // layouts(load_layout("../layout.json").unwrap()) {
    assert(g_app == nullptr);
    g_app = this;
 }
 
+App::~App() { g_app = nullptr; }
+
 int App::init() {
    if (!this->display->ok()) {
       return -1;
    }
 
-   this->display->r.add_global_handler(
-      "wl_output", [](wl_registry *r, uint32_t name, uint32_t v) {
-         g_app->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+   this->display->add_global_handler(
+      "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) {
+         this->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
       });
 
-   this->display->r.add_global_handler(
-      "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) {
-         g_app->controller = std::make_unique<genivi::controller>(r, name, v);
+   this->display->add_global_handler(
+      "ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
+         this->controller = std::make_unique<genivi::controller>(r, name, v);
 
          // XXX: This protocol needs the output, so lets just add our mapping
          // here...
-         g_app->controller->add_proxy_to_id_mapping(
-            g_app->outputs.back()->proxy.get(),
+         this->controller->add_proxy_to_id_mapping(
+            this->outputs.back()->proxy.get(),
             wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
-               g_app->outputs.back()->proxy.get())));
+               this->outputs.back()->proxy.get())));
       });
 
    // First level objects