X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=f925e3da50544d7c7bb0fd8df6144a0e35ff764c;hb=d2fe9e8e49a0970986282162b04d335c57845ac3;hp=84ebfbad82884a299502d8c4629ff6b3e1fa8157;hpb=979f3c80a66129cadc9260fc52eb5eab2fb73622;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 84ebfba..f925e3d 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"]), @@ -57,12 +59,24 @@ 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()); @@ -72,15 +86,17 @@ struct result load_layout(char const *filename) { return Ok(layouts); } -struct result +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); + return to_layer_map(jids); } } // namespace @@ -97,11 +113,28 @@ App::App(wl::display *d) display{d}, controller{}, outputs(), - layouts(load_layout("../layout.json").unwrap()), - surface2layer(load_layer_ids("../ids.json").unwrap()) { - // layouts(load_layout("../layout.json").unwrap()) { + layouts(), + layers() { assert(g_app == nullptr); g_app = this; + + { + auto l = load_layer_ids("../ids.json"); + if (l.is_ok()) { + this->layers = 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; } @@ -111,6 +144,11 @@ int App::init() { return -1; } + if (this->layers.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)); @@ -192,19 +230,17 @@ int App::init_layout() { // Quick and dirty setup of layers // XXX: This likely needs to be sorted by order (note, we don't (yet?) // do any zorder arrangement). - std::vector ls; - ls.reserve(this->surface2layer.mapping.size()); - for (auto const &i: this->surface2layer.mapping) { + for (auto const &i : this->layers.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); - ls.push_back(unsigned(i.layer_id)); + 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(ls); + // Add layers to screen (XXX: are they sorted correctly?) + s->set_render_order(this->layers.layers); c->commit_changes(); @@ -213,22 +249,50 @@ 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); + int layer_id = this->layers.get_layer_id(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->layers.get_layer_rect(surface_id).value(); this->controller->add_task( - "fullscreen surface", [layer_id, surface_id](struct genivi::controller *c) { + "fullscreen surface", + [layer_id, surface_id, rect](struct genivi::controller *c) { auto &s = c->surfaces[surface_id]; - s->set_destination_rectangle(0, 0, c->output_size.w, - c->output_size.h); + + 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 fullscreen on layer %u", surface_id, layer_id); + logdebug("Surface %u now on layer %u", surface_id, layer_id); }); } } @@ -276,6 +340,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()); +} + // _ _ _ _ _ // ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____ // / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|