X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=1c9b3c296d305f61ece1a8e8c3d2a2c88da65423;hb=659a54b2cd58fb7cc4c9935e89a8b928957e88eb;hp=b261c53087770d7353c1be6176c17289f539d2f1;hpb=b166f3512f5e426e60a4ff610a9f07239ac18ea1;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index b261c53..1c9b3c2 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -4,44 +4,169 @@ #include "app.hpp" #include "json_helper.hpp" +#include "layers.hpp" +#include "layout.hpp" #include "util.hpp" #include "wayland.hpp" +#include +#include + #include #include +#include +#include +#include +#include + 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(), + { + get(j["width"]), get(j["height"]), + get(j["x"]), get(j["y"]), + }, + get(j["zorder"]), + }; +} + +result layout_from_json(json const &j) { + DB(j); + auto &ja = j["areas"]; + + auto l = layout{j["name"].get(), uint32_t(ja.size()), {}}; + + if (ja.size() > layout::MAX_N_AREAS) { + return Err("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 file_to_json(char const *filename) { + std::ifstream i(filename); + if (i.fail()) { + return Err("Could not open config file"); + } + json j; + i >> j; + return Ok(j); +} + +struct result load_layout(char const *filename) { + DB("loading layout from " << filename); + + auto j = file_to_json(filename); + if (j.is_err()) { + return Err(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 + load_layer_ids(char const *filename) { + DB("loading IDs from " << filename); + + auto j = file_to_json(filename); + if (j.is_err()) { + return Err(j.unwrap_err()); + } + json jids = j.unwrap(); + + return to_surface_id_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(), + 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; } + 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(r, name, v)); + 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(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(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(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( - g_app->outputs.back()->proxy.get()))); + this->outputs.back()->proxy.get()))); }); // First level objects @@ -102,21 +227,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->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); + 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->surface2layer.layers); c->commit_changes(); @@ -125,6 +249,65 @@ int App::init_layout() { return 0; } +// _ _ _____ _ +// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___ +// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __| +// | |_) | | | (_) > <| | __/ (_| | | |___ \ V / __/ | | | |_\__ \ +// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/ +// |_| +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 { + auto rect = this->surface2layer.get_rect_for_surface(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); @@ -158,4 +341,25 @@ 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()); +} + +// _ _ _ _ _ +// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____ +// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __| +// | (_| (_) | | | | |_| | | (_) | | | __/ | | | | | (_) | (_) | <\__ \ +// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|___|_| |_|\___/ \___/|_|\_\___/ +// |_____| +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