layers: add layer and layer_map to_json() helper

[staging/windowmanager.git] / src / layers.hpp

diff --git a/src/layers.hpp b/src/layers.hpp
index aed39c8..a775f7a 100644 (file)
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -10,39 +10,59 @@
 #include <string>
 
 #include "result.hpp"
+#include "wayland.hpp"
 
 namespace wm {
 
-struct surface_id_to_layer {
+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
    int layer_id = -1;
+   // The rectangular region surfaces are allowed to draw on
+   // this layer, note however, width and hieght of the rect
+   // can be negative, in which case they specify that
+   // the actual value is computed using MAX + 1 - w
+   // That is; allow us to specify dimensions dependent on
+   // e.g. screen dimension, w/o knowing the actual screen size.
+   genivi::rect rect;
+   // XXX perhaps a zorder is needed here?
 
-   explicit surface_id_to_layer(nlohmann::json const &j);
+   explicit layer(nlohmann::json const &j);
 
-   bool operator<(struct surface_id_to_layer const &rhs) const {
+   bool operator<(struct layer const &rhs) const {
       return this->id_max < rhs.id_max;
    }
+
+   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 surface_id_to_layer_map {
-   typedef std::set<struct surface_id_to_layer> surface_to_layer_map_type;
+struct layer_map {
+   using json = nlohmann::json;
+
+   typedef std::set<struct layer> storage_type;
    typedef std::vector<unsigned int> layers_type;
 
-   surface_to_layer_map_type mapping;
+   storage_type mapping;
    layers_type layers;
 
-   optional<int> get_layer_for_surface(int surface_id);
+   optional<int> get_layer_id(int surface_id);
+   optional<genivi::rect> get_layer_rect(int surface_id);
    layers_type::size_type get_layers_count() const {
       return this->layers.size();
    }
+
+   json to_json() const;
 };
 
-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);
 
 }  // namespace wm