X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=8c929fe724ffe480a120177b76ca3e5b04607f2e;hb=6d5be0fb38f93a758127491f6c81de829554bf1d;hp=939d569181ff133acf2d170bde015e2b45c33c48;hpb=743884774843259d92ec2b3745caa7e91805af53;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index 939d569..8c929fe 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -16,6 +16,8 @@
 
 #include <json-c/json.h>
 
+#include <bits/signum.h>
+#include <csignal>
 #include <fstream>
 #include <json.hpp>
 
@@ -31,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"]),
@@ -97,11 +99,20 @@ App::App(wl::display *d)
      display{d},
      controller{},
      outputs(),
-     layouts(load_layout("../layout.json").unwrap()),
+     layouts(),  // load_layout("../layout.json").unwrap()),
      surface2layer(load_layer_ids("../ids.json").unwrap()) {
    // layouts(load_layout("../layout.json").unwrap()) {
    assert(g_app == nullptr);
    g_app = this;
+
+   try {
+      auto l = load_layout("../layout.json");
+      if (l.is_err()) {
+         logerror("Coult not load layout configuration: %s", l.err().value());
+      }
+   } catch (std::exception &e) {
+      logerror("Coult not load layout configuration: %s", e.what());
+   }
 }
 
 App::~App() { g_app = nullptr; }
@@ -192,19 +203,17 @@ 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).
-   std::vector<unsigned> ls;
-   ls.reserve(this->surface2layer.mapping.size());
-   for (auto const &i: this->surface2layer.mapping) {
+   for (auto const &i : this->surface2layer.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);
       l->set_visibility(1);
-      DB("Setting up layer " << i.layer_id << " for surfaces " << i.id_min << " through " << i.id_max);
-      ls.push_back(unsigned(i.layer_id));
+      logdebug("Setting up layer %s (%d) for surfaces %d-%d", i.name.c_str(),
+               i.layer_id, i.id_min, i.id_max);
    }
 
-   // Add layers to screen
-   s->set_render_order(ls);
+   // Add layers to screen (XXX: are they sorted correctly?)
+   s->set_render_order(this->surface2layer.layers);
 
    c->commit_changes();
 
@@ -213,6 +222,12 @@ int App::init_layout() {
    return 0;
 }
 
+//                      _          _   _____                 _
+//  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
+// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
+// | |_) | | | (_) >  <| |  __/ (_| | | |___ \ V /  __/ | | | |_\__ \
+// | .__/|_|  \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
+// |_|
 void App::surface_created(uint32_t surface_id) {
    DB("surface_id is " << surface_id);
    int layer_id =
@@ -221,14 +236,32 @@ 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) {
+         "fullscreen surface",
+         [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;
+
+            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);
+
+            s->set_configuration(w, h);
+            s->set_source_rectangle(0, 0, w, h);
+            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);
          });
    }
 }
@@ -276,6 +309,13 @@ binding_api::result_type binding_api::debug_status() {
    return Ok(jr);
 }
 
+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
+   return Ok(json_object_new_object());
+}
+
 //                  _             _ _            _                 _
 //   ___ ___  _ __ | |_ _ __ ___ | | | ___ _ __ | |__   ___   ___ | | _____
 //  / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|