Start to rework using ilmControl

Change-Id: Icfffea4c0587828f4dd863e9000e8aadb135c048
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 14 insertions, 3 deletions

diff --git a/src/wm_layer_control.hpp b/src/wm_layer_control.hpp
index bb0aee1..18f7359 100644
--- a/src/wm_layer_control.hpp
+++ b/src/wm_layer_control.hpp
@@ -17,17 +17,23 @@
 #include <string>

 #include <memory>

 #include <vector>

-

+#include <ilm/ilm_control.h>

 #include "wm_error.hpp"

+#include "util.hpp"

 

 namespace wm {

 

+class Screen : public rectangle {

+

+};

+

 class WMLayer;

 class LayerControl

 {

   public:

-    explicit LayerControl(const std::string& path);

-    ~LayerControl();

+    explicit LayerControl(const std::string& root);

+    ~LayerControl() = default;

+    WMError init();

     unsigned getNewLayerID(const std::string& role);

     // void setRenderOrder(const std::vector<unsigned> layer_render_order);

     // std::vector<unsigned> getAllRenderOrder();

@@ -36,9 +42,14 @@ class LayerControl
     WMError updateLayer(WMLayer& wm_layer);

     void commitChange();

     void undoUpdate();

+

+    // Don't use this function.

+    void dispatchILMEvent(ilmObjectType object, t_ilm_uint id, t_ilm_bool created);

   private:

     WMError load(const std::string& path);

     std::vector<std::shared_ptr<WMLayer>> wm_layers;

+    unsigned screenID;

+    struct ilmScreenProperties screen_prop;

 };

 

 } // namespace wm
\ No newline at end of file