X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=f311bcfc27ebec549691a62fa557c6fc41ebce94;hb=81a6d5f63b77f2ffaeef25cea30d2ecc486c7426;hp=d44986ed3f08a493be11276b9881b5b77fabbf38;hpb=1be43a5f46ffe04d530e093077337c6582fd81d1;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index d44986e..f311bcf 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -46,7 +46,7 @@ extern "C"
 namespace wm
 {
 
-const unsigned kTimeOut = 10000000UL; /* 10s */
+static const unsigned kTimeOut = 3000000UL; /* 3s */
 
 /* DrawingArea name used by "{layout}.{area}" */
 const char kNameLayoutNormal[] = "normal";
@@ -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)
@@ -138,6 +133,15 @@ void App::removeClient(const std::string &appid)
     g_app_list.removeClient(appid);
 }
 
+void App::exeptionProcessForTransition()
+{
+    unsigned req_num = g_app_list.currentRequestNumber();
+    HMI_SEQ_NOTICE(req_num, "Process exeption handling for request. Remove current request %d", req_num);
+    g_app_list.removeRequest(req_num);
+    HMI_SEQ_NOTICE(g_app_list.currentRequestNumber(), "Process next request if exists");
+    this->processNextRequest();
+}
+
 bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname)
 {
     if(!g_app_list.contains(appid)){
@@ -319,10 +323,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 +347,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 +368,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,14 +390,14 @@ 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)
     {
         // firsttime set into sd_event
         int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
-                                    CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
+            CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
         if (ret < 0)
         {
             HMI_ERROR("wm", "Could't set timer");
@@ -442,7 +411,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");
@@ -513,7 +482,8 @@ WMError App::lm_release(const struct WMAction &action)
                     state = nl;
 
                     this->layout_commit();
-                    std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
+                    std::string str_area =
+                        std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
                     compositor::rect area_rect = this->area_info[state.sub];
                     this->emit_syncdraw(sub.c_str(), str_area.c_str(),
                                         area_rect.x, area_rect.y, area_rect.w, area_rect.h);
@@ -540,49 +510,38 @@ WMError App::lm_release(const struct WMAction &action)
                 state = nl;
 
                 this->layout_commit();
-                std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
+                std::string str_area =
+                    std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull);
                 compositor::rect area_rect = this->area_info[state.main];
                 this->emit_syncdraw(main.c_str(), str_area.c_str(),
-                                    area_rect.x, area_rect.y, area_rect.w, area_rect.h);
+                            area_rect.x, area_rect.y, area_rect.w, area_rect.h);
                 this->enqueue_flushdraw(state.main);
             });
     }
     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());
-
-    if (msg)
-    {
-        HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg);
-        return WMError::LAYOUT_CHANGE_FAIL;
-    }
-    this->lm_layout_change(action.role.c_str());
-    return WMError::SUCCESS;
-}
-
-WMError App::do_transition(unsigned req_num)
-{
-    HMI_SEQ_DEBUG(req_num, "check next state");
-    WMError ret = this->check_policy(req_num);
+    HMI_SEQ_DEBUG(req_num, "check policy");
+    WMError ret = this->checkPolicy(req_num);
     if (ret != WMError::SUCCESS)
     {
         return ret;
     }
     HMI_SEQ_DEBUG(req_num, "Start transition.");
-    ret = this->start_transition(req_num);
+    ret = this->startTransition(req_num);
     return ret;
 }
 
-WMError App::check_policy(unsigned req_num)
+WMError App::checkPolicy(unsigned req_num)
 {
     /*
     * Check Policy
     */
     // get current trigger
-    bool found;
+    bool found = false;
+    bool split = false;
     WMError ret = WMError::LAYOUT_CHANGE_FAIL;
     auto trigger = g_app_list.getRequest(req_num, &found);
     if (!found)
@@ -590,17 +549,17 @@ WMError App::check_policy(unsigned req_num)
         ret = WMError::NO_ENTRY;
         return ret;
     }
-    bool is_activate = (trigger.task == Task::TASK_ALLOCATE);
     std::string req_area = trigger.area;
 
     // >>>> Compatible with current window manager until policy manager coming
-    if (is_activate)
+    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());
 
         if (msg)
         {
-            HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), msg);
+            HMI_SEQ_ERROR(req_num, msg);
             ret = WMError::LAYOUT_CHANGE_FAIL;
             return ret;
         }
@@ -610,16 +569,19 @@ WMError App::check_policy(unsigned req_num)
         struct LayoutState &state = *o_state;
 
         unsigned curernt_sid = state.main;
-        bool can_split = this->can_split(state, *surface_id);
+        split = this->can_split(state, *surface_id);
 
-        if (can_split)
+        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)
@@ -631,7 +593,14 @@ WMError App::check_policy(unsigned req_num)
             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
-            WMError ret = g_app_list.setAction(req_num, add_name, add_role, add_area);
+            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");
@@ -640,18 +609,37 @@ WMError App::check_policy(unsigned req_num)
             g_app_list.reqDump();
         }
     }
-    // >>>> This will be removed
+    else
+    {
+        HMI_SEQ_DEBUG(req_num, "split doesn't happen");
+    }
+
+    // Set invisible task(Remove if policy manager finish)
+    ret = this->setInvisibleTask(trigger.role, split);
+    if(ret != WMError::SUCCESS)
+    {
+        HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret));
+        return ret;
+    }
 
     /*  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, is_activate);
+    ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible);
     g_app_list.reqDump();
 
     return ret;
 }
 
-WMError App::start_transition(unsigned req_num)
+WMError App::startTransition(unsigned req_num)
 {
     bool sync_draw_happen = false;
     bool found = false;
@@ -660,16 +648,17 @@ WMError App::start_transition(unsigned req_num)
     if (!found)
     {
         ret = WMError::NO_ENTRY;
-        HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret));
+        HMI_SEQ_ERROR(req_num,
+            "Window Manager bug :%s : Action is not set", errorDescription(ret));
         return ret;
     }
 
-    for (const auto &y : actions)
+    for (const auto &action : actions)
     {
-        if (y.visible)
+        if (action.visible != TaskVisible::INVISIBLE)
         {
             sync_draw_happen = true;
-            this->emit_syncdraw(y.role, y.area);
+            this->emit_syncdraw(action.role, action.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); */
@@ -678,18 +667,18 @@ WMError App::start_transition(unsigned req_num)
 
     if (sync_draw_happen)
     {
-        this->set_timer();
+        this->setTimer();
     }
     else
     {
         // deactivate only, no syncDraw
         // Make it deactivate here
-        for (const auto &z : actions)
+        for (const auto &x : actions)
         {
-            if (g_app_list.contains(z.appid))
+            if (g_app_list.contains(x.appid))
             {
-                auto client = g_app_list.lookUpClient(z.appid);
-                this->deactivate(client->surfaceID(z.role));
+                auto client = g_app_list.lookUpClient(x.appid);
+                this->deactivate(client->surfaceID(x.role));
             }
         }
         ret = NO_LAYOUT_CHANGE;
@@ -697,160 +686,157 @@ WMError App::start_transition(unsigned req_num)
     return ret;
 }
 
-void App::lm_layout_change(const char *drawing_name)
+WMError App::setInvisibleTask(const std::string &role, bool split)
 {
+    unsigned req_num = g_app_list.currentRequestNumber();
+    HMI_SEQ_DEBUG(req_num, "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_num, "Invisible %s", add_name.c_str());
+            WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
+            g_app_list.setAction(req_num, 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_num, "Invisible %s", add_name.c_str());
+            WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
+            g_app_list.setAction(req_num, 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_num, "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_num, "sub surface doesn't exist");
+                        g_app_list.setAction(req_num, 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_num, "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_num, "sub surface doesn't exist");
+                    g_app_list.setAction(req_num, 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_num, "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_num, "sub surface doesn't exist");
+                        g_app_list.setAction(req_num, deact_sub);
+                    }
+                }
+                //state = LayoutState{*surface_id};
             }
         }
     }
+    return WMError::SUCCESS;
 }
 
 const char *App::check_surface_exist(const char *drawing_name)
@@ -889,7 +875,7 @@ const char *App::check_surface_exist(const char *drawing_name)
     //reply(nullptr);
 }
 
-WMError App::set_request(const std::string& appid, const std::string &role, const std::string &area,
+WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area,
                             Task task, unsigned* req_num)
 {
     if (!g_app_list.contains(appid))
@@ -906,12 +892,13 @@ WMError App::set_request(const std::string& appid, const std::string &role, cons
     unsigned requested_num = g_app_list.getRequestNumber(appid);
     if (requested_num != 0)
     {
-        HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str());
+        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(appid, role, area, task);
-    unsigned new_req = g_app_list.addAllocateRequest(req);
+    unsigned new_req = g_app_list.addRequest(req);
     *req_num = new_req;
     g_app_list.reqDump();
 
@@ -920,7 +907,8 @@ WMError App::set_request(const std::string& appid, const std::string &role, cons
     return WMError::SUCCESS;
 }
 
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+void App::api_activate_surface(char const *appid, char const *drawing_name,
+                               char const *drawing_area, const reply_func &reply)
 {
     ST();
 
@@ -931,7 +919,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char
     unsigned req_num = 0;
     WMError ret = WMError::UNKNOWN;
 
-    ret = this->set_request(id, role, area, task, &req_num);
+    ret = this->setRequest(id, role, area, task, &req_num);
 
     if(ret != WMError::SUCCESS)
     {
@@ -951,19 +939,19 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char
     /*
     * Do allocate tasks
     */
-    ret = this->do_transition(req_num);
+    ret = this->doTransition(req_num);
 
     if (ret != WMError::SUCCESS)
     {
         //this->emit_error()
         HMI_SEQ_ERROR(req_num, errorDescription(ret));
         g_app_list.removeRequest(req_num);
-        g_app_list.next();
-        g_app_list.reqDump();
+        this->processNextRequest();
     }
 }
 
-void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply)
+void App::api_deactivate_surface(char const *appid, char const *drawing_name,
+                                 const reply_func &reply)
 {
     ST();
 
@@ -973,51 +961,38 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co
     std::string id = appid;
     std::string role = drawing_name;
     std::string area = ""; //drawing_area;
+    Task task = Task::TASK_RELEASE;
+    unsigned req_num = 0;
+    WMError ret = WMError::UNKNOWN;
 
-    if (!g_app_list.contains(id))
-    {
-        reply("app doesn't request 'requestSurface' yet");
-        return;
-    }
-    auto client = g_app_list.lookUpClient(id);
+    ret = this->setRequest(id, role, area, task, &req_num);
 
-    /*
-   * Queueing Phase
-   */
-    unsigned current = g_app_list.currentRequestNumber();
-    unsigned requested_num = g_app_list.getRequestNumber(id);
-    if (requested_num != 0)
+    if (ret != WMError::SUCCESS)
     {
-        HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str());
-        reply("already requested");
+        HMI_ERROR("wm", errorDescription(ret));
+        reply("Failed to set request");
         return;
     }
 
-    WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE);
-    unsigned new_req = g_app_list.addAllocateRequest(req);
-    g_app_list.reqDump();
-
-    HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
-
     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));
-        g_app_list.removeRequest(new_req);
-        g_app_list.next();
         //this->emit_error()
+        HMI_SEQ_ERROR(req_num, errorDescription(ret));
+        g_app_list.removeRequest(req_num);
+        this->processNextRequest();
     }
 }
 
@@ -1044,89 +1019,210 @@ 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)
+    {
+        if(act_flush.visible != TaskVisible::INVISIBLE)
+        {
+            this->emit_flushdraw(act_flush.role.c_str());
+        }
+    }
+
+    return ret;
+}
+
+WMError App::setSurfaceSize(unsigned surface, const std::string &area)
+{
+    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
     {
-        // emit flush Draw
-        //emitFlushDrawToAll(&g_app_list, req_num);
-        // emit status change event
-    } while (!g_app_list.requestFinished());*/
+        this->deactivate(surface); // Layout Manager task
+    }
+    return WMError::SUCCESS;
 }
 
-void App::process_request()
+WMError App::changeCurrentState(unsigned req_num)
 {
-    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));
+    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
     {
@@ -1135,6 +1231,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)
@@ -1231,10 +1347,10 @@ void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w
 
 void App::emit_syncdraw(const std::string &role, const std::string &area)
 {
-    int x = 0, y = 0, w = 0, h = 0;
+    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(), x, y, w, h);
+        role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
 }
 
 void App::emit_flushdraw(char const *label)
@@ -1414,8 +1530,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)
             {