#include "app.hpp"
#include "json_helper.hpp"
+#include "layers.hpp"
#include "layout.hpp"
#include "util.hpp"
#include "wayland.hpp"
#include <json-c/json.h>
+#include <bits/signum.h>
+#include <csignal>
#include <fstream>
#include <json.hpp>
namespace wm {
-#ifndef NDEBUG
-#define DB(expr) \
- do { \
- std::ostringstream o; \
- o << __FILE__ << ":" << __LINE__ << ":" << __func__ << ": " << expr; \
- logdebug(o.str().c_str()); \
- } while (0)
-#else
-#define DB(expr)
-#endif
-
namespace {
App *g_app;
return wm::area{
j["name"].get<std::string>(),
{
- get<uint32_t>(j["width"]),
- get<uint32_t>(j["height"]),
- get<int32_t>(j["x"]),
- get<int32_t>(j["y"]),
+ 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"]),
};
DB(j);
auto &ja = j["areas"];
- auto l = wm::layout{j["name"].get<std::string>(), uint32_t(ja.size()), {}};
+ 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");
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());
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},
+ chooks{this},
display{d},
controller{},
outputs(),
- layouts() {
- // layouts(load_layout("../layout.json").unwrap()) {
+ config(),
+ layouts(),
+ layers() {
assert(g_app == nullptr);
g_app = this;
- auto l = load_layout("../layout.json");
- if (l.is_err()) {
- DB("Could not load layout: " << l.unwrap_err());
+ 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());
}
}
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));
"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...
this->controller->add_proxy_to_id_mapping(
// 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();
return 0;
}
+// _ _ _____ _
+// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___
+// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __|
+// | |_) | | | (_) > <| | __/ (_| | | |___ \ V / __/ | | | |_\__ \
+// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
+// |_|
+void App::surface_created(uint32_t surface_id) {
+ DB("surface_id is " << surface_id);
+ 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->layers.get_layer_rect(surface_id).value();
+ this->controller->add_task(
+ "fullscreen surface",
+ [layer_id, surface_id, rect](struct genivi::controller *c) {
+ auto &s = c->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 = 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 on layer %u", surface_id, layer_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);
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() {
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());
+}
+
+// _ _ _ _ _
+// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____
+// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|
+// | (_| (_) | | | | |_| | | (_) | | | __/ | | | | | (_) | (_) | <\__ \
+// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|___|_| |_|\___/ \___/|_|\_\___/
+// |_____|
+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);
+}
+
+} // namespace wm
Code Review / staging / windowmanager.git / blobdiff