Implement surface names

* request_surface(name: string) -> id: int.
* activate_surface(name: string).
* names will be mapped to their respective layers by use of the layers'
  surface rola match, a regex.
* the generated IDs are global and not reused.
* allow wp-request to use -p, disable use of pygments even if found.

Things missing:
* surface removal does not remove already established mappings/names.
* Mostly untested.

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

1 files changed, 28 insertions, 4 deletions

diff --git a/src/layers.hpp b/src/layers.hpp
index 525a8b1..ae609fc 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -43,6 +43,9 @@ struct layer {
    // That is; allow us to specify dimensions dependent on
    // e.g. screen dimension, w/o knowing the actual screen size.
    genivi::rect rect;
+   // Specify a role prefix for surfaces that should be
+   // put on this layer.
+   std::string role;
    // XXX perhaps a zorder is needed here?
 
    explicit layer(nlohmann::json const &j);
@@ -54,24 +57,45 @@ struct layer {
    json to_json() const;
 };
 
-// Actually, we shouldn't need a struct here ... but let's just keep it at that
-// for now, to contain its mapping type and the _single_ useful method.
 struct layer_map {
    using json = nlohmann::json;
 
    typedef std::set<struct layer> storage_type;
    typedef std::vector<unsigned int> layers_type;
+   typedef std::vector<std::pair<std::string, int>> role_to_layer_map;
+   typedef std::map<unsigned, unsigned> addsurf_layer_map;
 
-   storage_type mapping;
-   layers_type layers;
+   // 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 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);
+   }
+
    optional<genivi::rect> get_layer_rect(int surface_id);
    layers_type::size_type get_layers_count() const {
       return this->layers.size();
    }
 
+   void add_surface(unsigned surface_id, unsigned layer_id) {
+      this->surfaces[surface_id] = layer_id;
+   }
+
    json to_json() const;
 };