Update wm_layer

* Set Area when layoutChange
* Implement hasRole

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

diff --git a/src/wm_layer.cpp b/src/wm_layer.cpp
index f02a5b6..d74418a 100644 (file)
--- a/src/wm_layer.cpp
+++ b/src/wm_layer.cpp
@@ -41,7 +41,7 @@ void LayerState::attachIdToArea(const string& area, const WMClient& client)
     this->render_order.push_back(client.layerID());
 }
 
     this->render_order.push_back(client.layerID());
 }
 

-const unordered_map<std::string, std::string> LayerState::popCurrentState()
+const unordered_map<string, string> LayerState::popCurrentState()

 {
     unordered_map<string, string> tmp = this->area2appid;
     this->area2appid.clear();
 {
     unordered_map<string, string> tmp = this->area2appid;
     this->area2appid.clear();


@@ -49,7 +49,7 @@ const unordered_map<std::string, std::string> LayerState::popCurrentState()
     return tmp;
 }
 
     return tmp;
 }
 

-const unordered_map<std::string, std::string> LayerState::getCurrentState()
+const unordered_map<string, string> LayerState::getCurrentState()

 {
     return this->area2appid;
 }
 {
     return this->area2appid;
 }


@@ -59,6 +59,27 @@ const vector<unsigned> LayerState::getIviIdList()
     return this->render_order;
 }
 
     return this->render_order;
 }
 

+void LayerState::addLayer(unsigned layer)
+{
+    this->render_order.push_back(layer);
+}
+
+void LayerState::removeLayer(unsigned layer)
+{
+    auto fwd_itr = std::remove_if(
+        this->render_order.begin(), this->render_order.end(),
+        [layer](unsigned elm) {
+            return elm == layer;
+        }
+    );
+    this->render_order.erase(fwd_itr, this->render_order.end());
+}
+
+void LayerState::setArea(const string& app, const string& area)
+{
+    this->area2appid[area] = app;
+}
+

 WMLayer::WMLayer(json_object* j) : before_state(), state()
 {
     this->name = jh::getStringFromJson(j, "name");
 WMLayer::WMLayer(json_object* j) : before_state(), state()
 {
     this->name = jh::getStringFromJson(j, "name");


@@ -84,15 +105,14 @@ WMLayer::WMLayer(json_object* j) : before_state(), state()
 unsigned WMLayer::getNewLayerID(const string& role)
 {
     unsigned ret = 0;
 unsigned WMLayer::getNewLayerID(const string& role)
 {
     unsigned ret = 0;

-    auto re = std::regex(this->role_list);
-    if (std::regex_match(role, re))
+
+    // generate new layer id;
+    if(this->hasRole(role))

     {
     {

-        // generate new layer id;

         ret = this->id_list.back() + 1;
         ret = this->id_list.back() + 1;

-        HMI_DEBUG("role %s matches layer %d, new layerID %d", role.c_str(), this->name.c_str(), ret);
+        HMI_INFO("Generate new id: %d", ret);

     }
     }

-
-    if(ret == 0)
+    else

     {
         return ret;
     }
     {
         return ret;
     }


@@ -150,9 +170,24 @@ void WMLayer::removeLayerID(unsigned id)
     this->id_list.erase(fwd_itr, this->id_list.end());
 }
 
     this->id_list.erase(fwd_itr, this->id_list.end());
 }
 

-bool WMLayer::checkIDBelongTo(unsigned id)
+bool WMLayer::hasLayerID(unsigned id)

 {
 {

-    return (id > this->idBegin() && id < this->idEnd());
+    bool ret = (id > this->idBegin() && id < this->idEnd());
+    if(!ret)
+        return ret;
+    auto itr = std::find(this->id_list.begin(), this->id_list.end(), id);
+    return (itr != this->id_list.end()) ? true : false;
+}
+
+bool WMLayer::hasRole(const string& role)
+{
+    auto re = std::regex(this->role_list);
+    if (std::regex_match(role, re))
+    {
+        HMI_DEBUG("role %s matches layer %d", role.c_str(), this->name.c_str());
+        return true;
+    }
+    return false;

 }
 
 /* WMError WMLayer::commitChange()
 }
 
 /* WMError WMLayer::commitChange()

diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp
index 3362ba7..2a5f9bd 100644 (file)
--- a/src/wm_layer.hpp
+++ b/src/wm_layer.hpp
@@ -38,6 +38,9 @@ class LayerState
     const std::unordered_map<std::string, std::string> popCurrentState();
     const std::unordered_map<std::string, std::string> getCurrentState();
     const std::vector<unsigned> getIviIdList();
     const std::unordered_map<std::string, std::string> popCurrentState();
     const std::unordered_map<std::string, std::string> getCurrentState();
     const std::vector<unsigned> getIviIdList();

+    void addLayer(unsigned layer);
+    void removeLayer(unsigned layer);
+    void setArea(const std::string& app, const std::string& area);

 
   private:
     std::vector<unsigned> render_order;
 
   private:
     std::vector<unsigned> render_order;


@@ -62,9 +65,10 @@ class WMLayer
     MANAGEMENT_TYPE    layerType() { return this->type; }
     void appendArea(const std::string& area);
     void removeLayerID(unsigned id);
     MANAGEMENT_TYPE    layerType() { return this->type; }
     void appendArea(const std::string& area);
     void removeLayerID(unsigned id);

-    LayerState getLayerState() const { return before_state; }
-    WMError    setLayerState(const LayerState& l);
-    bool checkIDBelongTo(unsigned id);
+    LayerState& getLayerState() { return before_state; }
+    WMError setLayerState(const LayerState& l);
+    bool hasLayerID(unsigned id);
+    bool hasRole(const std::string& role);

   private:
     LayerState before_state;
     LayerState state;
   private:
     LayerState before_state;
     LayerState state;

diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index 9ac1ffc..86616e8 100644 (file)
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -1,586 +1,601 @@
-/*\r
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-#include <assert.h>\r
-#include <unistd.h>\r
-#include "wm_layer_control.hpp"\r
-#include "wm_layer.hpp"\r
-#include "wm_client.hpp"\r
-#include "request.hpp"\r
-#include "json_helper.hpp"\r
-\r
-#define LC_AREA_PATH "/etc/areas.db"\r
-#define LC_LAYER_SETTING_PATH "/etc/layer_setting.json"\r
-#define LC_DEFAULT_AREA "normal.full"\r
-\r
-using std::string;\r
-using std::vector;\r
-using std::shared_ptr;\r
-\r
-namespace wm {\r
-\r
-LayerControl* g_lc_ctxt;\r
-\r
-static void createCallback_static(ilmObjectType object,\r
-                            t_ilm_uint id,\r
-                            t_ilm_bool created,\r
-                            void* data)\r
-{\r
-    static_cast<LayerControl*>(data)->dispatchCreateEvent(object, id, created);\r
-}\r
-\r
-static void surfaceCallback_static(t_ilm_surface surface,\r
-            struct ilmSurfaceProperties* surface_prop,\r
-            t_ilm_notification_mask mask)\r
-{\r
-    g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask);\r
-}\r
-\r
-static void layerCallback_static(t_ilm_layer layer,\r
-            struct ilmLayerProperties* layer_prop,\r
-            t_ilm_notification_mask mask)\r
-{\r
-    g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask);\r
-}\r
-\r
-LayerControl::LayerControl(const std::string& root)\r
-{\r
-    string area_path = root + LC_AREA_PATH;\r
-    string layer_path= root + LC_LAYER_SETTING_PATH;\r
-    // load layers.setting.json\r
-    WMError ret = this->loadLayerSetting(layer_path);\r
-    assert(ret == WMError::SUCCESS);\r
-    // load area.db\r
-    ret = this->loadAreaDb(area_path);\r
-    assert(ret == WMError::SUCCESS);\r
-}\r
-\r
-WMError LayerControl::init(const LayerControlCallbacks& cb)\r
-{\r
-    ilmErrorTypes rc = ilm_init();\r
-    t_ilm_uint num = 0;\r
-    t_ilm_uint *ids;\r
-    int cnt = 0;\r
-\r
-    while (rc != ILM_SUCCESS)\r
-    {\r
-        cnt++;\r
-        if (20 <= cnt)\r
-        {\r
-            HMI_ERROR("Could not connect to compositor");\r
-            goto lc_init_error;\r
-        }\r
-        HMI_ERROR("Wait to start weston ...");\r
-        sleep(1);\r
-        ilm_init();\r
-    }\r
-    if(rc != ILM_SUCCESS) goto lc_init_error;\r
-\r
-    // Get current screen setting\r
-    rc = ilm_getScreenIDs(&num, &ids);\r
-\r
-    if(rc != ILM_SUCCESS) goto lc_init_error;\r
-\r
-    for(unsigned i = 0; i < num; i++)\r
-    {\r
-        HMI_INFO("get screen: %d", ids[i]);\r
-    }\r
-    // Currently, 0 is only available\r
-    this->screenID = ids[0];\r
-\r
-    rc = ilm_getPropertiesOfScreen(this->screenID, &this->screen_prop);\r
-\r
-    if(rc != ILM_SUCCESS) goto lc_init_error;\r
-\r
-    // Register Callback from ILM\r
-    this->cb = cb;\r
-    ilm_registerNotification(createCallback_static, this);\r
-\r
-    return WMError::SUCCESS;\r
-\r
-lc_init_error:\r
-    HMI_ERROR("Failed to initialize. Terminate WM");\r
-\r
-    return WMError::FAIL;\r
-}\r
-\r
-void LayerControl::createNewLayer(unsigned id)\r
-{\r
-    HMI_INFO("create new ID :%d", id);\r
-    struct rect rct = this->area2size[LC_DEFAULT_AREA];\r
-    ilm_layerCreateWithDimension(&id, rct.w, rct.h);\r
-    ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h);\r
-    ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h);\r
-    ilm_layerSetOpacity(id, 1.0);\r
-    ilm_layerSetVisibility(id, ILM_TRUE);\r
-    ilm_commitChanges();\r
-}\r
-\r
-unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)\r
-{\r
-    unsigned ret = 0;\r
-    for(const auto& l: this->wm_layers)\r
-    {\r
-        ret = l->getNewLayerID(role);\r
-        if(ret != 0)\r
-        {\r
-            *layer_name = l->layerName();\r
-            break;\r
-        }\r
-    }\r
-    return ret;\r
-}\r
-\r
-struct rect LayerControl::getAreaSize(const std::string& area)\r
-{\r
-    return area2size[area];\r
-}\r
-\r
-void LayerControl::setupArea(double scaling)\r
-{\r
-    struct rect rct;\r
-    this->scaling = scaling;\r
-\r
-    rct = this->area2size["normal.full"];\r
-    this->area2size["normalfull"] = rct;\r
-    this->area2size["normal"] = rct;\r
-\r
-    for (auto &i : this->area2size)\r
-    {\r
-        i.second.x = static_cast<int>(scaling * i.second.x + 0.5);\r
-        i.second.y = static_cast<int>(scaling * i.second.y + 0.5);\r
-        i.second.w = static_cast<int>(scaling * i.second.w + 0.5);\r
-        i.second.h = static_cast<int>(scaling * i.second.h + 0.5);\r
-\r
-        HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d",\r
-            i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h);\r
-    }\r
-}\r
-\r
-Screen LayerControl::getScreenInfo()\r
-{\r
-    return Screen(this->screen_prop.screenWidth, this->screen_prop.screenHeight);\r
-}\r
-\r
-double LayerControl::scale()\r
-{\r
-    return this->scaling;\r
-}\r
-\r
-WMError LayerControl::updateLayer(LayerState& layer_state)\r
-{\r
-    return WMError::SUCCESS;\r
-}\r
-\r
-WMError LayerControl::commitChange()\r
-{\r
-    WMError rc = WMError::SUCCESS;\r
-    vector<unsigned> ivi_l_ids;\r
-    for(const auto& l : this->wm_layers)\r
-    {\r
-        auto state = l->getLayerState();\r
-        for(const auto& id : state.getIviIdList())\r
-        {\r
-            ivi_l_ids.push_back(id);\r
-        }\r
-    }\r
-    t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()];\r
-    if(id_array == nullptr)\r
-    {\r
-        HMI_WARNING("short memory");\r
-        this->undoUpdate();\r
-        return WMError::FAIL;\r
-    }\r
-    int count = 0;\r
-    for(const auto& i : ivi_l_ids)\r
-    {\r
-        id_array[count] = i;\r
-    }\r
-\r
-    ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size());\r
-    if(ret != ILM_SUCCESS)\r
-    {\r
-        this->undoUpdate();\r
-        rc = WMError::FAIL;\r
-    }\r
-    delete id_array;\r
-    return rc;\r
-}\r
-\r
-void LayerControl::undoUpdate() {}\r
-\r
-WMError LayerControl::loadLayerSetting(const string &path)\r
-{\r
-    HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path);\r
-\r
-    json_object *json_obj, *json_cfg;\r
-    int ret = jh::inputJsonFilie(path.c_str(), &json_obj);\r
-    if (0 > ret)\r
-    {\r
-        HMI_DEBUG("Could not open %s, so use default area information", path.c_str());\r
-        return WMError::FAIL;\r
-    }\r
-    HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));\r
-\r
-    if (!json_object_object_get_ex(json_obj, "mappings", &json_cfg))\r
-    {\r
-        HMI_ERROR("Parse Error!!");\r
-        return WMError::FAIL;\r
-    }\r
-\r
-    int len = json_object_array_length(json_cfg);\r
-    HMI_DEBUG("json_cfg len:%d", len);\r
-\r
-    for (int i = 0; i < len; i++)\r
-    {\r
-        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);\r
-        HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));\r
-\r
-        this->wm_layers.emplace_back(std::make_shared<WMLayer>(json_tmp));\r
-    }\r
-\r
-    return WMError::SUCCESS;\r
-}\r
-\r
-WMError LayerControl::loadAreaDb(const std::string& path)\r
-{\r
-    // Load area.db\r
-    json_object *json_obj;\r
-    int ret = jh::inputJsonFilie(path.c_str(), &json_obj);\r
-    if (0 > ret)\r
-    {\r
-        HMI_DEBUG("Could not open %s, so use default area information", path.c_str());\r
-        return WMError::FAIL;\r
-    }\r
-    HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));\r
-\r
-    // Perse areas\r
-    json_object *json_cfg;\r
-    if (!json_object_object_get_ex(json_obj, "areas", &json_cfg))\r
-    {\r
-        HMI_ERROR("Parse Error!!");\r
-        return WMError::FAIL;\r
-    }\r
-\r
-    int len = json_object_array_length(json_cfg);\r
-    HMI_DEBUG("json_cfg len:%d", len);\r
-\r
-    const char *area;\r
-    for (int i = 0; i < len; i++)\r
-    {\r
-        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);\r
-        HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));\r
-\r
-        area = jh::getStringFromJson(json_tmp, "name");\r
-        if (nullptr == area)\r
-        {\r
-            HMI_ERROR("Parse Error!!");\r
-            return WMError::FAIL;\r
-        }\r
-        HMI_DEBUG("> area:%s", area);\r
-\r
-        json_object *json_rect;\r
-        if (!json_object_object_get_ex(json_tmp, "rect", &json_rect))\r
-        {\r
-            HMI_ERROR("Parse Error!!");\r
-            return WMError::FAIL;\r
-        }\r
-        HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect));\r
-\r
-        struct rect area_size;\r
-        area_size.x = jh::getIntFromJson(json_rect, "x");\r
-        area_size.y = jh::getIntFromJson(json_rect, "y");\r
-        area_size.w = jh::getIntFromJson(json_rect, "w");\r
-        area_size.h = jh::getIntFromJson(json_rect, "h");\r
-\r
-        this->area2size[area] = area_size;\r
-    }\r
-\r
-    // Check\r
-    for (const auto& itr : this->area2size)\r
-    {\r
-        HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d",\r
-                  itr.first.c_str(), itr.second.x, itr.second.y,\r
-                  itr.second.w, itr.second.h);\r
-    }\r
-\r
-    // Release json_object\r
-    json_object_put(json_obj);\r
-\r
-    return WMError::SUCCESS;\r
-}\r
-\r
-WMError LayerControl::layoutChange(const WMAction& action)\r
-{\r
-    WMError ret = WMError::FAIL;\r
-    if (action.visible == TaskVisible::INVISIBLE)\r
-    {\r
-        // Visibility is not change -> no redraw is required\r
-        return WMError::SUCCESS;\r
-    }\r
-    if(action.client == nullptr)\r
-    {\r
-        HMI_SEQ_ERROR(action.req_num, "client may vanish");\r
-        return WMError::NOT_REGISTERED;\r
-    }\r
-    unsigned layer = action.client->layerID();\r
-\r
-    // Layout Manager\r
-    // WMError ret = this->setLayerSize(layer, action.area);\r
-    auto rect = this->getAreaSize(action.area);\r
-    ilmErrorTypes err = ilm_layerSetDestinationRectangle(layer, rect.x, rect.y, rect.w, rect.h);\r
-    if(err == ILM_SUCCESS)\r
-    {\r
-        ret = WMError::SUCCESS;\r
-    }\r
-    return ret;\r
-}\r
-\r
-WMError LayerControl::visibilityChange(const WMAction& action)\r
-{\r
-    WMError ret = WMError::FAIL;\r
-    if(action.client == nullptr)\r
-    {\r
-        HMI_SEQ_ERROR(action.req_num, "client may vanish");\r
-        return WMError::NOT_REGISTERED;\r
-    }\r
-\r
-    if (action.visible != TaskVisible::INVISIBLE)\r
-    {\r
-        ret = this->makeVisible(action.client);\r
-    }\r
-    else\r
-    {\r
-        ret = this->makeInvisible(action.client);\r
-    }\r
-    return ret;\r
-}\r
-\r
-void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created)\r
-{\r
-    this->cb.test(id);\r
-    if (ILM_SURFACE == object)\r
-    {\r
-        if (created)\r
-        {\r
-            ilmSurfaceProperties sp;\r
-            ilmErrorTypes rc;\r
-            rc = ilm_getPropertiesOfSurface(id, &sp);\r
-            if(rc != ILM_SUCCESS)\r
-                return;\r
-            // this->cb->surfaceCreated(pid, id);\r
-            ilm_surfaceAddNotification(id, surfaceCallback_static);\r
-            ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight);\r
-        }\r
-        else\r
-        {\r
-            // this->cb->surfaceDestroyed(id);\r
-        }\r
-    }\r
-    if (ILM_LAYER == object)\r
-    {\r
-        if(created)\r
-        {\r
-            ilm_layerAddNotification(id, layerCallback_static);\r
-            // this->cb->layerCreated(id);\r
-        }\r
-        else\r
-        {\r
-            // this->cb->layerDestroyed(id); // Means Application is dead.\r
-        }\r
-    }\r
-}\r
-\r
-void LayerControl::dispatchPropertyChangeEvent(unsigned id,\r
-        struct ilmSurfaceProperties* sprop,\r
-        t_ilm_notification_mask mask)\r
-{\r
-    pid_t pid = sprop->creatorPid;\r
-    HMI_DEBUG("pid : %d", pid);\r
-\r
-    if (ILM_NOTIFICATION_VISIBILITY & mask)\r
-    {\r
-        //this->cb->surfaceVisibilityChanged(id, sprop->visibility);\r
-    }\r
-    if (ILM_NOTIFICATION_OPACITY & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_ORIENTATION & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_SOURCE_RECT & mask)\r
-    {\r
-        // this->cb->surfaceSourceRectChanged(id, )\r
-    }\r
-    if (ILM_NOTIFICATION_DEST_RECT & mask)\r
-    {\r
-        // this->cb->surfaceSourceRectChanged(id, )\r
-    }\r
-    if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)\r
-    {\r
-        /* application being down */\r
-        // m_appLayers.remove(pid);\r
-    }\r
-    if (ILM_NOTIFICATION_CONFIGURED & mask)\r
-    {\r
-        /* qDebug("ILM_NOTIFICATION_CONFIGURED");\r
-        qDebug("  surfaceProperties %d", surface);\r
-        qDebug("    surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);\r
-        qDebug("    surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);\r
-\r
-        if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {\r
-            addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);\r
-            configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);\r
-        } else {\r
-            ilmErrorTypes result;\r
-            t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);\r
-\r
-            if (layer != 0) {\r
-                configureAppSurface(surface,\r
-                                    surfaceProperties->origSourceWidth,\r
-                                    surfaceProperties->origSourceHeight);\r
-\r
-                result = ilm_layerAddSurface(layer, surface);\r
-                if (result != ILM_SUCCESS) {\r
-                    qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);\r
-                }\r
-                ilm_commitChanges();\r
-            }\r
-        }\r
-        updateScreen(); */\r
-    }\r
-}\r
-\r
-void LayerControl::dispatchPropertyChangeEvent(unsigned id,\r
-        struct ilmLayerProperties* lprop,\r
-        t_ilm_notification_mask mask)\r
-{\r
-    if (ILM_NOTIFICATION_VISIBILITY & mask)\r
-    {\r
-        //this->cb->layerVisibilityChanged(id, sprop->visibility);\r
-    }\r
-    if (ILM_NOTIFICATION_OPACITY & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_ORIENTATION & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_SOURCE_RECT & mask)\r
-    {\r
-        // this->cb->surfaceSourceRectChanged(id, )\r
-    }\r
-    if (ILM_NOTIFICATION_DEST_RECT & mask)\r
-    {\r
-        // this->cb->surfaceSourceRectChanged(id, )\r
-    }\r
-    if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)\r
-    {\r
-    }\r
-    if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)\r
-    {\r
-        /* application being down */\r
-        // m_appLayers.remove(pid);\r
-    }\r
-    if (ILM_NOTIFICATION_CONFIGURED & mask)\r
-    {\r
-        /* qDebug("ILM_NOTIFICATION_CONFIGURED");\r
-        qDebug("  surfaceProperties %d", surface);\r
-        qDebug("    surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);\r
-        qDebug("    surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);\r
-\r
-        if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {\r
-            addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);\r
-            configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);\r
-        } else {\r
-            ilmErrorTypes result;\r
-            t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);\r
-\r
-            if (layer != 0) {\r
-                configureAppSurface(surface,\r
-                                    surfaceProperties->origSourceWidth,\r
-                                    surfaceProperties->origSourceHeight);\r
-\r
-                result = ilm_layerAddSurface(layer, surface);\r
-                if (result != ILM_SUCCESS) {\r
-                    qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);\r
-                }\r
-                ilm_commitChanges();\r
-            }\r
-        }\r
-        updateScreen(); */\r
-    }\r
-}\r
-\r
-WMError LayerControl::makeVisible(const shared_ptr<WMClient> client)\r
-{\r
-    WMError ret = WMError::FAIL;\r
-    // Don't check here the client is not nullptr\r
-    unsigned layer = client->layerID();\r
-    bool contains;// = this->checkBackGround(action.client->role());\r
-    if(contains)\r
-    {\r
-        shared_ptr<WMLayer> l;\r
-        // Move background from back ground layer\r
-        for(const auto& wm_layer : this->wm_layers)\r
-        {\r
-            if(wm_layer->layerName() == "BackGroundLayer")\r
-            {\r
-                //wm_layer.removeLayer(layer);\r
-            }\r
-            else\r
-            {\r
-                if(wm_layer->checkIDBelongTo(layer))\r
-                {\r
-                    l = wm_layer;\r
-                }\r
-            }\r
-        }\r
-        if(l != nullptr)\r
-        {\r
-            // make invisible first\r
-            ilm_layerSetVisibility(layer, 0);\r
-            ilm_commitChanges();\r
-            //l->addLayer(layer);\r
-        }\r
-    }\r
-    for(const auto& wm_layer : this->wm_layers)\r
-    {\r
-        // make visible\r
-        //l->makeVisible(layer);\r
-    }\r
-\r
-    return ret;\r
-}\r
-\r
-WMError LayerControl::makeInvisible(const shared_ptr<WMClient> client)\r
-{\r
-    WMError ret = WMError::FAIL;\r
-    // Don't check here the client is not nullptr\r
-    unsigned layer = client->layerID();\r
-    bool contains;// = this->checkBackGround(client->role());\r
-    if(contains)\r
-    {\r
-        // Pop from background\r
-    }\r
-    else\r
-    {\r
-\r
-    }\r
-    return ret;\r
-}\r
+/*
+ * 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 <assert.h>
+#include <unistd.h>
+#include "wm_layer_control.hpp"
+#include "wm_layer.hpp"
+#include "wm_client.hpp"
+#include "request.hpp"
+#include "json_helper.hpp"
+
+#define LC_AREA_PATH "/etc/areas.db"
+#define LC_LAYER_SETTING_PATH "/etc/layers_setting.json"
+#define LC_DEFAULT_AREA "normal.full"
+
+using std::string;
+using std::vector;
+using std::shared_ptr;
+
+namespace wm {
+
+LayerControl* g_lc_ctxt;
+
+static void createCallback_static(ilmObjectType object,
+                            t_ilm_uint id,
+                            t_ilm_bool created,
+                            void* data)
+{
+    static_cast<LayerControl*>(data)->dispatchCreateEvent(object, id, created);
+}
+
+static void surfaceCallback_static(t_ilm_surface surface,
+            struct ilmSurfaceProperties* surface_prop,
+            t_ilm_notification_mask mask)
+{
+    g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask);
+}
+
+static void layerCallback_static(t_ilm_layer layer,
+            struct ilmLayerProperties* layer_prop,
+            t_ilm_notification_mask mask)
+{
+    g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask);
+}
+
+LayerControl::LayerControl(const std::string& root)
+{
+    string area_path = root + LC_AREA_PATH;
+    string layer_path= root + LC_LAYER_SETTING_PATH;
+    // load layers.setting.json
+    WMError ret = this->loadLayerSetting(layer_path);
+    assert(ret == WMError::SUCCESS);
+    // load area.db
+    ret = this->loadAreaDb(area_path);
+    assert(ret == WMError::SUCCESS);
+}
+
+WMError LayerControl::init(const LayerControlCallbacks& cb)
+{
+    ilmErrorTypes rc = ilm_init();
+    t_ilm_uint num = 0;
+    t_ilm_uint *ids;
+    int cnt = 0;
+
+    while (rc != ILM_SUCCESS)
+    {
+        cnt++;
+        if (20 <= cnt)
+        {
+            HMI_ERROR("Could not connect to compositor");
+            goto lc_init_error;
+        }
+        HMI_ERROR("Wait to start weston ...");
+        sleep(1);
+        ilm_init();
+    }
+    if(rc != ILM_SUCCESS) goto lc_init_error;
+
+    // Get current screen setting
+    rc = ilm_getScreenIDs(&num, &ids);
+
+    if(rc != ILM_SUCCESS) goto lc_init_error;
+
+    for(unsigned i = 0; i < num; i++)
+    {
+        HMI_INFO("get screen: %d", ids[i]);
+    }
+    // Currently, 0 is only available
+    this->screenID = ids[0];
+
+    rc = ilm_getPropertiesOfScreen(this->screenID, &this->screen_prop);
+
+    if(rc != ILM_SUCCESS) goto lc_init_error;
+
+    // Register Callback from ILM
+    this->cb = cb;
+    ilm_registerNotification(createCallback_static, this);
+
+    return WMError::SUCCESS;
+
+lc_init_error:
+    HMI_ERROR("Failed to initialize. Terminate WM");
+
+    return WMError::FAIL;
+}
+
+void LayerControl::createNewLayer(unsigned id)
+{
+    HMI_INFO("create new ID :%d", id);
+    struct rect rct = this->area2size[LC_DEFAULT_AREA];
+    ilm_layerCreateWithDimension(&id, rct.w, rct.h);
+    ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h);
+    //ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h);
+    ilm_layerSetOpacity(id, 1.0);
+    ilm_layerSetVisibility(id, ILM_TRUE);
+    ilm_commitChanges();
+}
+
+unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)
+{
+    unsigned ret = 0;
+    for(const auto& l: this->wm_layers)
+    {
+        ret = l->getNewLayerID(role);
+        if(ret != 0)
+        {
+            *layer_name = l->layerName();
+            break;
+        }
+    }
+    return ret;
+}
+
+struct rect LayerControl::getAreaSize(const std::string& area)
+{
+    return area2size[area];
+}
+
+void LayerControl::setupArea(double scaling)
+{
+    struct rect rct;
+    this->scaling = scaling;
+
+    rct = this->area2size["normal.full"];
+    this->area2size["normalfull"] = rct;
+    this->area2size["normal"] = rct;
+
+    for (auto &i : this->area2size)
+    {
+        i.second.x = static_cast<int>(scaling * i.second.x + 0.5);
+        i.second.y = static_cast<int>(scaling * i.second.y + 0.5);
+        i.second.w = static_cast<int>(scaling * i.second.w + 0.5);
+        i.second.h = static_cast<int>(scaling * i.second.h + 0.5);
+
+        HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d",
+            i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h);
+    }
+}
+
+Screen LayerControl::getScreenInfo()
+{
+    return Screen(this->screen_prop.screenWidth, this->screen_prop.screenHeight);
+}
+
+double LayerControl::scale()
+{
+    return this->scaling;
+}
+
+WMError LayerControl::updateLayer(LayerState& layer_state)
+{
+    return WMError::SUCCESS;
+}
+
+WMError LayerControl::commitChange()
+{
+    WMError rc = WMError::SUCCESS;
+    vector<unsigned> ivi_l_ids;
+    for(const auto& l : this->wm_layers)
+    {
+        auto state = l->getLayerState();
+        for(const auto& id : state.getIviIdList())
+        {
+            ivi_l_ids.push_back(id);
+        }
+    }
+    t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()];
+    if(id_array == nullptr)
+    {
+        HMI_WARNING("short memory");
+        this->undoUpdate();
+        return WMError::FAIL;
+    }
+    int count = 0;
+    for(const auto& i : ivi_l_ids)
+    {
+        id_array[count] = i;
+        ++count;
+    }
+
+    ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size());
+    if(ret != ILM_SUCCESS)
+    {
+        this->undoUpdate();
+        rc = WMError::FAIL;
+    }
+    delete id_array;
+    return rc;
+}
+
+void LayerControl::undoUpdate() {}
+
+WMError LayerControl::loadLayerSetting(const string &path)
+{
+    HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path);
+
+    json_object *json_obj, *json_cfg;
+    int ret = jh::inputJsonFilie(path.c_str(), &json_obj);
+    if (0 > ret)
+    {
+        HMI_DEBUG("Could not open %s, so use default area information", path.c_str());
+        return WMError::FAIL;
+    }
+    HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));
+
+    if (!json_object_object_get_ex(json_obj, "mappings", &json_cfg))
+    {
+        HMI_ERROR("Parse Error!!");
+        return WMError::FAIL;
+    }
+
+    int len = json_object_array_length(json_cfg);
+    HMI_DEBUG("json_cfg len:%d", len);
+
+    for (int i = 0; i < len; i++)
+    {
+        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);
+        HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));
+
+        this->wm_layers.emplace_back(std::make_shared<WMLayer>(json_tmp));
+    }
+
+    return WMError::SUCCESS;
+}
+
+WMError LayerControl::loadAreaDb(const std::string& path)
+{
+    // Load area.db
+    json_object *json_obj;
+    int ret = jh::inputJsonFilie(path.c_str(), &json_obj);
+    if (0 > ret)
+    {
+        HMI_DEBUG("Could not open %s, so use default area information", path.c_str());
+        return WMError::FAIL;
+    }
+    HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));
+
+    // Perse areas
+    json_object *json_cfg;
+    if (!json_object_object_get_ex(json_obj, "areas", &json_cfg))
+    {
+        HMI_ERROR("Parse Error!!");
+        return WMError::FAIL;
+    }
+
+    int len = json_object_array_length(json_cfg);
+    HMI_DEBUG("json_cfg len:%d", len);
+
+    const char *area;
+    for (int i = 0; i < len; i++)
+    {
+        json_object *json_tmp = json_object_array_get_idx(json_cfg, i);
+        HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));
+
+        area = jh::getStringFromJson(json_tmp, "name");
+        if (nullptr == area)
+        {
+            HMI_ERROR("Parse Error!!");
+            return WMError::FAIL;
+        }
+        HMI_DEBUG("> area:%s", area);
+
+        json_object *json_rect;
+        if (!json_object_object_get_ex(json_tmp, "rect", &json_rect))
+        {
+            HMI_ERROR("Parse Error!!");
+            return WMError::FAIL;
+        }
+        HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect));
+
+        struct rect area_size;
+        area_size.x = jh::getIntFromJson(json_rect, "x");
+        area_size.y = jh::getIntFromJson(json_rect, "y");
+        area_size.w = jh::getIntFromJson(json_rect, "w");
+        area_size.h = jh::getIntFromJson(json_rect, "h");
+
+        this->area2size[area] = area_size;
+    }
+
+    // Check
+    for (const auto& itr : this->area2size)
+    {
+        HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d",
+                  itr.first.c_str(), itr.second.x, itr.second.y,
+                  itr.second.w, itr.second.h);
+    }
+
+    // Release json_object
+    json_object_put(json_obj);
+
+    return WMError::SUCCESS;
+}
+
+WMError LayerControl::layoutChange(const WMAction& action)
+{
+    WMError ret = WMError::FAIL;
+    if (action.visible == TaskVisible::INVISIBLE)
+    {
+        // Visibility is not change -> no redraw is required
+        return WMError::SUCCESS;
+    }
+    if(action.client == nullptr)
+    {
+        HMI_SEQ_ERROR(action.req_num, "client may vanish");
+        return WMError::NOT_REGISTERED;
+    }
+    unsigned layer = action.client->layerID();
+
+    // Layout Manager
+    // WMError ret = this->setLayerSize(layer, action.area);
+    auto rect = this->getAreaSize(action.area);
+    ilmErrorTypes err = ilm_layerSetDestinationRectangle(layer, rect.x, rect.y, rect.w, rect.h);
+    for(auto &wm_layer: this->wm_layers)
+    {
+        if(wm_layer->hasLayerID(layer))
+        {
+            LayerState ls = wm_layer->getLayerState();
+            ls.setArea(action.client->appID(), action.area);
+        }
+    }
+    if(err == ILM_SUCCESS)
+    {
+        ret = WMError::SUCCESS;
+    }
+    return ret;
+}
+
+WMError LayerControl::visibilityChange(const WMAction& action)
+{
+    WMError ret = WMError::FAIL;
+    if(action.client == nullptr)
+    {
+        HMI_SEQ_ERROR(action.req_num, "client may vanish");
+        return WMError::NOT_REGISTERED;
+    }
+
+    if (action.visible != TaskVisible::INVISIBLE)
+    {
+        ret = this->makeVisible(action.client);
+    }
+    else
+    {
+        ret = this->makeInvisible(action.client);
+    }
+    return ret;
+}
+
+void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created)
+{
+    this->cb.test(id);
+    if (ILM_SURFACE == object)
+    {
+        if (created)
+        {
+            ilmSurfaceProperties sp;
+            ilmErrorTypes rc;
+            rc = ilm_getPropertiesOfSurface(id, &sp);
+            if(rc != ILM_SUCCESS)
+                return;
+            // this->cb->surfaceCreated(pid, id);
+            ilm_surfaceAddNotification(id, surfaceCallback_static);
+            ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight);
+        }
+        else
+        {
+            // this->cb->surfaceDestroyed(id);
+        }
+    }
+    if (ILM_LAYER == object)
+    {
+        if(created)
+        {
+            ilm_layerAddNotification(id, layerCallback_static);
+            // this->cb->layerCreated(id);
+        }
+        else
+        {
+            // this->cb->layerDestroyed(id); // Means Application is dead.
+        }
+    }
+}
+
+void LayerControl::dispatchPropertyChangeEvent(unsigned id,
+        struct ilmSurfaceProperties* sprop,
+        t_ilm_notification_mask mask)
+{
+    pid_t pid = sprop->creatorPid;
+    HMI_DEBUG("pid : %d", pid);
+
+    if (ILM_NOTIFICATION_VISIBILITY & mask)
+    {
+        //this->cb->surfaceVisibilityChanged(id, sprop->visibility);
+    }
+    if (ILM_NOTIFICATION_OPACITY & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_ORIENTATION & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_SOURCE_RECT & mask)
+    {
+        // this->cb->surfaceSourceRectChanged(id, )
+    }
+    if (ILM_NOTIFICATION_DEST_RECT & mask)
+    {
+        // this->cb->surfaceSourceRectChanged(id, )
+    }
+    if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
+    {
+        /* application being down */
+        // m_appLayers.remove(pid);
+    }
+    if (ILM_NOTIFICATION_CONFIGURED & mask)
+    {
+        /* qDebug("ILM_NOTIFICATION_CONFIGURED");
+        qDebug("  surfaceProperties %d", surface);
+        qDebug("    surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);
+        qDebug("    surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);
+
+        if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {
+            addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);
+            configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);
+        } else {
+            ilmErrorTypes result;
+            t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);
+
+            if (layer != 0) {
+                configureAppSurface(surface,
+                                    surfaceProperties->origSourceWidth,
+                                    surfaceProperties->origSourceHeight);
+
+                result = ilm_layerAddSurface(layer, surface);
+                if (result != ILM_SUCCESS) {
+                    qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);
+                }
+                ilm_commitChanges();
+            }
+        }
+        updateScreen(); */
+    }
+}
+
+void LayerControl::dispatchPropertyChangeEvent(unsigned id,
+        struct ilmLayerProperties* lprop,
+        t_ilm_notification_mask mask)
+{
+    if (ILM_NOTIFICATION_VISIBILITY & mask)
+    {
+        //this->cb->layerVisibilityChanged(id, sprop->visibility);
+    }
+    if (ILM_NOTIFICATION_OPACITY & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_ORIENTATION & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_SOURCE_RECT & mask)
+    {
+        // this->cb->surfaceSourceRectChanged(id, )
+    }
+    if (ILM_NOTIFICATION_DEST_RECT & mask)
+    {
+        // this->cb->surfaceSourceRectChanged(id, )
+    }
+    if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
+    {
+    }
+    if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
+    {
+        /* application being down */
+        // m_appLayers.remove(pid);
+    }
+    if (ILM_NOTIFICATION_CONFIGURED & mask)
+    {
+        /* qDebug("ILM_NOTIFICATION_CONFIGURED");
+        qDebug("  surfaceProperties %d", surface);
+        qDebug("    surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);
+        qDebug("    surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);
+
+        if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {
+            addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);
+            configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);
+        } else {
+            ilmErrorTypes result;
+            t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);
+
+            if (layer != 0) {
+                configureAppSurface(surface,
+                                    surfaceProperties->origSourceWidth,
+                                    surfaceProperties->origSourceHeight);
+
+                result = ilm_layerAddSurface(layer, surface);
+                if (result != ILM_SUCCESS) {
+                    qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);
+                }
+                ilm_commitChanges();
+            }
+        }
+        updateScreen(); */
+    }
+}
+
+WMError LayerControl::makeVisible(const shared_ptr<WMClient> client)
+{
+    WMError ret = WMError::SUCCESS;
+    // Don't check here the client is not nullptr
+    unsigned layer = client->layerID();
+
+    for(auto& wm_layer : this->wm_layers)
+    {
+        if(wm_layer->hasLayerID(layer))
+        {
+            LayerState ls = wm_layer->getLayerState();
+            ls.addLayer(layer);;
+        }
+    }
+
+    // Move foreground from back ground layer
+    for(auto& wm_layer : this->wm_layers)
+    {
+        if(wm_layer->layerName() == "BackGroundLayer")
+        {
+            if(wm_layer->hasRole(client->role()))
+            {
+                LayerState ls = wm_layer->getLayerState();
+                ls.removeLayer(layer);
+            }
+            break;
+        }
+    }
+
+    return ret;
+}
+
+WMError LayerControl::makeInvisible(const shared_ptr<WMClient> client)
+{
+    WMError ret = WMError::SUCCESS;
+    // Don't check here the client is not nullptr
+    unsigned layer = client->layerID();
+
+    for(auto& wm_layer : this->wm_layers)
+    {
+        if(wm_layer->hasLayerID(layer))
+        {
+            LayerState ls = wm_layer->getLayerState();
+            ls.removeLayer(layer);;
+        }
+    }
+
+    // Move foreground from back ground layer
+    for(auto& wm_layer : this->wm_layers)
+    {
+        if(wm_layer->layerName() == "BackGroundLayer")
+        {
+            if(wm_layer->hasRole(client->role()))
+            {
+                LayerState ls = wm_layer->getLayerState();
+                ls.addLayer(layer);
+            }
+            break;
+        }
+    }
+
+    return ret;
+}

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

diff --git a/src/wm_layer_control.hpp b/src/wm_layer_control.hpp
index e2c4b18..7752fc4 100644 (file)
--- a/src/wm_layer_control.hpp
+++ b/src/wm_layer_control.hpp
@@ -27,8 +27,7 @@ namespace wm {
 \r
 class Screen {\r
   public:\r
 \r
 class Screen {\r
   public:\r

-    Screen(unsigned w, unsigned h);\r
-    ~Screen();\r
+    Screen(unsigned w, unsigned h) : _width(w), _height(h){}\r

     unsigned width() { return _width; }\r
     unsigned height() { return _height; }\r
   private:\r
     unsigned width() { return _width; }\r
     unsigned height() { return _height; }\r
   private:\r