X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.hpp;h=adfd7338027ffa7b93d4bbb5c88692db9f878d77;hb=7ee936736ec753346d8a1811a3c9c014d4be8b41;hp=43b10714106d252d4c0bd88e5490ae7783468197;hpb=a94f6c67c67a68df8a894699686f2eaa8e870208;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/layers.hpp b/src/layers.hpp
index 43b1071..adfd733 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -17,97 +17,111 @@
 #ifndef TMCAGLWM_LAYERS_H
 #define TMCAGLWM_LAYERS_H
 
-#include <json.hpp>
-
-#include <regex>
-#include <set>
 #include <string>
 
+#include "../include/json.hpp"
 #include "layout.hpp"
 #include "result.hpp"
 #include "wayland_ivi_wm.hpp"
 
-namespace wm {
+namespace wm
+{
 
-struct split_layout {
-   std::string name;
-   std::string main_match;
-   std::string sub_match;
+struct split_layout
+{
+    std::string name;
+    std::string main_match;
+    std::string sub_match;
 };
 
-struct layer {
-   using json = nlohmann::json;
-
-   // 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.
-   compositor::rect rect;
-   // Specify a role prefix for surfaces that should be
-   // put on this layer.
-   std::string role;
-   // TODO: perhaps a zorder is needed here?
-   std::vector<struct split_layout> layouts;
-
-   mutable struct LayoutState state;
-
-  // Flag of normal layout only
-   bool is_normal_layout_only;
-
-   explicit layer(nlohmann::json const &j);
-
-   json to_json() const;
+struct layer
+{
+    using json = nlohmann::json;
+
+    // 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.
+    compositor::rect rect;
+    // Specify a role prefix for surfaces that should be
+    // put on this layer.
+    std::string role;
+    // TODO: perhaps a zorder is needed here?
+    std::vector<struct split_layout> layouts;
+
+    mutable struct LayoutState state;
+
+    // Flag of normal layout only
+    bool is_normal_layout_only;
+
+    explicit layer(nlohmann::json const &j);
+
+    json to_json() const;
 };
 
-struct layer_map {
-   using json = nlohmann::json;
-
-   using storage_type = std::map<int, 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>;
-
-   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 = this->mapping.find(layer_id);
-      return i == this->mapping.end()
-                ? nullopt
-                : optional<struct LayoutState *>(&i->second.state);
-   }
-   optional<struct layer> get_layer(int layer_id) {
-      auto i = this->mapping.find(layer_id);
-      return i == this->mapping.end() ? nullopt
-                                      : optional<struct layer>(i->second);
-   }
-
-   layers_type::size_type get_layers_count() const {
-      return this->layers.size();
-   }
-
-   void add_surface(int surface_id, int layer_id) {
-      this->surfaces[surface_id] = layer_id;
-   }
-
-   void remove_surface(int surface_id) {
-      this->surfaces.erase(surface_id);
-   }
-
-   json to_json() const;
+struct layer_map
+{
+    using json = nlohmann::json;
+
+    using storage_type = std::map<int, 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>;
+
+    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 = this->mapping.find(layer_id);
+        return i == this->mapping.end()
+                   ? nullopt
+                   : optional<struct LayoutState *>(&i->second.state);
+    }
+    optional<struct layer> get_layer(int layer_id)
+    {
+        auto i = this->mapping.find(layer_id);
+        return i == this->mapping.end() ? nullopt
+                                        : optional<struct layer>(i->second);
+    }
+
+    layers_type::size_type get_layers_count() const
+    {
+        return this->layers.size();
+    }
+
+    void add_surface(int surface_id, int layer_id)
+    {
+        this->surfaces[surface_id] = layer_id;
+    }
+
+    void remove_surface(int surface_id)
+    {
+        this->surfaces.erase(surface_id);
+    }
+
+    json to_json() const;
+    compositor::rect getAreaSize(const std::string &area);
+    const compositor::rect getScaleDestRect(int output_w, int output_h, const std::string &aspect_setting);
+    int loadAreaDb();
+
+  private:
+    std::unordered_map<std::string, compositor::rect> area2size;
+
+    static const char *kDefaultAreaDb;
 };
 
 struct result<struct layer_map> to_layer_map(nlohmann::json const &j);
@@ -155,6 +169,6 @@ static const nlohmann::json default_layers_json = {
       }
    }}
 };
-}  // namespace wm
+} // namespace wm
 
-#endif  // TMCAGLWM_LAYERS_H
+#endif // TMCAGLWM_LAYERS_H