X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.hpp;h=525a8b1d5cdde214e8af5dc43918938ee2a5dbe2;hb=2b84aa5d33611d0f2f7b8c4395dc352ebf60ea29;hp=4291425b61590d1c0211b10756215f7740adc255;hpb=6d5be0fb38f93a758127491f6c81de829554bf1d;p=staging%2Fwindowmanager.git diff --git a/src/layers.hpp b/src/layers.hpp index 4291425..525a8b1 100644 --- a/src/layers.hpp +++ b/src/layers.hpp @@ -1,6 +1,18 @@ -// -// Created by m on 7/27/17. -// +/* + * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef TMCAGLWM_LAYERS_H #define TMCAGLWM_LAYERS_H @@ -14,38 +26,56 @@ 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 surface_to_layer_map_type; +struct layer_map { + using json = nlohmann::json; + + typedef std::set storage_type; typedef std::vector layers_type; - surface_to_layer_map_type mapping; + storage_type mapping; layers_type layers; + int main_surface; - optional get_layer_for_surface(int surface_id); - optional get_rect_for_surface(int surface_id); + optional get_layer_id(int surface_id); + optional get_layer_rect(int surface_id); layers_type::size_type get_layers_count() const { return this->layers.size(); } + + json to_json() const; }; -struct result to_surface_id_to_layer_map( - nlohmann::json const &j); +struct result to_layer_map(nlohmann::json const &j); } // namespace wm