#ifndef TMCAGLWM_LAYERS_H
#define TMCAGLWM_LAYERS_H
-#include <algorithm>
-#include <experimental/optional>
#include <json.hpp>
#include <set>
#include <string>
+#include "wayland.hpp"
#include "result.hpp"
namespace wm {
int id_max = -1;
std::string name = "";
int layer_id = -1;
+ genivi::rect rect;
explicit surface_id_to_layer(nlohmann::json const &j);
}
};
-inline bool operator<(struct surface_id_to_layer const &a, int b) {
- return a.id_max < b;
-}
-
+// 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> map_type;
-
- map_type mapping;
-
- 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);
+ typedef std::set<struct surface_id_to_layer> surface_to_layer_map_type;
+ typedef std::vector<unsigned int> layers_type;
- if (i != this->mapping.end()) {
- if (i->id_min <= surface_id) {
- return std::experimental::optional<int>(i->layer_id);
- }
- }
+ surface_to_layer_map_type mapping;
+ layers_type layers;
- return std::experimental::nullopt;
+ optional<int> get_layer_for_surface(int surface_id);
+ optional<genivi::rect> get_rect_for_surface(int surface_id);
+ layers_type::size_type get_layers_count() const {
+ return this->layers.size();
}
};