X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=58a62ee2bd156b9568641d5f3b65ddbde59f2483;hb=92c8b647e4e164479c10a84021564533e73cbd69;hp=5da4f9da9bb5865888650c1ff99f08b01b3d1aa6;hpb=628df48e0238391658dab54f81dfa1c62dbfb3ec;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 5da4f9d..58a62ee 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -3,28 +3,316 @@ // #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 { - App::App() - : api{this} - {} +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); +} + +struct result load_layout(char const *filename) { + DB("loading layout from " << filename); + + json jlayouts; + std::ifstream i(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); + + return Ok(layouts); +} + +struct result + load_layer_ids(char const *filename) { + DB("loading IDs from " << filename); + + json jids; + std::ifstream i(filename); + i >> jids; + + return to_surface_id_to_layer_map(jids); +} + +} // namespace + +// _ _ _ _ +// ___| | __ _ ___ ___ / \ _ __ _ __ (_)_ __ ___ _ __ | | +// / __| |/ _` / __/ __| / _ \ | '_ \| '_ \ | | '_ ` _ \| '_ \| | +// | (__| | (_| \__ \__ \ / ___ \| |_) | |_) | | | | | | | | |_) | | +// \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| +// |_| |_| |_| +App::App(wl::display *d) + : 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; +} + +App::~App() { g_app = nullptr; } + +int App::init() { + if (!this->display->ok()) { + 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->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... + this->controller->add_proxy_to_id_mapping( + this->outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + this->outputs.back()->proxy.get()))); + }); + + // First level objects + this->display->roundtrip(); + // Second level objects + this->display->roundtrip(); + // Third level objects + this->display->roundtrip(); + + return init_layout(); +} + +int App::dispatch_events() { + int ret = this->display->dispatch(); + if (ret == -1) { + logerror("wl_display_dipatch() returned error %d", + this->display->get_error()); + return -1; + } + this->display->flush(); + + // execute pending tasks, that is layout changes etc. + this->controller->execute_pending(); + this->display->roundtrip(); + + return 0; +} + +// _ _ _ _ _ ____ +// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ +// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | +// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | +// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | +// |_____| |___/ \_\/_/ +int App::init_layout() { + if (!this->controller) { + logerror("ivi_controller global not available"); + return -1; + } + + if (this->outputs.empty()) { + logerror("no output was set up!"); + return -1; + } + + auto &c = this->controller; + + auto &o = this->outputs.front(); + auto &s = c->screens.begin()->second; + auto &layers = c->layers; + + // XXX: Write output dimensions to ivi controller... + c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + + // Clear scene + layers.clear(); + + // Clear screen + s->clear(); + + // 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 (XXX: are they sorted correctly?) + s->set_render_order(this->surface2layer.layers); + + c->commit_changes(); + + this->display->flush(); + + 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); + if (appid > 0xff) { + return Err("invalid appid"); + } + + if (surfid > 0xffff) { + return Err("invalid surfaceid"); + } + + return Ok(json_object_new_int((appid << 16) + surfid)); +} + +binding_api::result_type binding_api::debug_layers() { + logdebug("%s", __func__); + return Ok(to_json(this->app->controller->lprops)); +} + +binding_api::result_type binding_api::debug_surfaces() { + logdebug("%s", __func__); + return Ok(to_json(this->app->controller->sprops)); +} - result App::API::register_surface(uint32_t appid, - uint32_t surfid) { - return Err("not implemented"); - } +binding_api::result_type binding_api::debug_status() { + logdebug("%s", __func__); + json_object *jr = json_object_new_object(); + json_object_object_add(jr, "surfaces", + to_json(this->app->controller->sprops)); + json_object_object_add(jr, "layers", to_json(this->app->controller->lprops)); + return Ok(jr); +} - result App::API::debug_layers() const { - return Err("not implemented"); - } +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()); +} - result App::API::debug_surfaces() const { - return Err("not implemented"); - } +// _ _ _ _ _ +// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____ +// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __| +// | (_| (_) | | | | |_| | | (_) | | | __/ | | | | | (_) | (_) | <\__ \ +// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|___|_| |_|\___/ \___/|_|\_\___/ +// |_____| +void controller_hooks::surface_created(uint32_t surface_id) { + this->app->surface_created(surface_id); +} - result App::API::debug_status() const { - return Err("not implemented"); - } +void controller_hooks::surface_removed(uint32_t surface_id) { + this->app->surface_removed(surface_id); +} -} // namespace wm \ No newline at end of file +} // namespace wm