- std::experimental::optional<int> get_layer_for_surface(int surface_id) {
- auto i = std::lower_bound(std::cbegin(this->mapping),
- std::cend(this->mapping), surface_id);
+struct layer_map {
+ using json = nlohmann::json;
+
+ using storage_type = std::set<struct layer>;
+ using layers_type = std::vector<uint32_t>;
+ using role_to_layer_map = std::vector<std::pair<std::string, int>>;
+ using addsurf_layer_map = std::map<int, int>;
+
+ // XXX: we also will need a layer_id to layer map, perhaps
+ // make this the primary map, and the surface_id->layer a
+ // secondary map.
+
+ storage_type mapping; // map surface_id to layer
+ layers_type layers; // the actual layer IDs we have
+ int main_surface;
+ std::string main_surface_name;
+ role_to_layer_map roles;
+ addsurf_layer_map surfaces; // additional surfaces on layers
+
+ optional<int> get_layer_id(int surface_id);
+ optional<int> get_layer_id(std::string const &role);
+ optional<struct LayoutState*> 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<struct LayoutState *>(&i->state);
+ }
+ optional<struct layer> 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<struct layer>(*i);
+ }