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

diff --git a/src/app.cpp b/src/app.cpp
index 5ff8729..6a7fc69 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1,6 +1,18 @@
-//
-// 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"
@@ -16,10 +28,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 +45,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 +71,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 +99,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 +126,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 +164,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));
@@ -153,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;
 }
@@ -194,7 +249,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 +259,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();
 
@@ -213,6 +268,99 @@ 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();
+   }
+}
+
 //                      _          _   _____                 _
 //  _ __  _ __ _____  _(_) ___  __| | | ____|_   _____ _ __ | |_ ___
 // | '_ \| '__/ _ \ \/ / |/ _ \/ _` | |  _| \ \ / / _ \ '_ \| __/ __|
@@ -221,24 +369,10 @@ 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);
-   if (layer_id == -1) {
-      logerror("Surface %d (0x%x) is not part of any layer!", surface_id,
-               surface_id);
-   } else {
-      this->controller->add_task(
-         "fullscreen surface",
-         [layer_id, surface_id](struct genivi::controller *c) {
-            auto &s = c->surfaces[surface_id];
-            s->set_destination_rectangle(0, 0, c->output_size.w,
-                                         c->output_size.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);
-         });
-   }
+
+   // 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) {
@@ -267,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() {
@@ -286,7 +420,26 @@ 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());
+}
+
+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());
 }
 
@@ -304,4 +457,8 @@ 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