X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=6a7f5b4057b7bee19bf48881e22ba6e22f0cb8ab;hb=fe0c22a9cb528e55ad8d633f8d286116e016fe3c;hp=606c1677211befeec4a1f018c69667bc29cf401a;hpb=f8b41b5834be28af1dfc5ce1763a2a637506bef3;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 606c167..6a7f5b4 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -1,9 +1,26 @@ +/* + * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + // // Created by mfritzsc on 7/11/17. // #include "app.hpp" #include "json_helper.hpp" +#include "layers.hpp" #include "layout.hpp" #include "util.hpp" #include "wayland.hpp" @@ -15,22 +32,13 @@ #include +#include +#include #include #include namespace wm { -#ifndef NDEBUG -#define DB(expr) \ - do { \ - std::ostringstream o; \ - o << __FILE__ << ":" << __LINE__ << ":" << __func__ << ": " << expr; \ - logdebug(o.str().c_str()); \ - } while (0) -#else -#define DB(expr) -#endif - namespace { App *g_app; @@ -41,10 +49,8 @@ struct wm::area area_from_json(json const &j) { return wm::area{ j["name"].get(), { - get(j["width"]), - get(j["height"]), - get(j["x"]), - get(j["y"]), + get(j["width"]), get(j["height"]), + get(j["x"]), get(j["y"]), }, get(j["zorder"]), }; @@ -54,7 +60,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"); @@ -69,35 +75,89 @@ 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); +} + +// Will throw if parsing fails 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); return Ok(layouts); } +struct result + load_layer_map(char const *filename) { + DB("loading IDs from " << filename); + + auto j = file_to_json(filename); + if (j.is_err()) { + return Err(j.unwrap_err()); + } + json jids = j.unwrap(); + + return to_layer_map(jids); +} + } // namespace +// _ _ _ _ +// ___| | __ _ ___ ___ / \ _ __ _ __ (_)_ __ ___ _ __ | | +// / __| |/ _` / __/ __| / _ \ | '_ \| '_ \ | | '_ ` _ \| '_ \| | +// | (__| | (_| \__ \__ \ / ___ \| |_) | |_) | | | | | | | | |_) | | +// \___|_|\__,_|___/___/ /_/ \_\ .__/| .__/ |_|_| |_| |_| .__/|_| +// |_| |_| |_| App::App(wl::display *d) : api{this}, + chooks{this}, display{d}, controller{}, outputs(), - layouts() { - // layouts(load_layout("../layout.json").unwrap()) { + config(), + layouts(), + layers() { assert(g_app == nullptr); g_app = this; - auto l = load_layout("../layout.json"); - if (l.is_err()) { - DB("Could not load layout: " << l.unwrap_err()); + try { + { + auto l = load_layer_map( + this->config.get_string("layers.json").value().c_str()); + if (l.is_ok()) { + this->layers = l.unwrap(); + } else { + logerror("%s", l.err().value()); + } + } + + { + auto l = load_layout( + this->config.get_string("layout.json").value().c_str()); + if (l.is_ok()) { + this->layouts = l.unwrap(); + } else { + logerror("%s", l.err().value()); + } + } + } catch (std::exception &e) { + logerror("Loading of configuration failed: %s", e.what()); } } @@ -108,6 +168,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)); @@ -117,6 +182,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( @@ -145,8 +213,7 @@ int App::dispatch_events() { this->display->flush(); // execute pending tasks, that is layout changes etc. - this->controller->execute_pending(); - this->display->roundtrip(); + this->execute_pending(); return 0; } @@ -183,21 +250,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->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); + } - // Add layers to screen - s->set_render_order({100, 1000}); + // Add layers to screen (XXX: are they sorted correctly?) + s->set_render_order(this->layers.layers); c->commit_changes(); @@ -206,6 +272,96 @@ int App::init_layout() { return 0; } +void App::surface_set_layout(uint32_t surface_id) { + auto o_layer_id = this->layers.get_layer_id(surface_id); + + if (!o_layer_id) { + logerror("Surface %d is not associated with any layer!", int(surface_id)); + return; + } + + if (!this->controller->surface_exists(surface_id)) { + logerror("Surface %d does not exist", int(surface_id)); + return; + } + + uint32_t layer_id = o_layer_id.value(); + + auto rect = this->layers.get_layer_rect(surface_id).value(); + auto &s = this->controller->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 = this->controller->output_size.w + 1 + w; + } + if (h < 0) { + h = this->controller->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); + + // XXX: visibility should be determined independently of our + // layer + geometry setup. + s->set_visibility(1); + this->controller->layers[layer_id]->add_surface(s.get()); + + logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }", + surface_id, layer_id, x, y, w, h); +} + +void App::add_task(char const *name, std::function &&f) { + this->pending.emplace_back(std::make_pair(name, f)); +} + +void App::execute_pending() { + if (!this->pending.empty()) { + for (auto &t : this->pending) { + logdebug("executing task '%s'", t.first); + t.second(); + } + this->pending.clear(); + this->controller->commit_changes(); + this->display->flush(); + } +} + +// _ _ _____ _ +// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___ +// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __| +// | |_) | | | (_) > <| | __/ (_| | | |___ \ V / __/ | | | |_\__ \ +// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/ +// |_| +void App::surface_created(uint32_t surface_id) { + DB("surface_id is " << surface_id); + + // We need to execute the surface setup after its creation. + // XXX: perhaps move the late-tasks functionality to App? + this->add_task("surface_set_layout", + [surface_id, this] { this->surface_set_layout(surface_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); @@ -222,7 +378,7 @@ binding_api::result_type binding_api::register_surface(uint32_t appid, binding_api::result_type binding_api::debug_layers() { logdebug("%s", __func__); - return Ok(to_json(this->app->controller->lprops)); + return Ok(json_tokener_parse(this->app->layers.to_json().dump().c_str())); } binding_api::result_type binding_api::debug_surfaces() { @@ -239,4 +395,29 @@ 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); +} + +void controller_hooks::add_task(char const *name, std::function &&f) { + this->app->add_task(name, std::move(f)); +} + +} // namespace wm