X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.hpp;h=b20d356dcb472fa583060067bc6da8e310705df6;hb=7fcdd57d4d9dbff582e834dbbcf3bbe6d724c1d5;hp=924457f5de8057d4b857910385f453f69a2e1040;hpb=2089b5b1ba2f04f037be1ef897bf79790bf501e2;p=staging%2Fwindowmanager.git diff --git a/src/layers.hpp b/src/layers.hpp index 924457f..b20d356 100644 --- a/src/layers.hpp +++ b/src/layers.hpp @@ -18,9 +18,12 @@ #define TMCAGLWM_LAYERS_H #include + +#include #include #include +#include "layout.hpp" #include "result.hpp" #include "wayland.hpp" @@ -30,7 +33,7 @@ struct split_layout { std::string name; std::string main_match; std::string sub_match; - int prio; + int prio; // no entirely sure we will use this }; struct layer { @@ -55,6 +58,8 @@ struct layer { std::string role; // XXX perhaps a zorder is needed here? std::vector layouts; + // XXX need to change the way we store these things... + mutable struct LayoutState state; explicit layer(nlohmann::json const &j); @@ -69,9 +74,9 @@ struct layer_map { using json = nlohmann::json; using storage_type = std::set; - using layers_type = std::vector; + using layers_type = std::vector; using role_to_layer_map = std::vector>; - using addsurf_layer_map = std::map; + using addsurf_layer_map = std::map; // XXX: we also will need a layer_id to layer map, perhaps // make this the primary map, and the surface_id->layer a @@ -86,6 +91,13 @@ struct layer_map { optional get_layer_id(int surface_id); optional get_layer_id(std::string const &role); + optional 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(&i->state); + } optional get_layer(int layer_id) { auto i = std::find_if( std::cbegin(this->mapping), std::cend(this->mapping), @@ -98,10 +110,14 @@ struct layer_map { return this->layers.size(); } - void add_surface(unsigned surface_id, unsigned layer_id) { + 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; };