diff options
author | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-01 16:16:29 +0200 |
---|---|---|
committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-08 17:24:00 +0200 |
commit | d2fe9e8e49a0970986282162b04d335c57845ac3 (patch) | |
tree | 55fbf9db3addd08d3d00faef77280b913c5891c9 /src/layers.cpp | |
parent | 89fd5de8311dace5c8c1ba3fb64115f1955687d4 (diff) |
layers: rename surface_id_to_layer and surface_id_to_layer_map
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r-- | src/layers.cpp | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/layers.cpp b/src/layers.cpp index 7cc2f00..1e44a1b 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -12,7 +12,7 @@ namespace wm { using json = nlohmann::json; -surface_id_to_layer::surface_id_to_layer(nlohmann::json const &j) { +layer::layer(nlohmann::json const &j) { DB(j); if (j["type"] == "range") { this->id_min = get<int>(j["first_surface_id"]); @@ -32,29 +32,26 @@ surface_id_to_layer::surface_id_to_layer(nlohmann::json const &j) { } } -struct result<struct surface_id_to_layer_map> to_surface_id_to_layer_map( - nlohmann::json const &j) { +struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { DB(j); try { - surface_id_to_layer_map stl{}; + layer_map stl{}; auto m = j["mappings"]; stl.layers.reserve(m.size()); std::transform(std::cbegin(m), std::cend(m), std::inserter(stl.mapping, stl.mapping.end()), [&stl](nlohmann::json const &j) { - auto k = surface_id_to_layer(j); + auto k = layer(j); stl.layers.push_back(unsigned(k.layer_id)); return k; }); // XXX need to sort layers? for (auto i : stl.mapping) { if (i.name.empty()) { - return Err<struct surface_id_to_layer_map>( - "Found mapping w/o name"); + return Err<struct layer_map>("Found mapping w/o name"); } if (i.layer_id == -1 || i.id_min == -1 || i.id_max == -1) { - return Err<struct surface_id_to_layer_map>( - "Found invalid/unset IDs in mapping"); + return Err<struct layer_map>("Found invalid/unset IDs in mapping"); } } @@ -73,39 +70,38 @@ struct result<struct surface_id_to_layer_map> to_surface_id_to_layer_map( }); for (auto sid : tests) { - int lid = stl.get_layer_for_surface(sid.first).value_or(-1); + int lid = stl.get_layer_id(sid.first).value_or(-1); DB("this=" << sid.first << ", that=" << lid << ", expect=" << sid.second); if (lid != sid.second) { - return Err<surface_id_to_layer_map>( - "ID Map embedded test failed!"); + return Err<layer_map>("ID Map embedded test failed!"); } } } return Ok(stl); } catch (std::exception &e) { - return Err<struct surface_id_to_layer_map>(e.what()); + return Err<struct layer_map>(e.what()); } } // Helper to allow std::lower_bound with a int key only inline bool - operator<(struct surface_id_to_layer const &a, int b) { + operator<(struct layer const &a, int b) { return a.id_max < b; } namespace { -optional<surface_id_to_layer> get_surface_id_to_layer( - struct surface_id_to_layer_map const *s2l, int surface_id) { +optional<layer> 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 surface_id_to_layer::id_max, so check + // 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<surface_id_to_layer>(*i); + return optional<layer>(*i); } } @@ -113,13 +109,12 @@ optional<surface_id_to_layer> get_surface_id_to_layer( } } -optional<int> surface_id_to_layer_map::get_layer_for_surface(int surface_id) { +optional<int> layer_map::get_layer_id(int surface_id) { auto e = get_surface_id_to_layer(this, surface_id); return e ? optional<int>(e->layer_id) : nullopt; } -optional<genivi::rect> surface_id_to_layer_map::get_rect_for_surface( - int surface_id) { +optional<genivi::rect> layer_map::get_layer_rect(int surface_id) { auto e = get_surface_id_to_layer(this, surface_id); return e ? optional<genivi::rect>(e->rect) : nullopt; } |