Merge branch 'sandbox/knimitz/lock_mv_transition_endD' into sandbox/knimitz/lock

11 files changed, 610 insertions, 341 deletions

diff --git a/src/app.cpp b/src/app.cpp
index d11ec8a..90d2512 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -124,12 +124,7 @@ void App::timerHandler()
     HMI_SEQ_DEBUG(req_num, "Timer expired remove Request");
     g_app_list.reqDump();
     g_app_list.removeRequest(req_num);
-    g_app_list.next();
-    g_app_list.reqDump();
-    if (g_app_list.haveRequest())
-    {
-        this->process_request();
-    }
+    this->processNextRequest();
 }
 
 void App::removeClient(const std::string &appid)
@@ -319,10 +314,12 @@ int App::init_layers()
 
     this->layout_commit();
 
+    this->layers.setupArea(o->width, o->height);
+
     return 0;
 }
 
-void App::surface_set_layout(int surface_id, optional<int> sub_surface_id)
+void App::surface_set_layout(int surface_id, const std::string& area)
 {
     if (!this->controller->surface_exists(surface_id))
     {
@@ -341,7 +338,9 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id)
     uint32_t layer_id = *o_layer_id;
 
     auto const &layer = this->layers.get_layer(layer_id);
-    auto rect = layer.value().rect;
+    auto rect = this->layers.getAreaSize(area);
+    HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "%s : x:%d y:%d w:%d h:%d", area.c_str(),
+                    rect.x, rect.y, rect.w, rect.h);
     auto &s = this->controller->surfaces[surface_id];
 
     int x = rect.x;
@@ -360,45 +359,6 @@ void App::surface_set_layout(int surface_id, optional<int> sub_surface_id)
         h = this->controller->output_size.h + 1 + h;
     }
 
-    if (sub_surface_id)
-    {
-        if (o_layer_id != this->layers.get_layer_id(*sub_surface_id))
-        {
-            HMI_ERROR("wm",
-                      "surface_set_layout: layers of surfaces (%d and %d) don't match!",
-                      surface_id, *sub_surface_id);
-            return;
-        }
-
-        int x_off = 0;
-        int y_off = 0;
-
-        // split along major axis
-        if (w > h)
-        {
-            w /= 2;
-            x_off = w;
-        }
-        else
-        {
-            h /= 2;
-            y_off = h;
-        }
-
-        auto &ss = this->controller->surfaces[*sub_surface_id];
-
-        HMI_DEBUG("wm", "surface_set_layout for sub surface %u on layer %u",
-                  *sub_surface_id, layer_id);
-
-        // set destination to the display rectangle
-        ss->set_destination_rectangle(x + x_off, y + y_off, w, h);
-
-        this->area_info[*sub_surface_id].x = x;
-        this->area_info[*sub_surface_id].y = y;
-        this->area_info[*sub_surface_id].w = w;
-        this->area_info[*sub_surface_id].h = h;
-    }
-
     HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
               layer_id);
 
@@ -421,7 +381,7 @@ void App::layout_commit()
     this->display->flush();
 }
 
-void App::set_timer()
+void App::setTimer()
 {
     HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
     if (g_timer_ev_src == nullptr)
@@ -442,7 +402,7 @@ void App::set_timer()
     }
 }
 
-void App::stop_timer()
+void App::stopTimer()
 {
     unsigned req_num = g_app_list.currentRequestNumber();
     HMI_SEQ_DEBUG(req_num, "Timer stop");
@@ -550,281 +510,319 @@ WMError App::lm_release(const struct WMAction &action)
     return WMError::SUCCESS;
 }
 
-WMError App::lm_layout_change(const struct WMAction &action)
+WMError App::doTransition(unsigned req_num)
 {
-    const char *msg = this->check_surface_exist(action.role.c_str());
-
-    /*
-    lm_.updateLayout(action);
-    TODO: emit syncDraw with application*/
-    if (msg)
+    HMI_SEQ_DEBUG(req_num, "check policy");
+    WMError ret = this->checkPolicy(req_num);
+    if (ret != WMError::SUCCESS)
     {
-        HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg);
-        return WMError::LAYOUT_CHANGE_FAIL;
+        return ret;
     }
-    this->lm_layout_change(action.role.c_str());
-    return WMError::SUCCESS;
+    HMI_SEQ_DEBUG(req_num, "Start transition.");
+    ret = this->startTransition(req_num);
+    return ret;
 }
 
-WMError App::do_transition(unsigned req_num)
+WMError App::checkPolicy(unsigned req_num)
 {
     /*
     * Check Policy
     */
     // get current trigger
-    bool found;
-    bool is_activate = true;
+    bool found = false;
+    bool split = false;
+    WMError ret = WMError::LAYOUT_CHANGE_FAIL;
     auto trigger = g_app_list.getRequest(req_num, &found);
-    if(!found)
+    if (!found)
     {
-        WMError err = WMError::NO_ENTRY;
-        HMI_SEQ_ERROR(req_num, errorDescription(err));
-        return err;
+        ret = WMError::NO_ENTRY;
+        return ret;
     }
+    std::string req_area = trigger.area;
 
-    /*  get new status from Policy Manager
+    // >>>> Compatible with current window manager until policy manager coming
+    if (trigger.task == Task::TASK_ALLOCATE)
+    {
+        HMI_SEQ_DEBUG(req_num, "Check split or not");
+        const char *msg = this->check_surface_exist(trigger.role.c_str());
 
-    (json_object*?) newLayout = checkPolicy(trigger);
-    (vector<struct WMAction>&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout)
-    for(const auto& x : actions){
-        g_app_list.setAciton(req_num, x)
-    }
+        if (msg)
+        {
+            HMI_SEQ_ERROR(req_num, msg);
+            ret = WMError::LAYOUT_CHANGE_FAIL;
+            return ret;
+        }
 
-    or
+        auto const &surface_id = this->lookup_id(trigger.role.c_str());
+        auto o_state = *this->layers.get_layout_state(*surface_id);
+        struct LayoutState &state = *o_state;
 
-    translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num);
+        unsigned curernt_sid = state.main;
+        split = this->can_split(state, *surface_id);
 
-    /* The following error check is not necessary because main.cpp will reject the message form not registered object
-   } */
-    HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
+        if (split)
+        {
+            HMI_SEQ_DEBUG(req_num, "Split happens");
+            // Get current visible role
+            std::string add_role = this->lookup_name(state.main).value();
+            // Set next area
+            std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
+            // Change request area
+            req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
+            HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", trigger.area, req_area);
+            // set another action
+            std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found);
+            if (!found)
+            {
+                HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %s", curernt_sid);
+                ret = WMError::NOT_REGISTERED;
+                return ret;
+            }
+            HMI_SEQ_INFO(req_num, "Additional split app %s, role: %s, area: %s",
+                         add_name.c_str(), add_role.c_str(), add_area.c_str());
+            // Set split action
+            bool end_draw_finished = false;
+            WMAction split_action{
+                add_name,
+                add_role,
+                add_area,
+                TaskVisible::VISIBLE,
+                end_draw_finished};
+            WMError ret = g_app_list.setAction(req_num, split_action);
+            if (ret != WMError::SUCCESS)
+            {
+                HMI_SEQ_ERROR(req_num, "Failed to set action");
+                return ret;
+            }
+            g_app_list.reqDump();
+        }
+    }
+    else
+    {
+        HMI_SEQ_DEBUG(req_num, "split doesn't happen");
+    }
 
-    if (trigger.task == Task::TASK_RELEASE)
+    // Set invisible task(Remove if policy manager finish)
+    ret = this->setInvisibleTask(trigger.role, split);
+    if(ret != WMError::SUCCESS)
     {
-        is_activate = false;
+        HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret));
+        return ret;
     }
-    WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate);
+
+    /*  get new status from Policy Manager */
+    HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
+    if(trigger.role == "HomeScreen")
+    {
+        // TODO : Remove when Policy Manager completed
+        HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!");
+        req_area = "fullscreen";
+    }
+    TaskVisible task_visible = (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE;
+
+    ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible);
     g_app_list.reqDump();
 
-    if (ret != WMError::SUCCESS)
+    return ret;
+}
+
+WMError App::startTransition(unsigned req_num)
+{
+    bool sync_draw_happen = false;
+    bool found = false;
+    WMError ret = WMError::SUCCESS;
+    auto actions = g_app_list.getActions(req_num, &found);
+    if (!found)
     {
-        HMI_SEQ_ERROR(req_num, "Failed to set action");
+        ret = WMError::NO_ENTRY;
+        HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret));
         return ret;
     }
 
-    // layer manager task
-    bool sync_draw_happen = false;
-    for (const auto &y : g_app_list.getActions(req_num, &found))
+    for (const auto &y : actions)
     {
-        if (!found)
-        {
-            WMError err = WMError::NO_ENTRY;
-            HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err));
-            return err;
-        }
-        /*
-        do_task(y);
-        */
-        /*  TODO
-           but current we can't do do_task,
-           so divide the processing into lm_layout_change and lm_release
-        */
-        if (y.visible)
+        if (y.visible != TaskVisible::INVISIBLE)
         {
             sync_draw_happen = true;
-            ret = lm_layout_change(y);
-            if (ret != WMError::SUCCESS)
-            {
-                HMI_SEQ_ERROR(req_num, "%s: appid: %s, role: %s, area: %s",
-                    errorDescription(ret), y.appid.c_str(), y.role.c_str(), y.area.c_str());
-                g_app_list.removeRequest(req_num);
-                break;
-                // TODO: if transition fails, what should we do?
-            }
-            /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
-        }
-        else
-        {
-            ret = lm_release(y);
-            if (!ret)
-            {
-                HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str());
-                g_app_list.removeRequest(req_num);
-                break;
-                // TODO: if transition fails, what should we do?
-            }
-            /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */
+            this->emit_syncdraw(y.role, y.area);
+            /* TODO: emit event for app not subscriber
+            if(g_app_list.contains(y.appid))
+                g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
         }
     }
 
-    if (ret != WMError::SUCCESS)
+    if (sync_draw_happen)
     {
-        //this->emit_error(req_num, 0 /*error_num*/, "error happens"); // test
-    }
-    else if (sync_draw_happen)
-    {
-        this->set_timer();
+        this->setTimer();
     }
     else
     {
-        g_app_list.removeRequest(req_num); // HACK!!!
+        // deactivate only, no syncDraw
+        // Make it deactivate here
+        for (const auto &z : actions)
+        {
+            if (g_app_list.contains(z.appid))
+            {
+                auto client = g_app_list.lookUpClient(z.appid);
+                this->deactivate(client->surfaceID(z.role));
+            }
+        }
+        ret = NO_LAYOUT_CHANGE;
     }
     return ret;
 }
 
-void App::lm_layout_change(const char *drawing_name)
+WMError App::setInvisibleTask(const std::string &role, bool split)
 {
+    unsigned req = g_app_list.currentRequestNumber();
+    HMI_SEQ_DEBUG(req, "set current visible app to invisible task");
+    // This task is copied from original actiavete surface
+    const char *drawing_name = role.c_str();
     auto const &surface_id = this->lookup_id(drawing_name);
     auto layer_id = this->layers.get_layer_id(*surface_id);
     auto o_state = *this->layers.get_layout_state(*surface_id);
     struct LayoutState &state = *o_state;
+    std::string add_name, add_role;
+    std::string add_area = "";
+    int surface;
+    TaskVisible task_visible = TaskVisible::INVISIBLE;
+    bool end_draw_finished = true;
+    bool found = false;
 
-    // disable layers that are above our current layer
     for (auto const &l : this->layers.mapping)
     {
         if (l.second.layer_id <= *layer_id)
         {
             continue;
         }
-
-        bool flush = false;
+        HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub);
         if (l.second.state.main != -1)
         {
-            this->deactivate(l.second.state.main);
+            //this->deactivate(l.second.state.main);
+            surface = l.second.state.main;
+            add_role = *this->id_alloc.lookup(surface);
+            add_name = g_app_list.getAppID(surface, add_role, &found);
+            if(!found){
+                return WMError::NOT_REGISTERED;
+            }
+            HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str());
+            WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
+            g_app_list.setAction(req, act);
             l.second.state.main = -1;
-            flush = true;
         }
 
         if (l.second.state.sub != -1)
         {
-            this->deactivate(l.second.state.sub);
+            //this->deactivate(l.second.state.sub);
+            surface = l.second.state.sub;
+            add_role = *this->id_alloc.lookup(surface);
+            add_name = g_app_list.getAppID(surface, add_role, &found);
+            if (!found)
+            {
+                return WMError::NOT_REGISTERED;
+            }
+            HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str());
+            WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
+            g_app_list.setAction(req, act);
             l.second.state.sub = -1;
-            flush = true;
-        }
-
-        if (flush)
-        {
-            this->layout_commit();
         }
     }
 
+    // change current state here, but this is hack
     auto layer = this->layers.get_layer(*layer_id);
 
     if (state.main == -1)
     {
-        this->try_layout(
+        HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
+        //state = LayoutState{*surface_id};
+        /* this->try_layout(
             state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
                 HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
-                this->surface_set_layout(*surface_id);
+                //this->surface_set_layout(*surface_id);
                 state = nl;
 
-                // Commit for configuraton
-                this->layout_commit();
-
-                std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-                compositor::rect area_rect = this->area_info[*surface_id];
-                this->emit_syncdraw(drawing_name, str_area.c_str(),
-                                    area_rect.x, area_rect.y, area_rect.w, area_rect.h);
-                this->enqueue_flushdraw(state.main);
-            });
+                //compositor::rect area_rect = this->area_info[*surface_id];
+            }); */
     }
     else
     {
-        if (0 == strcmp(drawing_name, "HomeScreen"))
+        if (0 != strcmp(drawing_name, "HomeScreen"))
         {
-            this->try_layout(
-                state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
-                    HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
-                    std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-                    compositor::rect area_rect = this->area_info[*surface_id];
-                    this->emit_syncdraw(drawing_name, str_area.c_str(),
-                                        area_rect.x, area_rect.y, area_rect.w, area_rect.h);
-                    this->enqueue_flushdraw(state.main);
-                });
-        }
-        else
-        {
-            bool can_split = this->can_split(state, *surface_id);
-
-            if (can_split)
+            if (split)
             {
-                this->try_layout(
-                    state,
-                    LayoutState{state.main, *surface_id},
-                    [&](LayoutState const &nl) {
-                        HMI_DEBUG("wm", "Layout: %s", kNameLayoutSplit);
-                        std::string main =
-                            std::move(*this->lookup_name(state.main));
-
-                        this->surface_set_layout(state.main, surface_id);
-                        if (state.sub != *surface_id)
+                std::string main =
+                    std::move(*this->id_alloc.lookup(state.main));
+                if (state.sub != *surface_id)
+                {
+                    if (state.sub != -1)
+                    {
+                        //this->deactivate(state.sub);
+                        WMAction deact_sub;
+                        deact_sub.role = main;
+                        deact_sub.area = add_area;
+                        deact_sub.appid = g_app_list.getAppID(state.sub, main, &found);
+                        if (!found)
                         {
-                            if (state.sub != -1)
-                            {
-                                this->deactivate(state.sub);
-                            }
+                            HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
+                            return WMError::NOT_REGISTERED;
                         }
-                        state = nl;
-
-                        // Commit for configuration and visibility(0)
-                        this->layout_commit();
-
-                        std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain);
-                        std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub);
-                        compositor::rect area_rect_main = this->area_info[state.main];
-                        compositor::rect area_rect_sub = this->area_info[*surface_id];
-                        // >>> HACK
-                        HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split");
-                        std::string request_role = drawing_name;
-                        //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer
-                        std::string hack_appid = "navigation";
-                        std::string hack_role = main;
-                        std::string hack_area = str_area_main;
-                        g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true);
-                        //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), request_role, request_role);
-                        //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), hack_appid, hack_role); // This process is illegal
-                        // >>> HACK
-                        this->emit_syncdraw(main.c_str(), str_area_main.c_str(),
-                                            area_rect_main.x, area_rect_main.y,
-                                            area_rect_main.w, area_rect_main.h);
-                        this->emit_syncdraw(request_role.c_str(), str_area_sub.c_str(),
-                                            area_rect_sub.x, area_rect_sub.y,
-                                            area_rect_sub.w, area_rect_sub.h);
-                        this->enqueue_flushdraw(state.main);
-                        this->enqueue_flushdraw(state.sub);
-                    });
+                        deact_sub.visible = task_visible;
+                        deact_sub.end_draw_finished = end_draw_finished;
+                        HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
+                        g_app_list.setAction(req, deact_sub);
+                    }
+                }
+                //state = LayoutState{state.main, *surface_id};
             }
             else
             {
-                this->try_layout(
-                    state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
-                        HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
+                HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
 
-                        this->surface_set_layout(*surface_id);
-                        if (state.main != *surface_id)
-                        {
-                            this->deactivate(state.main);
-                        }
-                        if (state.sub != -1)
+                //this->surface_set_layout(*surface_id);
+                if (state.main != *surface_id)
+                {
+                    // this->deactivate(state.main);
+                    WMAction deact_main;
+                    deact_main.role = std::move(*this->id_alloc.lookup(state.main));
+                    ;
+                    deact_main.area = add_area;
+                    deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found);
+                    if (!found)
+                    {
+                        HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist");
+                        return WMError::NOT_REGISTERED;
+                    }
+                    deact_main.visible = task_visible;
+                    deact_main.end_draw_finished = end_draw_finished;
+                    HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
+                    g_app_list.setAction(req, deact_main);
+                }
+                if (state.sub != -1)
+                {
+                    if (state.sub != *surface_id)
+                    {
+                        //this->deactivate(state.sub);
+                        WMAction deact_sub;
+                        deact_sub.role = std::move(*this->id_alloc.lookup(state.sub));
+                        ;
+                        deact_sub.area = add_area;
+                        deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found);
+                        if (!found)
                         {
-                            if (state.sub != *surface_id)
-                            {
-                                this->deactivate(state.sub);
-                            }
+                            HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist");
+                            return WMError::NOT_REGISTERED;
                         }
-                        state = nl;
-
-                        // Commit for configuraton and visibility(0)
-                        this->layout_commit();
-
-                        std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
-                        compositor::rect area_rect = this->area_info[*surface_id];
-                        this->emit_syncdraw(drawing_name, str_area.c_str(),
-                                            area_rect.x, area_rect.y, area_rect.w, area_rect.h);
-                        this->enqueue_flushdraw(state.main);
-                    });
+                        deact_sub.visible = task_visible;
+                        deact_sub.end_draw_finished = end_draw_finished;
+                        HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
+                        g_app_list.setAction(req, deact_sub);
+                    }
+                }
+                //state = LayoutState{*surface_id};
             }
         }
     }
+    return WMError::SUCCESS;
 }
 
 const char *App::check_surface_exist(const char *drawing_name)
@@ -863,61 +861,77 @@ const char *App::check_surface_exist(const char *drawing_name)
     //reply(nullptr);
 }
 
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area,
+                            Task task, unsigned* req_num)
 {
-    ST();
-
-    /*
-   * Check Phase
-   */
-
-    std::string id = appid;
-    std::string role = drawing_name;
-    std::string area = drawing_area;
-
-    if (!g_app_list.contains(id))
+    if (!g_app_list.contains(appid))
     {
-        reply("app doesn't request 'requestSurface' yet");
-        return;
+        return WMError::NOT_REGISTERED;
     }
 
-    auto client = g_app_list.lookUpClient(id);
+    auto client = g_app_list.lookUpClient(appid);
 
     /*
    * Queueing Phase
    */
     unsigned current = g_app_list.currentRequestNumber();
-    unsigned requested_num = g_app_list.getRequestNumber(id);
+    unsigned requested_num = g_app_list.getRequestNumber(appid);
     if (requested_num != 0)
     {
-        HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str());
-        reply("already requested");
-        return;
+        HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
+        return REQ_REJECTED;
     }
 
-    WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
+    WMRequest req = WMRequest(appid, role, area, task);
     unsigned new_req = g_app_list.addAllocateRequest(req);
+    *req_num = new_req;
     g_app_list.reqDump();
 
-    HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
+    HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", appid.c_str(), role.c_str(), area.c_str());
+
+    return WMError::SUCCESS;
+}
+
+void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+{
+    ST();
+
+    std::string id = appid;
+    std::string role = drawing_name;
+    std::string area = drawing_area;
+    Task task = Task::TASK_ALLOCATE;
+    unsigned req_num = 0;
+    WMError ret = WMError::UNKNOWN;
+
+    ret = this->setRequest(id, role, area, task, &req_num);
+
+    if(ret != WMError::SUCCESS)
+    {
+        HMI_ERROR("wm", errorDescription(ret));
+        reply("Failed to set request");
+        return;
+    }
 
     reply(nullptr);
-    if (new_req != current)
+    if (req_num != g_app_list.currentRequestNumber())
     {
         // Add request, then invoked after the previous task is finished
-        HMI_SEQ_DEBUG(new_req, "request is accepted");
+        HMI_SEQ_DEBUG(req_num, "request is accepted");
         return;
     }
 
     /*
     * Do allocate tasks
     */
-    WMError ret = this->do_transition(new_req);
+    ret = this->doTransition(req_num);
 
     if (ret != WMError::SUCCESS)
     {
-        HMI_SEQ_ERROR(new_req, errorDescription(ret));
         //this->emit_error()
+        HMI_SEQ_ERROR(req_num, errorDescription(ret));
+        g_app_list.removeRequest(req_num);
+        g_app_list.next();
+        g_app_list.reqDump();
     }
 }
 
@@ -968,11 +982,13 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co
     /*
     * Do allocate tasks
     */
-    WMError ret = this->do_transition(new_req);
+    WMError ret = this->doTransition(new_req);
 
     if (ret != WMError::SUCCESS)
     {
         HMI_SEQ_ERROR(new_req, errorDescription(ret));
+        g_app_list.removeRequest(new_req);
+        g_app_list.next();
         //this->emit_error()
     }
 }
@@ -1000,89 +1016,208 @@ void App::check_flushdraw(int surface_id)
     }
 }
 
-void App::lm_enddraw(const char *drawing_name)
-{
-    HMI_DEBUG("wm", "end draw %s", drawing_name);
-    for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++)
-    {
-        auto n = this->lookup_name(this->pending_end_draw[i]);
-        if (n && *n == drawing_name)
-        {
-            std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
-            this->pending_end_draw.resize(iend - 1);
-            this->activate(this->pending_end_draw[i]);
-            this->emit_flushdraw(drawing_name);
-        }
-    }
-}
-
-void App::do_enddraw(unsigned req_num)
+WMError App::doEndDraw(unsigned req_num)
 {
     // get actions
     bool found;
     auto actions = g_app_list.getActions(req_num, &found);
+    WMError ret = WMError::SUCCESS;
     if (!found)
     {
-        WMError err = WMError::NO_ENTRY;
-        HMI_SEQ_ERROR(req_num, errorDescription(err));
-        return;
+        ret = WMError::NO_ENTRY;
+        return ret;
     }
 
     HMI_SEQ_INFO(req_num, "do endDraw");
 
+    // layout change and make it visible
     for (const auto &act : actions)
     {
+        // layout change
+        if(!g_app_list.contains(act.appid)){
+            ret = WMError::NOT_REGISTERED;
+        }
+        ret = this->layoutChange(act);
+        if(ret != WMError::SUCCESS)
+        {
+            HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+            return ret;
+        }
+        ret = this->visibilityChange(act);
+        if (ret != WMError::SUCCESS)
+        {
+            HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
+            return ret;
+        }
         HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
-        this->lm_enddraw(act.role.c_str());
+        //this->lm_enddraw(act.role.c_str());
     }
 
+    // Change current state
+    this->changeCurrentState(req_num);
+
     HMI_SEQ_INFO(req_num, "emit flushDraw");
-    /*     do
+
+    for(const auto &act_flush : actions)
     {
-        // emit flush Draw
-        //emitFlushDrawToAll(&g_app_list, req_num);
-        // emit status change event
-    } while (!g_app_list.requestFinished());*/
+        if(act_flush.visible != TaskVisible::INVISIBLE)
+        {
+            this->emit_flushdraw(act_flush.role.c_str());
+        }
+    }
+
+    return ret;
 }
 
-void App::process_request()
+WMError App::setSurfaceSize(unsigned surface, const std::string &area)
 {
-    unsigned req = g_app_list.currentRequestNumber();
-    HMI_SEQ_DEBUG(req, "Do next request");
-    WMError rc = do_transition(req);
-    if(rc != WMError::SUCCESS){
-        HMI_SEQ_ERROR(req, errorDescription(rc));
+    this->surface_set_layout(surface, area);
+
+    return WMError::SUCCESS;
+}
+
+WMError App::layoutChange(const WMAction &action)
+{
+    if (action.visible == TaskVisible::INVISIBLE)
+    {
+        // Visibility is not change -> no redraw is required
+        return WMError::SUCCESS;
     }
+    auto client = g_app_list.lookUpClient(action.appid);
+    unsigned surface = client->surfaceID(action.role);
+    if (surface == 0)
+    {
+        HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
+                      "client doesn't have surface with role(%s)", action.role.c_str());
+        return WMError::NOT_REGISTERED;
+    }
+    // Layout Manager
+    WMError ret = this->setSurfaceSize(surface, action.area);
+    return ret;
+}
+
+WMError App::visibilityChange(const WMAction &action)
+{
+    HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Change visibility");
+    if(!g_app_list.contains(action.appid)){
+        return WMError::NOT_REGISTERED;
+    }
+    auto client = g_app_list.lookUpClient(action.appid);
+    unsigned surface = client->surfaceID(action.role);
+    if(surface == 0)
+    {
+        HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
+                      "client doesn't have surface with role(%s)", action.role.c_str());
+        return WMError::NOT_REGISTERED;
+    }
+
+    if (action.visible != TaskVisible::INVISIBLE)
+    {
+        this->activate(surface); // Layout Manager task
+    }
+    else
+    {
+        this->deactivate(surface); // Layout Manager task
+    }
+    return WMError::SUCCESS;
+}
+
+WMError App::changeCurrentState(unsigned req_num)
+{
+    HMI_SEQ_DEBUG(req_num, "Change current layout state");
+    bool trigger_found = false, action_found = false;
+    auto trigger = g_app_list.getRequest(req_num, &trigger_found);
+    auto actions = g_app_list.getActions(req_num, &action_found);
+    if (!trigger_found || !action_found)
+    {
+        HMI_SEQ_ERROR(req_num, "Action not found");
+        return WMError::LAYOUT_CHANGE_FAIL;
+    }
+
+    // Layout state reset
+    struct LayoutState reset_state{-1, -1};
+    HMI_SEQ_DEBUG(req_num,"Reset layout state");
+    for (const auto &action : actions)
+    {
+        if(!g_app_list.contains(action.appid)){
+            return WMError::NOT_REGISTERED;
+        }
+        auto client = g_app_list.lookUpClient(action.appid);
+        auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role));
+        if(pCurState == nullptr)
+        {
+            HMI_SEQ_ERROR(req_num, "Counldn't find current status");
+            continue;
+        }
+        pCurState->main = reset_state.main;
+        pCurState->sub = reset_state.sub;
+    }
+
+    HMI_SEQ_DEBUG(req_num, "Change state");
+    for (const auto &action : actions)
+    {
+        auto client = g_app_list.lookUpClient(action.appid);
+        auto pLayerCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role));
+        if (pLayerCurState == nullptr)
+        {
+            HMI_SEQ_ERROR(req_num, "Counldn't find current status");
+            continue;
+        }
+        int surface = -1;
+
+        if (action.visible != TaskVisible::INVISIBLE)
+        {
+            surface = (int)client->surfaceID(action.role);
+            HMI_SEQ_INFO(req_num, "Change %s surface : %d, state visible area : %s",
+                            action.role.c_str(), surface, action.area.c_str());
+            // visible == true -> layout changes
+            if(action.area == "normal.full" || action.area == "split.main")
+            {
+                pLayerCurState->main = surface;
+            }
+            else if (action.area == "split.sub")
+            {
+                pLayerCurState->sub = surface;
+            }
+            else
+            {
+                // normalfull
+                pLayerCurState->main = surface;
+            }
+        }
+    }
+
+    return WMError::SUCCESS;
 }
 
 void App::api_enddraw(char const *appid, char const *drawing_name)
 {
-    std::string id(appid);
-    std::string role(drawing_name);
+    std::string id = appid;
+    std::string role = drawing_name;
     unsigned current_req = g_app_list.currentRequestNumber();
     bool result = g_app_list.setEndDrawFinished(current_req, id, role);
 
     if (!result)
     {
-        HMI_ERROR("wm", "%s doesn't have Window Resource", id.c_str());
+        HMI_ERROR("wm", "%s is not in transition state", id.c_str());
         return;
     }
 
     if (g_app_list.endDrawFullfilled(current_req))
     {
         // do task for endDraw
-        //this->stop_timer();
-        this->do_enddraw(current_req);
-
-        this->stop_timer();
+        this->stopTimer();
+        WMError ret = this->doEndDraw(current_req);
 
-        g_app_list.removeRequest(current_req);
-        HMI_SEQ_INFO(current_req, "Finish request");
-        g_app_list.next();
-        if (g_app_list.haveRequest())
+        if(ret != WMError::SUCCESS)
         {
-            this->process_request();
+            //this->emit_error();
         }
+        HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
+
+        g_app_list.removeRequest(current_req);
+
+        this->processNextRequest();
     }
     else
     {
@@ -1091,6 +1226,26 @@ void App::api_enddraw(char const *appid, char const *drawing_name)
     }
 }
 
+void App::processNextRequest()
+{
+    g_app_list.next();
+    g_app_list.reqDump();
+    unsigned req_num = g_app_list.currentRequestNumber();
+    if (g_app_list.haveRequest())
+    {
+        HMI_SEQ_DEBUG(req_num, "Process next request");
+        WMError rc = doTransition(req_num);
+        if (rc != WMError::SUCCESS)
+        {
+            HMI_SEQ_ERROR(req_num, errorDescription(rc));
+        }
+    }
+    else
+    {
+        HMI_SEQ_DEBUG(req_num, "Nothing Request. Waiting Request");
+    }
+}
+
 void App::api_ping() { this->dispatch_pending_events(); }
 
 void App::send_event(char const *evname, char const *label)
@@ -1185,6 +1340,14 @@ void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w
     this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
 }
 
+void App::emit_syncdraw(const std::string &role, const std::string &area)
+{
+    compositor::rect rect = this->layers.getAreaSize(area);
+    //this->lm_get_area_info(area, &x, &y, &w, &h);
+    this->send_event(kListEventName[Event_SyncDraw],
+        role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+}
+
 void App::emit_flushdraw(char const *label)
 {
     this->send_event(kListEventName[Event_FlushDraw], label);
@@ -1362,8 +1525,11 @@ void App::activate(int id)
         char const *label =
             this->lookup_name(id).value_or("unknown-name").c_str();
 
-        // FOR CES DEMO >>>
-        if ((0 == strcmp(label, "Radio")) || (0 == strcmp(label, "MediaPlayer")) || (0 == strcmp(label, "Music")) || (0 == strcmp(label, "Navigation")))
+         // FOR CES DEMO >>>
+        if ((0 == strcmp(label, "Radio"))       ||
+            (0 == strcmp(label, "MediaPlayer")) ||
+            (0 == strcmp(label, "Music"))       ||
+            (0 == strcmp(label, "Navigation")))
         {
             for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i)
             {
diff --git a/src/app.hpp b/src/app.hpp
index a91654d..047436b 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -233,11 +233,11 @@ struct App
     void surface_created(uint32_t surface_id);
     void surface_removed(uint32_t surface_id);
 
+    void removeClient(const std::string &appid);
+    bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname);
     // Do not use this function
     //static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
     void timerHandler();
-    void removeClient(const std::string &appid);
-    bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname);
 
   private:
     optional<int> lookup_id(char const *name);
@@ -250,24 +250,37 @@ struct App
 
     int init_layers();
 
-    void surface_set_layout(int surface_id, optional<int> sub_surface_id = nullopt);
+    void surface_set_layout(int surface_id, const std::string& area = "");
     void layout_commit();
 
     // TMC WM Events to clients
     void emit_activated(char const *label);
     void emit_deactivated(char const *label);
     void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
+    void emit_syncdraw(const std::string &role, const std::string &area);
     void emit_flushdraw(char const *label);
     void emit_visible(char const *label, bool is_visible);
     void emit_invisible(char const *label);
     void emit_visible(char const *label);
 
-    WMError do_transition(unsigned sequence_number);
+    WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
+                             Task task, unsigned *req_num);
+    WMError doTransition(unsigned sequence_number);
+    WMError checkPolicy(unsigned req_num);
+    WMError startTransition(unsigned req_num);
+    WMError setInvisibleTask(const std::string &role, bool split);
+
+    WMError doEndDraw(unsigned req_num);
+    WMError layoutChange(const WMAction &action);
+    WMError visibilityChange(const WMAction &action);
+    WMError setSurfaceSize(unsigned surface, const std::string& area);
+    WMError changeCurrentState(unsigned req_num);
+
+    void
+    setTimer();
+    void stopTimer();
+    void processNextRequest();
 
-    void do_enddraw(unsigned req_num);
-    void process_request();
-    void set_timer();
-    void stop_timer();
     const char *check_surface_exist(const char *drawing_name);
 
     void activate(int id);
@@ -281,10 +294,10 @@ struct App
 
     // The following function is temporary.
     // Then will be removed when layermanager is finished
-    void lm_layout_change(const char *drawing_name);
-    WMError lm_layout_change(const struct WMAction &action);
     WMError lm_release(const struct WMAction &action);
-    void lm_enddraw(const char *drawing_name);
+
+  private:
+    std::unordered_map<std::string, struct compositor::rect> area2size;
 };
 
 } // namespace wm
diff --git a/src/applist.cpp b/src/applist.cpp
index 919c099..5ca82fe 100644
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -41,8 +41,8 @@ AppList::AppList()
       app2client(),
       current_req(1)
 {
-    app2client.reserve(kReserveClientSize);
-    req_list.reserve(kReserveReqSize);
+    this->app2client.reserve(kReserveClientSize);
+    this->req_list.reserve(kReserveReqSize);
 }
 
 AppList::~AppList() {}
@@ -67,7 +67,7 @@ AppList::~AppList() {}
  */
 void AppList::addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     shared_ptr<WMClient> client = std::make_shared<WMClient>(appid, layer, surface, role);
     this->app2client[appid] = client;
     this->clientDump();
@@ -80,7 +80,7 @@ void AppList::addClient(const std::string &appid, unsigned layer, unsigned surfa
  */
 void AppList::removeClient(const string &appid)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     this->app2client.erase(appid);
     HMI_INFO("wm", "Remove client %s", appid.c_str());
 }
@@ -97,15 +97,21 @@ bool AppList::contains(const string &appid) const
     return (this->app2client.end() != result) ? true : false;
 }
 
-void AppList::removeSurface(unsigned surface_id){
+/**
+ * Remove surface from client
+ *
+ * @param     unsigned[in] surface id.
+ * @return    None
+ */
+void AppList::removeSurface(unsigned surface){
     // This function may be very slow
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     bool ret = false;
     for (auto &x : this->app2client)
     {
-        ret = x.second->removeSurfaceIfExist(surface_id);
+        ret = x.second->removeSurfaceIfExist(surface);
         if(ret){
-            HMI_DEBUG("wm", "remove surface %d from Client %s finish", surface_id, x.second->appID().c_str());
+            HMI_DEBUG("wm", "remove surface %d from Client %s finish", surface, x.second->appID().c_str());
             break;
         }
     }
@@ -221,7 +227,7 @@ unsigned AppList::getRequestNumber(const string &appid) const
  */
 unsigned AppList::addAllocateRequest(WMRequest req)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     if (this->req_list.size() == 0)
     {
         req.req_num = current_req;
@@ -305,7 +311,7 @@ const vector<struct WMAction> &AppList::getActions(unsigned req_num, bool* found
  */
 WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     WMError result = WMError::FAIL;
     for (auto &x : this->req_list)
     {
@@ -337,16 +343,16 @@ WMError AppList::setAction(unsigned req_num, const struct WMAction &action)
  * @param     string[in]   application id
  * @param     string[in]   role
  * @param     string[in]   area
- * @param     bool[in]     the role should be visible or not.
+ * @param     Task[in]     the role should be visible or not.
  * @return    WMError If request number is not valid, FAIL will be returned.
  * @attention This function set action with parameters, then caller doesn't need to create WMAction object.
  *            If visible is true, it means app should be visible, so enddraw_finished parameter will be false.
  *            otherwise (visible is false) app should be invisible. Then enddraw_finished param is set to true.
  *            This function doesn't support actions for focus yet.
  */
-WMError AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, bool visible)
+WMError AppList::setAction(unsigned req_num, const string &appid, const string &role, const string &area, TaskVisible visible)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     WMError result = WMError::FAIL;
     for (auto &x : req_list)
     {
@@ -354,7 +360,8 @@ WMError AppList::setAction(unsigned req_num, const string &appid, const string &
         {
             continue;
         }
-        bool edraw_f = (visible) ? false : true;
+        // If visible task is not invisible, redraw is required -> true
+        bool edraw_f = (visible != TaskVisible::INVISIBLE) ? false : true;
         WMAction action{appid, role, area, visible, edraw_f};
 
         x.sync_draw_req.push_back(action);
@@ -379,7 +386,7 @@ WMError AppList::setAction(unsigned req_num, const string &appid, const string &
  */
 bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const string &role)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     bool result = false;
     for (auto &x : req_list)
     {
@@ -393,6 +400,7 @@ bool AppList::setEndDrawFinished(unsigned req_num, const string &appid, const st
             {
                 if (y.appid == appid && y.role == role)
                 {
+                    HMI_SEQ_INFO(req_num, "Role %s finish redraw", y.role.c_str());
                     y.end_draw_finished = true;
                     result = true;
                 }
@@ -443,7 +451,7 @@ bool AppList::endDrawFullfilled(unsigned req_num)
  */
 void AppList::removeRequest(unsigned req_num)
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     this->req_list.erase(remove_if(this->req_list.begin(), this->req_list.end(),
                                    [req_num](WMRequest x) {
                                        return x.req_num == req_num;
@@ -458,7 +466,7 @@ void AppList::removeRequest(unsigned req_num)
  */
 void AppList::next()
 {
-    std::lock_guard<std::mutex> lock(mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
     ++this->current_req;
     if (0 == this->current_req)
     {
@@ -494,7 +502,7 @@ void AppList::reqDump()
     DUMP("current request : %d", current_req);
     for (const auto &x : req_list)
     {
-        DUMP("requested with  : %d", x.req_num);
+        DUMP("requested       : %d", x.req_num);
         DUMP("Trigger : (APPID :%s, ROLE :%s, AREA :%s, TASK: %d)",
              x.trigger.appid.c_str(),
              x.trigger.role.c_str(),
@@ -504,10 +512,11 @@ void AppList::reqDump()
         for (const auto &y : x.sync_draw_req)
         {
             DUMP(
-                "Action  : (APPID :%s, ROLE :%s, AREA :%s, END_DRAW_FINISHED: %d)",
+                "Action  : (APPID :%s, ROLE :%s, AREA :%s, VISIBLE : %s, END_DRAW_FINISHED: %d)",
                 y.appid.c_str(),
                 y.role.c_str(),
                 y.area.c_str(),
+                (y.visible == TaskVisible::INVISIBLE) ? "invisible" : "visible",
                 y.end_draw_finished);
         }
     }
diff --git a/src/applist.hpp b/src/applist.hpp
index 6305a4b..9431ff6 100644
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -55,7 +55,7 @@ class AppList
     unsigned getRequestNumber(const std::string &appid) const;
     unsigned addAllocateRequest(WMRequest req);
     WMError setAction(unsigned req_num, const struct WMAction &action);
-    WMError setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
+    WMError setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, TaskVisible visible);
     bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);
     bool endDrawFullfilled(unsigned req_num);
     void removeRequest(unsigned req_num);
diff --git a/src/layers.cpp b/src/layers.cpp
index af8d89e..f5f7a89 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -194,4 +194,58 @@ json layer_map::to_json() const
       return j;
 }
 
+void layer_map::setupArea(int output_w, int output_h)
+{
+    compositor::rect rct;
+    // setup normal.full
+    std::string area = "normal.full";
+    std::string role = "Fallback";
+    auto l_id = this->get_layer_id(role);
+    auto l = this->get_layer(*l_id);
+    rct = l->rect;
+    if(rct.w < 0)
+        rct.w = output_w + 1 + rct.w;
+    if(rct.h < 0)
+        rct.h = output_h + 1 + rct.h;
+    this->area2size[area] = rct;
+    this->area2size["normalfull"] = rct;
+
+    // setup split.main
+    area = "split.main";
+    rct.h = rct.h / 2;
+    this->area2size[area] = rct;
+
+    // setup split.sub
+    area = "split.sub";
+    rct.y = rct.y + rct.h;
+    this->area2size[area] = rct;
+
+    // setup homescreen
+    area = "fullscreen";
+    role = "HomeScreen";
+    rct = compositor::full_rect;
+    if (rct.w <= 0)
+        rct.w = output_w + rct.w + 1;
+    if (rct.h <= 0)
+        rct.h = output_h + rct.h + 1;
+    this->area2size[area] = rct;
+
+    // setup onscreen
+    area = "onscreen";
+    role = "OnScreen";
+    auto ons_id = this->get_layer_id(role);
+    auto l_ons = this->get_layer(*ons_id);
+    rct = l_ons->rect;
+    if (rct.w < 0)
+        rct.w = output_w + 1 + rct.w;
+    if (rct.h < 0)
+        rct.h = output_h + 1 + rct.h;
+    this->area2size[area] = rct;
+}
+
+compositor::rect layer_map::getAreaSize(const std::string &area)
+{
+    return area2size[area];
+}
+
 } // namespace wm
diff --git a/src/layers.hpp b/src/layers.hpp
index 5479c3a..c01d45e 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -117,6 +117,11 @@ struct layer_map
     }
 
     json to_json() const;
+    void setupArea(int output_w, int output_h);
+    compositor::rect getAreaSize(const std::string &area);
+
+  private:
+    std::unordered_map<std::string, compositor::rect> area2size;
 };
 
 struct result<struct layer_map> to_layer_map(nlohmann::json const &j);
diff --git a/src/request.hpp b/src/request.hpp
index ded2c02..6b2bda1 100644
--- a/src/request.hpp
+++ b/src/request.hpp
@@ -30,6 +30,13 @@ enum Task
     TASK_INVALID
 };
 
+enum TaskVisible
+{
+    VISIBLE,
+    INVISIBLE,
+    NO_CHANGE
+};
+
 struct WMTrigger
 {
     std::string appid;
@@ -43,7 +50,7 @@ struct WMAction
     std::string appid;
     std::string role;
     std::string area;
-    bool visible;
+    TaskVisible visible;
     bool end_draw_finished;
 };
 
diff --git a/src/wm_client.cpp b/src/wm_client.cpp
index 6f1aa20..e226791 100644
--- a/src/wm_client.cpp
+++ b/src/wm_client.cpp
@@ -84,12 +84,23 @@ unsigned WMClient::surfaceID(const string &role) const
 {
     if (0 == this->role2surface.count(role))
     {
-        HMI_WARNING("wm", "invalid role");
+        HMI_NOTICE("wm", "invalid role %s : appID : %s", role.c_str(), this->id.c_str());
         return INVALID_SURFACE_ID;
     }
     return this->role2surface.at(role);
 }
 
+std::string WMClient::role(unsigned surface) const
+{
+    for(const auto& [key, value] : this->role2surface)
+    {
+        if(value == surface){
+            return key;
+        }
+    }
+    return std::string("");
+}
+
 unsigned WMClient::layerID() const
 {
     return this->layer;
diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 5fa9444..e1ef75b 100644
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -46,6 +46,7 @@ class WMClient
     std::string appID() const;
     unsigned surfaceID(const std::string &role) const;
     unsigned layerID() const;
+    std::string role(unsigned surface) const;
     void registerLayer(unsigned layer);
     bool addSurface(const std::string& role, unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
diff --git a/src/wm_error.cpp b/src/wm_error.cpp
index 460b166..694a7d0 100644
--- a/src/wm_error.cpp
+++ b/src/wm_error.cpp
@@ -36,6 +36,8 @@ const char *errorDescription(WMError enum_error_number)
             return "Layout change fails, due to some reasons";
         case NO_ENTRY:
             return "No element";
+        case NO_LAYOUT_CHANGE:
+            return "No layout change(deactivate only)";
         default:
             return "Unknown error number. Window manager bug.";
     }
diff --git a/src/wm_error.hpp b/src/wm_error.hpp
index 155d791..c4c61b4 100644
--- a/src/wm_error.hpp
+++ b/src/wm_error.hpp
@@ -29,6 +29,7 @@ typedef enum WINDOWMANAGER_ERROR
     NOT_REGISTERED,
     LAYOUT_CHANGE_FAIL,
     NO_ENTRY,
+    NO_LAYOUT_CHANGE,
     UNKNOWN,
     ERR_MAX = UNKNOWN
 }