Improve window manager

* Make sure there is no difference
  from the main line's line as much as possible
* Fix timing issue of launcher and homescreen

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

1 files changed, 8 insertions, 14 deletions

diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp
index a6a359e..70826d4 100644
--- a/src/wm_layer.hpp
+++ b/src/wm_layer.hpp
@@ -40,7 +40,7 @@ class LayerState
     const std::vector<unsigned> getIviIdList();
     void addLayer(unsigned layer);
     void removeLayer(unsigned layer);
-    void setArea(const std::string& app, const std::string& area);
+    void attachAppToArea(const std::string& app, const std::string& area);
 
     // Debug
     void dump();
@@ -53,22 +53,15 @@ class LayerState
 class WMLayer
 {
   public:
-    enum MANAGEMENT_TYPE
-    {
-        TILE,
-        STACK
-    };
-
-    explicit WMLayer(json_object* j, unsigned uuid);
+    explicit WMLayer(json_object* j, unsigned wm_layer_id);
     ~WMLayer() = default;
 
     // Status & Setting API
     unsigned getNewLayerID(const std::string& role);
     unsigned idBegin() { return this->id_begin; }
     unsigned idEnd()   { return this->id_end; }
-    unsigned getUuid() { return this->uuid; }
+    unsigned getWMLayerID() { return this->wm_layer_id; }
     const std::string& layerName();
-    MANAGEMENT_TYPE    layerType() { return this->type; }
     void appendArea(const std::string& area);
     LayerState& getLayerState() { return tmp_state; }
     WMError setLayerState(const LayerState& l);
@@ -78,20 +71,21 @@ class WMLayer
     // Manipulation
     void addLayerToState(unsigned layer);
     void removeLayerFromState(unsigned layer);
-    void setAreaToState(const std::string& app, const std::string& area);
-    void terminateApp(unsigned layer);
+    void attachAppToArea(const std::string& app, const std::string& area);
     void update();
     void undo();
 
+    // Event
+    void appTerminated(unsigned layer);
+
     // Debug
     void dump();
 
   private:
     LayerState tmp_state;
     LayerState state;
-    unsigned uuid;
+    unsigned wm_layer_id;
     std::string name = ""; // Layer name
-    MANAGEMENT_TYPE type;
     std::string role_list;
     std::vector<std::string> area_list;
     std::vector<unsigned>    id_list;