X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=1c9b3c296d305f61ece1a8e8c3d2a2c88da65423;hb=659a54b2cd58fb7cc4c9935e89a8b928957e88eb;hp=5ff87293e38d2f352364869309be16352a3e3bc8;hpb=8cd840e49ad293ece796d32db87d4b1980502cf3;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 5ff8729..1c9b3c2 100644
--- 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 {
 
@@ -33,7 +33,7 @@ struct wm::area area_from_json(json const &j) {
    return wm::area{
       j["name"].get<std::string>(),
       {
-         get<uint32_t>(j["width"]), get<uint32_t>(j["height"]),
+         get<int32_t>(j["width"]), get<int32_t>(j["height"]),
          get<int32_t>(j["x"]), get<int32_t>(j["y"]),
       },
       get<uint32_t>(j["zorder"]),
@@ -59,12 +59,24 @@ 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);
+}
+
 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());
@@ -78,9 +90,11 @@ 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 j = file_to_json(filename);
+   if (j.is_err()) {
+      return Err<surface_id_to_layer_map>(j.unwrap_err());
+   }
+   json jids = j.unwrap();
 
    return to_surface_id_to_layer_map(jids);
 }
@@ -99,11 +113,28 @@ 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()) {
+     layouts(),
+     surface2layer() {
    assert(g_app == nullptr);
    g_app = this;
+
+   {
+      auto l = load_layer_ids("../ids.json");
+      if (l.is_ok()) {
+         this->surface2layer = l.unwrap();
+      } else {
+         logerror("%s", l.err().value());
+      }
+   }
+
+   {
+      auto l = load_layout("../layout.json");
+      if (l.is_ok()) {
+         this->layouts = l.unwrap();
+      } else {
+         logerror("%s", l.err().value());
+      }
+   }
 }
 
 App::~App() { g_app = nullptr; }
@@ -113,6 +144,11 @@ int App::init() {
       return -1;
    }
 
+   if (this->surface2layer.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));
@@ -227,16 +263,37 @@ void App::surface_created(uint32_t surface_id) {
       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();
       this->controller->add_task(
          "fullscreen surface",
-         [layer_id, surface_id](struct genivi::controller *c) {
+         [layer_id, surface_id, rect](struct genivi::controller *c) {
             auto &s = c->surfaces[surface_id];
-            s->set_destination_rectangle(0, 0, c->output_size.w,
-                                         c->output_size.h);
+
+            int x = rect.x;
+            int y = rect.y;
+            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);
+
+            // 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 fullscreen on layer %u", surface_id,
-                     layer_id);
+            logdebug("Surface %u now on layer %u", surface_id, layer_id);
          });
    }
 }
@@ -286,7 +343,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());
 }