X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=6a7fc69105d7701588df17e526f5d551a0f4bf1b;hb=2b84aa5d33611d0f2f7b8c4395dc352ebf60ea29;hp=b261c53087770d7353c1be6176c17289f539d2f1;hpb=b166f3512f5e426e60a4ff610a9f07239ac18ea1;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index b261c53..6a7fc69 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1,47 +1,192 @@
-//
-// Created by mfritzsc on 7/11/17.
-//
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "app.hpp"
 #include "json_helper.hpp"
+#include "layers.hpp"
+#include "layout.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
 
+#include <cstdio>
+#include <memory>
+
 #include <cassert>
 
 #include <json-c/json.h>
 
+#include <bits/signum.h>
+#include <csignal>
+#include <fstream>
+#include <json.hpp>
+
 namespace wm {
 
 namespace {
 App *g_app;
+
+using json = nlohmann::json;
+
+struct wm::area area_from_json(json const &j) {
+   DB(j);
+   return wm::area{
+      j["name"].get<std::string>(),
+      {
+         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"]),
+   };
+}
+
+result<struct layout> layout_from_json(json const &j) {
+   DB(j);
+   auto &ja = j["areas"];
+
+   auto l = 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 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);
+
+   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());
+   std::transform(std::cbegin(jlayouts), std::cend(jlayouts),
+                  std::back_inserter(layouts), layout_from_json);
+
+   return Ok(layouts);
+}
+
+struct result<layer_map>
+   load_layer_map(char const *filename) {
+   DB("loading IDs from " << filename);
+
+   auto j = file_to_json(filename);
+   if (j.is_err()) {
+      return Err<layer_map>(j.unwrap_err());
+   }
+   json jids = j.unwrap();
+
+   return to_layer_map(jids);
+}
+
 }  // namespace
 
-App::App(wl::display *d) : api{this}, display{d}, controller{}, outputs() {
+//       _                    _                  _                 _
+//   ___| | __ _ ___ ___     / \   _ __  _ __   (_)_ __ ___  _ __ | |
+//  / __| |/ _` / __/ __|   / _ \ | '_ \| '_ \  | | '_ ` _ \| '_ \| |
+// | (__| | (_| \__ \__ \  / ___ \| |_) | |_) | | | | | | | | |_) | |
+//  \___|_|\__,_|___/___/ /_/   \_\ .__/| .__/  |_|_| |_| |_| .__/|_|
+//                                |_|   |_|                 |_|
+App::App(wl::display *d)
+   : api{this},
+     chooks{this},
+     display{d},
+     controller{},
+     outputs(),
+     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; }
+
 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));
+   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));
       });
 
-   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);
+
+         // Init controller hooks
+         this->controller->chooks = &this->chooks;
 
          // 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
@@ -64,8 +209,7 @@ int App::dispatch_events() {
    this->display->flush();
 
    // execute pending tasks, that is layout changes etc.
-   this->controller->execute_pending();
-   this->display->roundtrip();
+   this->execute_pending();
 
    return 0;
 }
@@ -102,21 +246,20 @@ int App::init_layout() {
    // Clear screen
    s->clear();
 
-   // Setup our dummy scene...
-   c->layer_create(100, 0, 0);   // bottom layer, anything else
-   c->layer_create(1000, 0, 0);  // top layer, mandelbrot
-
-   auto &l100 = c->layers[100];
-   auto &l1k = c->layers[1000];
-
-   // Set layers fullscreen
-   l100->set_destination_rectangle(0, 0, o->width, o->height);
-   l1k->set_destination_rectangle(0, 0, o->width, o->height);
-   l100->set_visibility(1);
-   l1k->set_visibility(1);
+   // 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->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);
+      l->set_visibility(1);
+      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({100, 1000});
+   // Add layers to screen (XXX: are they sorted correctly?)
+   s->set_render_order(this->layers.layers);
 
    c->commit_changes();
 
@@ -125,6 +268,123 @@ int App::init_layout() {
    return 0;
 }
 
+void App::surface_set_layout(uint32_t surface_id) {
+   auto o_layer_id = this->layers.get_layer_id(surface_id);
+
+   if (!o_layer_id) {
+      logerror("Surface %d is not associated with any layer!", int(surface_id));
+      return;
+   }
+
+   if (!this->controller->surface_exists(surface_id)) {
+      logerror("Surface %d does not exist", int(surface_id));
+      return;
+   }
+
+   uint32_t layer_id = o_layer_id.value();
+
+   auto rect = this->layers.get_layer_rect(surface_id).value();
+   auto &s = this->controller->surfaces[surface_id];
+
+   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 = this->controller->output_size.w + 1 + w;
+   }
+   if (h < 0) {
+      h = this->controller->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 destination to the display rectangle
+   s->set_destination_rectangle(x, y, w, h);
+
+   // XXX: visibility should be determined independently of our
+   //      layer + geometry setup.
+   s->set_visibility(1);
+   this->controller->layers[layer_id]->add_surface(s.get());
+
+   logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
+            surface_id, layer_id, x, y, w, h);
+}
+
+char const *App::activate_surface(uint32_t surface_id) {
+   if (!this->controller->surface_exists(surface_id)) {
+      return "Surface does not exist";
+   }
+
+   // This shouild involve a policy check, but as we do not (yet) have
+   // such a thing, we will just switch to this surface.
+   // XXX: input focus missing!!1
+
+   // Make it visible, no (or little effect) if already visible
+   auto &s = this->controller->surfaces[surface_id];
+
+   // Set all others invisible
+   for (auto &i : this->controller->surfaces) {
+      auto &si = this->controller->sprops[i.second->id];
+      if (si.visibility == 1 && si.id != s->id &&
+          int(si.id) != this->layers.main_surface) {
+         i.second->set_visibility(0);
+      }
+   }
+   s->set_visibility(1);
+
+   // commit changes
+   this->controller->commit_changes();
+   this->display->flush();
+
+   // no error
+   return nullptr;
+}
+
+void App::add_task(char const *name, std::function<void()> &&f) {
+   this->pending.emplace_back(std::make_pair(name, f));
+}
+
+void App::execute_pending() {
+   if (!this->pending.empty()) {
+      for (auto &t : this->pending) {
+         logdebug("executing task '%s'", t.first);
+         t.second();
+      }
+      this->pending.clear();
+      this->controller->commit_changes();
+      this->display->flush();
+   }
+}
+
+//                      _          _   _____                 _
+//  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
+// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
+// | |_) | | | (_) >  <| |  __/ (_| | | |___ \ V /  __/ | | | |_\__ \
+// | .__/|_|  \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
+// |_|
+void App::surface_created(uint32_t surface_id) {
+   DB("surface_id is " << surface_id);
+
+   // We need to execute the surface setup after its creation.
+   this->add_task("surface_set_layout",
+                  [surface_id, this] { this->surface_set_layout(surface_id); });
+}
+
+void App::surface_removed(uint32_t surface_id) {
+   DB("surface_id is " << surface_id);
+}
+
+//  _     _           _ _                            _   _                 _
+// | |__ (_)_ __   __| (_)_ __   __ _     __ _ _ __ (_) (_)_ __ ___  _ __ | |
+// | '_ \| | '_ \ / _` | | '_ \ / _` |   / _` | '_ \| | | | '_ ` _ \| '_ \| |
+// | |_) | | | | | (_| | | | | | (_| |  | (_| | |_) | | | | | | | | | |_) | |
+// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_|
+//                              |___/_____|   |_|                   |_|
 binding_api::result_type binding_api::register_surface(uint32_t appid,
                                                        uint32_t surfid) {
    logdebug("%s appid %u surfid %u", __func__, appid, surfid);
@@ -141,7 +401,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() {
@@ -158,4 +418,47 @@ binding_api::result_type binding_api::debug_status() {
    return Ok(jr);
 }
 
-}  // namespace wm
\ No newline at end of file
+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());
+}
+
+binding_api::result_type binding_api::demo_activate_surface(
+   uint32_t surfaceid) {
+   char const *e = this->app->activate_surface(surfaceid);
+   if (e) {
+      return Err<json_object *>(e);
+   }
+   return Ok(json_object_new_object());
+}
+
+binding_api::result_type binding_api::demo_activate_all() {
+   for (auto &s : this->app->controller->surfaces) {
+      s.second->set_visibility(1);
+   }
+   this->app->controller->commit_changes();
+   this->app->display->flush();
+   return Ok(json_object_new_object());
+}
+
+//                  _             _ _            _                 _
+//   ___ ___  _ __ | |_ _ __ ___ | | | ___ _ __ | |__   ___   ___ | | _____
+//  / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|
+// | (_| (_) | | | | |_| | | (_) | | |  __/ |   | | | | (_) | (_) |   <\__ \
+//  \___\___/|_| |_|\__|_|  \___/|_|_|\___|_|___|_| |_|\___/ \___/|_|\_\___/
+//                                         |_____|
+void controller_hooks::surface_created(uint32_t surface_id) {
+   this->app->surface_created(surface_id);
+}
+
+void controller_hooks::surface_removed(uint32_t surface_id) {
+   this->app->surface_removed(surface_id);
+}
+
+void controller_hooks::add_task(char const *name, std::function<void()> &&f) {
+   this->app->add_task(name, std::move(f));
+}
+
+}  // namespace wm