From 6819f403a6b8a1ab5e8cdffd9fd1460d49045059 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 17 Oct 2018 17:42:42 +0900 Subject: Refactor : Hide wayland operations from Window Manager Window Manager now uses abstract client, area for layer/surface management, then hide wayland operation into LayerControl class. LayerControl class uses ilmControl library instead of wayland protocol. This patch reduces the binary size of binding by 30% than before. Currently, the following debug methods are not available. * debug_status * debug_layers * debug_surfaces * list_drawing_names Bug-AGL: SPEC-1817 Change-Id: I7313787f3c4a286ceee3c23783e5c0e713388dac Signed-off-by: Kazumasa Mitsunari --- src/wm_layer_control.hpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/wm_layer_control.hpp (limited to 'src/wm_layer_control.hpp') diff --git a/src/wm_layer_control.hpp b/src/wm_layer_control.hpp new file mode 100644 index 0000000..5244bf5 --- /dev/null +++ b/src/wm_layer_control.hpp @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include "wm_error.hpp" +#include "util.hpp" + +namespace wm { + +class Screen { + public: + Screen(unsigned w, unsigned h) : _width(w), _height(h){} + unsigned width() { return _width; } + unsigned height() { return _height; } + private: + unsigned _width; + unsigned _height; + unsigned _pysical_width = 0; + unsigned _pysical_height = 0; +}; + +class LayerControlCallbacks { + public: + LayerControlCallbacks() {}; + ~LayerControlCallbacks() = default; + LayerControlCallbacks(const LayerControlCallbacks &obj) = default; + + // callback functions + std::function surfaceCreated; + std::function surfaceDestroyed; + /* + std::function layerCreated; + std::function layerDestroyed; + */ +}; + +class WMLayer; +class LayerState; +class WMAction; +class WMClient; + +class LayerControl +{ + public: + explicit LayerControl(const std::string& root); + ~LayerControl() = default; + WMError init(const LayerControlCallbacks& cb); + void createLayers(); + unsigned getLayerID(const std::string& role); + std::shared_ptr getWMLayer(unsigned layer); + std::shared_ptr getWMLayer(std::string layer_name); + struct rect getAreaSize(const std::string& area); + void setupArea(const rectangle& base_rct, double scaling); + Screen getScreenInfo(); + double scale(); + WMError renderLayers(); + WMError setXDGSurfaceOriginSize(unsigned surface); + WMError layoutChange(const WMAction& action); + WMError visibilityChange(const WMAction &action); + void addSurface(unsigned surface, unsigned layer); + + // Don't use this function. + void dispatchCreateEvent(ilmObjectType object, unsigned id, bool created); + void dispatchSurfacePropChangeEvent(unsigned id, struct ilmSurfaceProperties*, t_ilm_notification_mask); + void dispatchLayerPropChangeEvent(unsigned id, struct ilmLayerProperties*, t_ilm_notification_mask); + + private: + WMError makeVisible(const std::shared_ptr client, const std::string& role); + WMError makeInvisible(const std::shared_ptr client, const std::string& role); + bool moveForeGround(const std::shared_ptr client, const std::string& role); + bool moveBackGround(const std::shared_ptr client, const std::string& role); + WMError loadLayerSetting(const std::string& path); + WMError loadAreaDb(const std::string& path); + + std::vector surface_bg; // For CES demo + std::vector> wm_layers; + std::unordered_map lid2wmlid; + std::unordered_map area2size; + unsigned screenID; + struct ilmScreenProperties screen_prop; + double scaling; + int offset_x; + int offset_y; + LayerControlCallbacks cb; +}; + +} // namespace wm \ No newline at end of file -- cgit 1.2.3-korg