X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=ee3a60072354b6a9b007659543f700e1a25d7a15;hb=353bfe55c134bb19247bf26c2498c0d87f80dc18;hp=651597838e141430cfd38c266a686c4dc850c1fc;hpb=7678bfc942bd501f8e121ff153d1852d73578257;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 6515978..ee3a600 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -3,162 +3,235 @@ // #include "app.hpp" -#include "util.hpp" #include "json_helper.hpp" +#include "layout.hpp" +#include "util.hpp" #include "wayland.hpp" +#include +#include + #include #include +#include +#include + namespace wm { - namespace { - App *g_app; - } - - App::App(wl::display *d) - : api{this}, display{d}, controller{}, outputs() - { - assert(g_app == nullptr); - g_app = this; - } - - 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)); - }); - - 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); - - // 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(), - wl_proxy_get_id(reinterpret_cast( - g_app->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(); - - // 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); - - // Add layers to screen - s->set_render_order({100, 1000}); - - c->commit_changes(); - - this->display->flush(); - - return 0; - } - - 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)); - } - - 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); - } - -} // namespace wm \ No newline at end of file +#ifndef NDEBUG +#define DB(expr) \ + std::cerr << __FILE__ << ":" << __LINE__ << ":" << __func__ << ": " << expr \ + << "\n" +#else +#define DB(expr) +#endif + +namespace { +App *g_app; + +using json = nlohmann::json; + +// We ned to manually unwrap numbers +template +result get(json const &j) { + T r; + std::istringstream s(j.get()); + s >> r; + return s.fail() ? Err("Could not read int") : Ok(r); +} + +struct wm::area area_from_json(json const &j) { + return wm::area{ + j["name"].get(), + { + get(j["width"]).unwrap(), + get(j["height"]).unwrap(), + get(j["x"]).unwrap(), + get(j["y"]).unwrap(), + }, + get(j["zorder"]).unwrap(), + }; +} + +struct layout layout_from_json(json const &j) { + auto &ja = j["areas"]; + + auto l = wm::layout{j["name"].get(), uint32_t(ja.size()), {}}; + + 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 l; +} + +struct result load_layout(char const *filename) { + json jlayouts; + std::ifstream i(filename); + i >> jlayouts; + + size_t nlayouts = jlayouts.size(); + auto layouts = layouts_type(nlayouts); + + std::transform(std::cbegin(jlayouts), std::cend(jlayouts), + std::begin(layouts), layout_from_json); + + return Ok(layouts); +} + +} // namespace + +App::App(wl::display *d) + : api{this}, + display{d}, + controller{}, + outputs(), + layouts() { + // 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); + + // 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(); + + // 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); + + // Add layers to screen + s->set_render_order({100, 1000}); + + c->commit_changes(); + + this->display->flush(); + + return 0; +} + +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)); +} + +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); +} + +} // namespace wm \ No newline at end of file