X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=1c9b3c296d305f61ece1a8e8c3d2a2c88da65423;hb=659a54b2cd58fb7cc4c9935e89a8b928957e88eb;hp=e28d8d0e45f88155a92092668ace255f291f2ed0;hpb=f690f1bb1a9736ec13cbe1dad721b0bbc1c3af67;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index e28d8d0..1c9b3c2 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -16,6 +16,8 @@ #include +#include +#include #include #include @@ -31,7 +33,7 @@ struct wm::area area_from_json(json const &j) { return wm::area{ j["name"].get(), { - get(j["width"]), get(j["height"]), + get(j["width"]), get(j["height"]), get(j["x"]), get(j["y"]), }, get(j["zorder"]), @@ -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"); @@ -57,14 +59,27 @@ result layout_from_json(json const &j) { 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); - json jlayouts; - std::ifstream i(filename); - i >> jlayouts; + 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); @@ -75,9 +90,11 @@ struct result load_layer_ids(char const *filename) { DB("loading IDs from " << filename); - json jids; - std::ifstream i(filename); - i >> jids; + 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); } @@ -91,22 +108,33 @@ struct result // \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| // |_| |_| |_| App::App(wl::display *d) - : api{this}, chooks{this}, display{d}, controller{} { - // layouts(load_layout("../layout.json").unwrap()) { + : api{this}, + chooks{this}, + display{d}, + controller{}, + outputs(), + layouts(), + surface2layer() { 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; - }); + { + 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; } @@ -116,6 +144,11 @@ int App::init() { return -1; } + 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)); @@ -194,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(); @@ -217,8 +249,53 @@ 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) { @@ -264,6 +341,13 @@ binding_api::result_type binding_api::debug_status() { return Ok(jr); } +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()); +} + // _ _ _ _ _ // ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____ // / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|