X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.cpp;h=58a62ee2bd156b9568641d5f3b65ddbde59f2483;hb=92c8b647e4e164479c10a84021564533e73cbd69;hp=29f84f7d87a56cb1483e41dc1d573b57736de298;hpb=f1dcabc5b8e2d9b31cbb031ce2f8d8054e41a48a;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 29f84f7..58a62ee 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -18,6 +18,8 @@ #include #include +#include +#include namespace wm { @@ -42,7 +44,7 @@ result layout_from_json(json const &j) { DB(j); auto &ja = j["areas"]; - auto l = wm::layout{j["name"].get(), uint32_t(ja.size()), {}}; + 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"); @@ -65,6 +67,7 @@ struct result load_layout(char const *filename) { i >> jlayouts; auto layouts = layouts_type(); + layouts.reserve(jlayouts.size()); std::transform(std::cbegin(jlayouts), std::cend(jlayouts), std::back_inserter(layouts), layout_from_json); @@ -84,23 +87,23 @@ struct result } // namespace +// _ _ _ _ +// ___| | __ _ ___ ___ / \ _ __ _ __ (_)_ __ ___ _ __ | | +// / __| |/ _` / __/ __| / _ \ | '_ \| '_ \ | | '_ ` _ \| '_ \| | +// | (__| | (_| \__ \__ \ / ___ \| |_) | |_) | | | | | | | | |_) | | +// \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| +// |_| |_| |_| App::App(wl::display *d) - : api{this}, display{d}, controller{} { + : api{this}, + chooks{this}, + display{d}, + controller{}, + outputs(), + 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; - - auto a = load_layout("../layout.json"); - auto b = a.map_err([](char const *e) -> char const * { - DB("Could not load layout: " << e); - return e; - }); - - auto c = load_layer_ids("../ids.json"); - auto e = c.map_err([](char const *e) -> char const * { - DB("Could not load ids: " << e); - return e; - }); } App::~App() { g_app = nullptr; } @@ -119,6 +122,9 @@ int App::init() { "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... this->controller->add_proxy_to_id_mapping( @@ -185,21 +191,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(); @@ -208,6 +213,55 @@ 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 { + 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_source_rectangle(0, 100, c->output_size.w, c->output_size.h - 200); + if (layer_id != 1000) { + // s->set_source_rectangle(0, 0, c->output_size.w, c->output_size.h - 200); + s->set_configuration(c->output_size.w, c->output_size.h - 200); + s->set_destination_rectangle(0, 100, c->output_size.w, + c->output_size.h - 200); + } else { + // s->set_source_rectangle(0, 0, c->output_size.w, c->output_size.h); + s->set_configuration(c->output_size.w, c->output_size.h); + 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 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); @@ -241,4 +295,24 @@ 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