From e2a1895b1553c067927a250e83132e836fc1836a Mon Sep 17 00:00:00 2001
From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Wed, 8 Aug 2018 16:15:46 +0900
Subject: Proposal: New layer settings

Change-Id: I860f8dea4eee340fd8ab3dba3bbaee1661c584bf
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---
 src/wm_client.cpp | 15 +++++++++++++++
 src/wm_client.hpp | 13 +++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wm_client.cpp b/src/wm_client.cpp
index 09e2e00..79922fa 100644
--- a/src/wm_client.cpp
+++ b/src/wm_client.cpp
@@ -106,6 +106,21 @@ unsigned WMClient::layerID() const
     return this->layer;
 }
 
+unsigned WMClient::surfaceID() const
+{
+    return this->surface;
+}
+
+const string& WMClient::getWMLayerName()
+{
+    return this->wm_layer_name;
+}
+
+void WMClient::setRole(const string& role)
+{
+    this->role_list.push_back(role);
+}
+
 /**
  * Set layerID the client belongs to
  *
diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 259d504..0268807 100644
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -47,7 +47,11 @@ class WMClient
     std::string appID() const;
     unsigned surfaceID(const std::string &role) const;
     unsigned layerID() const;
-    std::string role(unsigned surface) const;
+    const std::string& getWMLayerName();
+    unsigned surfaceID() const;
+    std::vector<unsigned> renderOrder() const;
+    const std::vector<std::string> &roles() const;
+    void setRole(const std::string& role);
     void registerLayer(unsigned layer);
     bool addSurface(const std::string& role, unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
@@ -63,7 +67,12 @@ class WMClient
   private:
     std::string id;
     unsigned layer;
-    std::unordered_map<std::string, unsigned> role2surface;
+    std::string wm_layer_name;
+    std::string area;
+    unsigned surface; // currently, main application has only one surface.
+    std::vector<std::string> role_list;
+    std::vector<unsigned> surface_render_order;
+    std::unordered_map<std::string, unsigned> service2surfaces;
 #if GTEST_ENABLED
     // This is for unit test. afb_make_event occurs sig11 if call not in afb-binding
     std::unordered_map<std::string, std::string> event2list;
-- 
cgit 1.2.3-korg