app: debug_layers returns a representation of layers.json configuration

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

diff --git a/src/app.cpp b/src/app.cpp
index 5ddcb8c..729c0a0 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -16,10 +16,10 @@
 
 #include <json-c/json.h>
 
-#include <fstream>
-#include <json.hpp>
 #include <bits/signum.h>
 #include <csignal>
+#include <fstream>
+#include <json.hpp>
 
 namespace wm {
 
@@ -59,12 +59,25 @@ result<struct layout> layout_from_json(json const &j) {
    return Ok(l);
 }
 
+result<json> file_to_json(char const *filename) {
+   std::ifstream i(filename);
+   if (i.fail()) {
+      return Err<json>("Could not open config file");
+   }
+   json j;
+   i >> j;
+   return Ok(j);
+}
+
+// Will throw if parsing fails
 struct result<layouts_type> load_layout(char const *filename) {
    DB("loading layout from " << filename);
 
-   json jlayouts;
-   std::ifstream i(filename);
-   i >> jlayouts;
+   auto j = file_to_json(filename);
+   if (j.is_err()) {
+      return Err<layouts_type>(j.unwrap_err());
+   }
+   json jlayouts = j.unwrap();
 
    auto layouts = layouts_type();
    layouts.reserve(jlayouts.size());
@@ -74,15 +87,17 @@ struct result<layouts_type> load_layout(char const *filename) {
    return Ok(layouts);
 }
 
-struct result<surface_id_to_layer_map>
-   load_layer_ids(char const *filename) {
+struct result<layer_map>
+   load_layer_map(char const *filename) {
    DB("loading IDs from " << filename);
 
-   json jids;
-   std::ifstream i(filename);
-   i >> jids;
+   auto j = file_to_json(filename);
+   if (j.is_err()) {
+      return Err<layer_map>(j.unwrap_err());
+   }
+   json jids = j.unwrap();
 
-   return to_surface_id_to_layer_map(jids);
+   return to_layer_map(jids);
 }
 
 }  // namespace
@@ -99,11 +114,35 @@ App::App(wl::display *d)
      display{d},
      controller{},
      outputs(),
-     layouts(load_layout("../layout.json").unwrap()),
-     surface2layer(load_layer_ids("../ids.json").unwrap()) {
-   // layouts(load_layout("../layout.json").unwrap()) {
+     config(),
+     layouts(),
+     layers() {
    assert(g_app == nullptr);
    g_app = this;
+
+   try {
+      {
+         auto l = load_layer_map(
+                 this->config.get_string("layers.json").value().c_str());
+         if (l.is_ok()) {
+            this->layers = l.unwrap();
+         } else {
+            logerror("%s", l.err().value());
+         }
+      }
+
+      {
+         auto l = load_layout(
+                 this->config.get_string("layout.json").value().c_str());
+         if (l.is_ok()) {
+            this->layouts = l.unwrap();
+         } else {
+            logerror("%s", l.err().value());
+         }
+      }
+   } catch (std::exception &e) {
+      logerror("Loading of configuration failed: %s", e.what());
+   }
 }
 
 App::~App() { g_app = nullptr; }
@@ -113,6 +152,11 @@ int App::init() {
       return -1;
    }
 
+   if (this->layers.mapping.empty()) {
+      logerror("No surface -> layer mapping loaded");
+      return -1;
+   }
+
    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));
@@ -194,7 +238,7 @@ int App::init_layout() {
    // Quick and dirty setup of layers
    // XXX: This likely needs to be sorted by order (note, we don't (yet?)
    // do any zorder arrangement).
-   for (auto const &i : this->surface2layer.mapping) {
+   for (auto const &i : this->layers.mapping) {
       c->layer_create(i.layer_id, o->width, o->height);
       auto &l = layers[i.layer_id];
       l->set_destination_rectangle(0, 0, o->width, o->height);
@@ -204,7 +248,7 @@ int App::init_layout() {
    }
 
    // Add layers to screen (XXX: are they sorted correctly?)
-   s->set_render_order(this->surface2layer.layers);
+   s->set_render_order(this->layers.layers);
 
    c->commit_changes();
 
@@ -221,13 +265,12 @@ int App::init_layout() {
 // |_|
 void App::surface_created(uint32_t surface_id) {
    DB("surface_id is " << surface_id);
-   int layer_id =
-      this->surface2layer.get_layer_for_surface(surface_id).value_or(-1);
+   int layer_id = this->layers.get_layer_id(surface_id).value_or(-1);
    if (layer_id == -1) {
       logerror("Surface %d (0x%x) is not part of any layer!", surface_id,
                surface_id);
    } else {
-      auto rect = this->surface2layer.get_rect_for_surface(surface_id).value();
+      auto rect = this->layers.get_layer_rect(surface_id).value();
       this->controller->add_task(
          "fullscreen surface",
          [layer_id, surface_id, rect](struct genivi::controller *c) {
@@ -238,22 +281,26 @@ void App::surface_created(uint32_t surface_id) {
             int w = rect.w;
             int h = rect.h;
 
+            // less-than-0 values refer to MAX + 1 - $VALUE
+            // e.g. MAX is either screen width or height
             if (w < 0) {
                w = c->output_size.w + 1 + w;
             }
             if (h < 0) {
                h = c->output_size.h + 1 + h;
             }
-            logdebug("Computed rect={ %d, %d, %d, %d }", x,  y, w, h);
+            logdebug("Computed rect={ %d, %d, %d, %d }", x, y, w, h);
 
+            // configure surface to wxh dimensions
             s->set_configuration(w, h);
+            // set source rect to "entire surface"
             s->set_source_rectangle(0, 0, w, h);
+            // set destination to the display rectangle
             s->set_destination_rectangle(x, y, w, h);
 
             s->set_visibility(1);
             c->layers[layer_id]->add_surface(s.get());
-            logdebug("Surface %u now on layer %u", surface_id,
-                     layer_id);
+            logdebug("Surface %u now on layer %u", surface_id, layer_id);
          });
    }
 }
@@ -284,7 +331,7 @@ binding_api::result_type binding_api::register_surface(uint32_t appid,
 
 binding_api::result_type binding_api::debug_layers() {
    logdebug("%s", __func__);
-   return Ok(to_json(this->app->controller->lprops));
+   return Ok(json_tokener_parse(this->app->layers.to_json().dump().c_str()));
 }
 
 binding_api::result_type binding_api::debug_surfaces() {
@@ -303,7 +350,8 @@ binding_api::result_type binding_api::debug_status() {
 
 binding_api::result_type binding_api::debug_terminate() {
    logdebug("%s", __func__);
-   raise(SIGKILL);  // XXX afb-daemon kills it's pgroup using TERM, which doesn't play well with perf
+   raise(SIGKILL);  // XXX afb-daemon kills it's pgroup using TERM, which
+                    // doesn't play well with perf
    return Ok(json_object_new_object());
 }