From: Marcus Fritzsch Date: Wed, 13 Sep 2017 10:02:42 +0000 (+0200) Subject: Remove remnants of obsolete surface management by their IDs X-Git-Tag: 4.99.1~18 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=commitdiff_plain;h=a414f394e06111d761ca6ac0aa783d59a42c6ea8 Remove remnants of obsolete surface management by their IDs Signed-off-by: Marcus Fritzsch --- diff --git a/layers.json b/layers.json index c1107d4..9b16e08 100644 --- a/layers.json +++ b/layers.json @@ -2,15 +2,12 @@ "comment": "Surface ID to Layer ID mapping", "main_surface": { - "surface_id": 1000, "surface_role": "HomeScreen", "comment": "This surface should never be made invisible (The HomeScreen)" }, "mappings": [ { - "type": "single", - "surface_id": 1000, "role": "^HomeScreen$", "name": "HomeScreen", "layer_id": 1000, @@ -18,9 +15,6 @@ "comment": "Single layer map for the HomeScreen, XXX: type is redundant, could also check existence of id/first_id+last_id" }, { - "type": "range", - "first_surface_id": 2000, - "last_surface_id": 2999, "role": "^App.*", "name": "apps", "layer_id": 1001, @@ -57,27 +51,11 @@ ] }, { - "type": "range", - "first_surface_id": 3000, - "last_surface_id": 3999, "role": "^OnScreen.*", "name": "popups", "layer_id": 9999, "area": { "type": "rect", "rect": { "x": 0, "y": 300, "width": -1, "height": 400 } }, "comment": "Range of IDs that will always be placed on the popup layer, that gets a very high 'dummy' id of 9999" } - ], - - "tests": [ - { "surface_id": 1000, "expect_layer_id": 1000 }, - { "surface_id": 1001, "expect_layer_id": -1, "comment": "check against -1 for not found entries" }, - { "surface_id": 1999, "expect_layer_id": -1 }, - { "surface_id": 2000, "expect_layer_id": 1001 }, - { "surface_id": 2500, "expect_layer_id": 1001 }, - { "surface_id": 2999, "expect_layer_id": 1001 }, - { "surface_id": 3000, "expect_layer_id": 9999 }, - { "surface_id": 3500, "expect_layer_id": 9999 }, - { "surface_id": 3999, "expect_layer_id": 9999 }, - { "surface_id": 4711, "expect_layer_id": -1 } ] } diff --git a/src/app.cpp b/src/app.cpp index 42f6f16..4bd7393 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -222,13 +222,12 @@ int App::init_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]; + c->layer_create(i.second.layer_id, o->width, o->height); + auto &l = layers[i.second.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 and role match \"%s\"", - i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str()); + logdebug("Setting up layer %s (%d) for surface role match \"%s\"", + i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); } // Add layers to screen (XXX: are they sorted correctly?) @@ -385,20 +384,20 @@ char const *App::api_activate_surface(char const *drawing_name) { // disable layers that are above our current layer for (auto const &l : this->layers.mapping) { - if (l.layer_id <= *layer_id) { + if (l.second.layer_id <= *layer_id) { continue; } bool flush = false; - if (l.state.main != -1) { - this->deactivate(l.state.main); - l.state.main = -1; + if (l.second.state.main != -1) { + this->deactivate(l.second.state.main); + l.second.state.main = -1; flush = true; } - if (l.state.sub != -1) { - this->deactivate(l.state.sub); - l.state.sub = -1; + if (l.second.state.sub != -1) { + this->deactivate(l.second.state.sub); + l.second.state.sub = -1; flush = true; } diff --git a/src/layers.cpp b/src/layers.cpp index a0665b7..5b28c15 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -26,12 +26,6 @@ namespace wm { using json = nlohmann::json; layer::layer(nlohmann::json const &j) { - if (j["type"] == "range") { - this->id_min = j["first_surface_id"]; - this->id_max = j["last_surface_id"]; - } else { - this->id_min = this->id_max = j["surface_id"]; - } this->role = j["role"]; this->name = j["name"]; this->layer_id = j["layer_id"]; @@ -73,27 +67,31 @@ struct result to_layer_map(nlohmann::json const &j) { std::transform(std::cbegin(m), std::cend(m), std::inserter(stl.mapping, stl.mapping.end()), - [](nlohmann::json const &j) { return layer(j); }); + [](nlohmann::json const &j) { + return std::pair( + j.value("layer_id", -1), layer(j)); + }); // XXX: add sanity checks here? // * check for double IDs // * check for double names/roles stl.layers.reserve(m.size()); - std::transform( - std::cbegin(stl.mapping), std::cend(stl.mapping), - std::back_inserter(stl.layers), [&stl](struct layer const &k) { - stl.roles.emplace_back(std::make_pair(k.role, k.layer_id)); - return unsigned(k.layer_id); - }); + std::transform(std::cbegin(stl.mapping), std::cend(stl.mapping), + std::back_inserter(stl.layers), + [&stl](std::pair const &k) { + stl.roles.emplace_back( + std::make_pair(k.second.role, k.second.layer_id)); + return unsigned(k.second.layer_id); + }); std::sort(stl.layers.begin(), stl.layers.end()); for (auto i : stl.mapping) { - if (i.name.empty()) { + if (i.second.name.empty()) { return Err("Found mapping w/o name"); } - if (i.layer_id == -1 || i.id_min == -1 || i.id_max == -1) { + if (i.second.layer_id == -1) { return Err("Found invalid/unset IDs in mapping"); } } @@ -101,30 +99,7 @@ struct result to_layer_map(nlohmann::json const &j) { auto msi = j.find("main_surface"); if (msi != j.end()) { stl.main_surface_name = msi->value("surface_role", ""); - stl.main_surface = - stl.main_surface_name.empty() ? int((*msi)["surface_id"]) : -1; - } - - // Check lookup - auto jtests = j.value("tests", json()); - - if (!jtests.empty()) { - logdebug("Embedded tests..."); - std::vector> tests; - tests.reserve(jtests.size()); - std::transform(std::cbegin(jtests), std::cend(jtests), - std::back_inserter(tests), [](json const &j) { - return std::make_pair(j["surface_id"], - j["expect_layer_id"]); - }); - - for (auto sid : tests) { - int lid = stl.get_layer_id(sid.first).value_or(-1); - logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second); - if (lid != sid.second) { - return Err("ID Map embedded test failed!"); - } - } + stl.main_surface = -1; } return Ok(stl); @@ -133,40 +108,12 @@ struct result to_layer_map(nlohmann::json const &j) { } } -// Helper to allow std::lower_bound with a int key only -inline bool - operator<(struct layer const &a, int b) { - return a.id_max < b; -} - -namespace { -optional get_surface_id_to_layer(struct layer_map const *s2l, - int surface_id) { - auto i = std::lower_bound(std::cbegin(s2l->mapping), std::cend(s2l->mapping), - surface_id); - - if (i != s2l->mapping.end()) { - // std::less only checks for layer::id_max, so check - // that we are actually inside of an interval here. - if (i->id_min <= surface_id) { - return optional(*i); - } - } - - return nullopt; -} -} // namespace - optional layer_map::get_layer_id(int surface_id) { - auto e = get_surface_id_to_layer(this, surface_id); - if (!e) { - auto i = this->surfaces.find(surface_id); - if (i != this->surfaces.end()) { - return optional(int(i->second)); - } - return nullopt; + auto i = this->surfaces.find(surface_id); + if (i != this->surfaces.end()) { + return optional(i->second); } - return optional(e->layer_id); + return nullopt; } optional layer_map::get_layer_id(std::string const &role) { @@ -181,11 +128,6 @@ optional layer_map::get_layer_id(std::string const &role) { return nullopt; } -optional layer_map::get_layer_rect(int surface_id) { - auto e = get_surface_id_to_layer(this, surface_id); - return e ? optional(e->rect) : nullopt; -} - json layer::to_json() const { auto is_full = this->rect == genivi::full_rect; @@ -202,7 +144,6 @@ json layer::to_json() const { } return { - {"id_min", this->id_min}, {"id_max", this->id_max}, {"name", this->name}, {"role", this->role}, {"layer_id", this->layer_id}, {"area", r}, }; @@ -211,7 +152,7 @@ json layer::to_json() const { json layer_map::to_json() const { json j{}; for (auto const &i : this->mapping) { - j.push_back(i.to_json()); + j.push_back(i.second.to_json()); } return j; } diff --git a/src/layers.hpp b/src/layers.hpp index b20d356..5d085a0 100644 --- a/src/layers.hpp +++ b/src/layers.hpp @@ -39,9 +39,6 @@ struct split_layout { struct layer { using json = nlohmann::json; - // Min and max surface ID mapped to this layer - int id_min = -1; - int id_max = -1; // A more or less descriptive name? std::string name = ""; // The actual layer ID @@ -63,17 +60,13 @@ struct layer { explicit layer(nlohmann::json const &j); - bool operator<(struct layer const &rhs) const { - return this->id_max < rhs.id_max; - } - json to_json() const; }; struct layer_map { using json = nlohmann::json; - using storage_type = std::set; + using storage_type = std::map; using layers_type = std::vector; using role_to_layer_map = std::vector>; using addsurf_layer_map = std::map; @@ -93,19 +86,17 @@ struct layer_map { optional get_layer_id(std::string const &role); optional get_layout_state(int surface_id) { int layer_id = *this->get_layer_id(surface_id); - auto i = std::find_if( - std::begin(this->mapping), std::end(this->mapping), - [layer_id](struct layer const &l) { return layer_id == l.layer_id; }); - return i == this->mapping.end() ? nullopt : optional(&i->state); + auto i = this->mapping.find(layer_id); + return i == this->mapping.end() + ? nullopt + : optional(&i->second.state); } optional get_layer(int layer_id) { - auto i = std::find_if( - std::cbegin(this->mapping), std::cend(this->mapping), - [layer_id](struct layer const &l) { return layer_id == l.layer_id; }); - return i == this->mapping.end() ? nullopt : optional(*i); + auto i = this->mapping.find(layer_id); + return i == this->mapping.end() ? nullopt + : optional(i->second); } - optional get_layer_rect(int surface_id); layers_type::size_type get_layers_count() const { return this->layers.size(); }