[Local]: Lock Sequence from activateSurface to flushDraw

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

9 files changed, 1275 insertions, 989 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5acb669
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build
+.vscode
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 248a058..f2ae36b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,7 +45,8 @@ add_library(${TARGETS_WM} MODULE
    config.hpp
    policy.hpp
    windowmanager-client.cpp
-   allocate_queue.cpp)
+   applist.cpp
+   request.cpp)
 
 target_include_directories(${TARGETS_WM}
     PRIVATE
diff --git a/src/allocate_queue.cpp b/src/allocate_queue.cpp
deleted file mode 100644
index 14bf6f5..0000000
--- a/src/allocate_queue.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "allocate_queue.hpp"
-#include <algorithm>
-
-using std::string;
-
-namespace wm {
-
-
-AllocateRequestList::AllocateRequestList(){}
-AllocateRequestList::~AllocateRequestList(){}
-
-bool AllocateRequestList::addClient(WMClient* client){
-    return true;
-}
-
-void AllocateRequestList::removeClient(const string &appid){
-}
-
-WMClient* AllocateRequestList::lookUpClient(const string &appid){
-    return nullptr;
-}
-
-unsigned AllocateRequestList::getSequenceNumber(const string &appid, const string &role, const string &area){
-    return 0;
-}
-
-unsigned AllocateRequestList::addAllocateRequest(WMRequest req){
-    return 1;
-}
-
-bool AllocateRequestList::requestFinished(){
-    return true;
-}
-
-unsigned AllocateRequestList::lookUpAllocatingApp(const char *appid){
-    return 1;
-}
-
-void AllocateRequestList::setEndDrawFinished(unsigned request_seq, const string &role){
-
-}
-
-bool AllocateRequestList::endDrawFullfilled(unsigned request_seq){
-    return false;
-}
-
-void AllocateRequestList::removeRequest(unsigned req_seq){
-
-}
-
-void AllocateRequestList::setCurrentSequence(unsigned req_seq){
-    this->seq_num = req_seq;
-    if(0 == this->seq_num){
-       this->seq_num = 1;
-   }
-}
-
-bool AllocateRequestList::haveRequest(){
-    return true;
-}
-
-}
\ No newline at end of file
diff --git a/src/app.cpp b/src/app.cpp
index ce41827..4ec4059 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -36,385 +36,464 @@
 #include <thread>
 
 #include "windowmanager-client.hpp"
-#include "allocate_queue.hpp"
+#include "applist.hpp"
 
-extern "C" {
-    #include <systemd/sd-event.h>
+extern "C"
+{
+#include <systemd/sd-event.h>
 }
 
-#define TIME_OUT    1000000UL	/* 1s */
+namespace wm
+{
 
-namespace wm {
+const unsigned TIME_OUT = 1000000UL; /* 1s */
 
 /* DrawingArea name used by "{layout}.{area}" */
 const char kNameLayoutNormal[] = "normal";
-const char kNameLayoutSplit[]  = "split";
-const char kNameAreaFull[]     = "full";
-const char kNameAreaMain[]     = "main";
-const char kNameAreaSub[]      = "sub";
+const char kNameLayoutSplit[] = "split";
+const char kNameAreaFull[] = "full";
+const char kNameAreaMain[] = "main";
+const char kNameAreaSub[] = "sub";
 
 /* Key for json obejct */
 const char kKeyDrawingName[] = "drawing_name";
 const char kKeyDrawingArea[] = "drawing_area";
 const char kKeyDrawingRect[] = "drawing_rect";
-const char kKeyX[]           = "x";
-const char kKeyY[]           = "y";
-const char kKeyWidth[]       = "width";
-const char kKeyHeight[]      = "height";
-const char kKeyWidthPixel[]  = "width_pixel";
+const char kKeyX[] = "x";
+const char kKeyY[] = "y";
+const char kKeyWidth[] = "width";
+const char kKeyHeight[] = "height";
+const char kKeyWidthPixel[] = "width_pixel";
 const char kKeyHeightPixel[] = "height_pixel";
-const char kKeyWidthMm[]     = "width_mm";
-const char kKeyHeightMm[]    = "height_mm";
+const char kKeyWidthMm[] = "width_mm";
+const char kKeyHeightMm[] = "height_mm";
 
 static const std::string task_allocate = "allocate";
 static const std::string task_release = "release";
 static sd_event_source *timer_ev_src = nullptr;
 
-static AllocateRequestList allocate_list;
+static AppList app_list;
 
-namespace {
+namespace
+{
 
 using nlohmann::json;
 
-result<json> file_to_json(char const *filename) {
-   json j;
-   std::ifstream i(filename);
-   if (i.fail()) {
-      HMI_DEBUG("wm", "Could not open config file, so use default layer information");
-      j = default_layers_json;
-   }
-   else {
-      i >> j;
-   }
-
-   return Ok(j);
+result<json> file_to_json(char const *filename)
+{
+    json j;
+    std::ifstream i(filename);
+    if (i.fail())
+    {
+        HMI_DEBUG("wm", "Could not open config file, so use default layer information");
+        j = default_layers_json;
+    }
+    else
+    {
+        i >> j;
+    }
+
+    return Ok(j);
 }
 
-struct result<layer_map> load_layer_map(char const *filename) {
-   HMI_DEBUG("wm", "loading IDs from %s", filename);
+struct result<layer_map> load_layer_map(char const *filename)
+{
+    HMI_DEBUG("wm", "loading IDs from %s", filename);
 
-   auto j = file_to_json(filename);
-   if (j.is_err()) {
-      return Err<layer_map>(j.unwrap_err());
-   }
-   json jids = j.unwrap();
+    auto j = file_to_json(filename);
+    if (j.is_err())
+    {
+        return Err<layer_map>(j.unwrap_err());
+    }
+    json jids = j.unwrap();
 
-   return to_layer_map(jids);
+    return to_layer_map(jids);
 }
 
-
-static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata){
+static int
+processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
+{
     HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request");
     reinterpret_cast<wm::App *>(userdata)->timerHandler();
     return 0;
 }
 
-}  // namespace
+} // namespace
 
-void App::timerHandler(){
+void App::timerHandler()
+{
     // TODO: write reset process
-    unsigned seq = allocate_list.currentSequenceNumber();
-    allocate_list.removeRequest(seq);
+    unsigned seq = app_list.currentSequenceNumber();
+    app_list.removeRequest(seq);
 }
 
 /**
  * App Impl
  */
 App::App(wl::display *d)
-   : chooks{this},
-     display{d},
-     controller{},
-     outputs(),
-     config(),
-     layers(),
-     id_alloc{},
-     pending_events(false),
-     policy{} {
-   try {
-      {
-         auto l = load_layer_map(
-            this->config.get_string("layers.json").value().c_str());
-         if (l.is_ok()) {
-            this->layers = l.unwrap();
-         } else {
-            HMI_ERROR("wm", "%s", l.err().value());
-         }
-      }
-   } catch (std::exception &e) {
-      HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
-   }
+    : chooks{this},
+      display{d},
+      controller{},
+      outputs(),
+      config(),
+      layers(),
+      id_alloc{},
+      pending_events(false),
+      policy{}
+{
+    try
+    {
+        {
+            auto l = load_layer_map(
+                this->config.get_string("layers.json").value().c_str());
+            if (l.is_ok())
+            {
+                this->layers = l.unwrap();
+            }
+            else
+            {
+                HMI_ERROR("wm", "%s", l.err().value());
+            }
+        }
+    }
+    catch (std::exception &e)
+    {
+        HMI_ERROR("wm", "Loading of configuration failed: %s", e.what());
+    }
 }
 
-int App::init() {
-   if (!this->display->ok()) {
-      return -1;
-   }
-
-   if (this->layers.mapping.empty()) {
-      HMI_ERROR("wm", "No surface -> layer mapping loaded");
-      return -1;
-   }
-
-   // Make afb event
-   for (int i=Event_Val_Min; i<=Event_Val_Max; i++) {
-      map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]);
-   }
-
-   this->display->add_global_handler(
-      "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) {
-         this->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
-      });
-
-   this->display->add_global_handler(
-      "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) {
-         this->controller =
-            std::make_unique<struct compositor::controller>(r, name, v);
-
-         // Init controller hooks
-         this->controller->chooks = &this->chooks;
-
-         // This protocol needs the output, so lets just add our mapping here...
-         this->controller->add_proxy_to_id_mapping(
-            this->outputs.back()->proxy.get(),
-            wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
-               this->outputs.back()->proxy.get())));
-
-         // Create screen
-         this->controller->create_screen(this->outputs.back()->proxy.get());
-
-         // Set display to controller
-         this->controller->display = this->display;
-      });
-
-   // First level objects
-   this->display->roundtrip();
-   // Second level objects
-   this->display->roundtrip();
-   // Third level objects
-   this->display->roundtrip();
-
-   return init_layers();
+int App::init()
+{
+    if (!this->display->ok())
+    {
+        return -1;
+    }
+
+    if (this->layers.mapping.empty())
+    {
+        HMI_ERROR("wm", "No surface -> layer mapping loaded");
+        return -1;
+    }
+
+    // Make afb event
+    for (int i = Event_Val_Min; i <= Event_Val_Max; i++)
+    {
+        map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]);
+    }
+
+    this->display->add_global_handler(
+        "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) {
+            this->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+        });
+
+    this->display->add_global_handler(
+        "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) {
+            this->controller =
+                std::make_unique<struct compositor::controller>(r, name, v);
+
+            // Init controller hooks
+            this->controller->chooks = &this->chooks;
+
+            // This protocol needs the output, so lets just add our mapping here...
+            this->controller->add_proxy_to_id_mapping(
+                this->outputs.back()->proxy.get(),
+                wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
+                    this->outputs.back()->proxy.get())));
+
+            // Create screen
+            this->controller->create_screen(this->outputs.back()->proxy.get());
+
+            // Set display to controller
+            this->controller->display = this->display;
+        });
+
+    // First level objects
+    this->display->roundtrip();
+    // Second level objects
+    this->display->roundtrip();
+    // Third level objects
+    this->display->roundtrip();
+
+    return init_layers();
 }
 
-int App::dispatch_pending_events() {
-   if (this->pop_pending_events()) {
-      this->display->dispatch_pending();
-      return 0;
-   }
-   return -1;
+int App::dispatch_pending_events()
+{
+    if (this->pop_pending_events())
+    {
+        this->display->dispatch_pending();
+        return 0;
+    }
+    return -1;
 }
 
-bool App::pop_pending_events() {
-   bool x{true};
-   return this->pending_events.compare_exchange_strong(
-      x, false, std::memory_order_consume);
+bool App::pop_pending_events()
+{
+    bool x{true};
+    return this->pending_events.compare_exchange_strong(
+        x, false, std::memory_order_consume);
 }
 
-void App::set_pending_events() {
-   this->pending_events.store(true, std::memory_order_release);
+void App::set_pending_events()
+{
+    this->pending_events.store(true, std::memory_order_release);
 }
 
-optional<int> App::lookup_id(char const *name) {
-   return this->id_alloc.lookup(std::string(name));
+optional<int> App::lookup_id(char const *name)
+{
+    return this->id_alloc.lookup(std::string(name));
 }
-optional<std::string> App::lookup_name(int id) {
-   return this->id_alloc.lookup(id);
+optional<std::string> App::lookup_name(int id)
+{
+    return this->id_alloc.lookup(id);
 }
 
 /**
  * init_layers()
  */
-int App::init_layers() {
-   if (!this->controller) {
-      HMI_ERROR("wm", "ivi_controller global not available");
-      return -1;
-   }
-
-   if (this->outputs.empty()) {
-      HMI_ERROR("wm", "no output was set up!");
-      return -1;
-   }
-
-   auto &c = this->controller;
-
-   auto &o = this->outputs.front();
-   auto &s = c->screens.begin()->second;
-   auto &layers = c->layers;
-
-   // Write output dimensions to ivi controller...
-   c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
-   c->physical_size = compositor::size{uint32_t(o->physical_width),
-                                       uint32_t(o->physical_height)};
-
-   // Clear scene
-   layers.clear();
-
-   // Clear screen
-   s->clear();
-
-   // Quick and dirty setup of layers
-   for (auto const &i : this->layers.mapping) {
-      c->layer_create(i.second.layer_id, o->width, o->height);
-      auto &l = layers[i.second.layer_id];
-      l->set_destination_rectangle(0, 0, o->width, o->height);
-      l->set_visibility(1);
-      HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
-               i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
-   }
-
-   // Add layers to screen
-   s->set_render_order(this->layers.layers);
-
-   this->layout_commit();
-
-   return 0;
+int App::init_layers()
+{
+    if (!this->controller)
+    {
+        HMI_ERROR("wm", "ivi_controller global not available");
+        return -1;
+    }
+
+    if (this->outputs.empty())
+    {
+        HMI_ERROR("wm", "no output was set up!");
+        return -1;
+    }
+
+    auto &c = this->controller;
+
+    auto &o = this->outputs.front();
+    auto &s = c->screens.begin()->second;
+    auto &layers = c->layers;
+
+    // Write output dimensions to ivi controller...
+    c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
+    c->physical_size = compositor::size{uint32_t(o->physical_width),
+                                        uint32_t(o->physical_height)};
+
+    // Clear scene
+    layers.clear();
+
+    // Clear screen
+    s->clear();
+
+    // Quick and dirty setup of layers
+    for (auto const &i : this->layers.mapping)
+    {
+        c->layer_create(i.second.layer_id, o->width, o->height);
+        auto &l = layers[i.second.layer_id];
+        l->set_destination_rectangle(0, 0, o->width, o->height);
+        l->set_visibility(1);
+        HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
+                  i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
+    }
+
+    // Add layers to screen
+    s->set_render_order(this->layers.layers);
+
+    this->layout_commit();
+
+    return 0;
 }
 
-void App::surface_set_layout(int surface_id, optional<int> sub_surface_id) {
-   if (!this->controller->surface_exists(surface_id)) {
-      HMI_ERROR("wm", "Surface %d does not exist", surface_id);
-      return;
-   }
-
-   auto o_layer_id = this->layers.get_layer_id(surface_id);
-
-   if (!o_layer_id) {
-      HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
-      return;
-   }
-
-   uint32_t layer_id = *o_layer_id;
-
-   auto const &layer = this->layers.get_layer(layer_id);
-   auto rect = layer.value().rect;
-   auto &s = this->controller->surfaces[surface_id];
-
-   int x = rect.x;
-   int y = rect.y;
-   int w = rect.w;
-   int h = rect.h;
-
-   // less-than-0 values refer to MAX + 1 - $VALUE
-   // e.g. MAX is either screen width or height
-   if (w < 0) {
-      w = this->controller->output_size.w + 1 + w;
-   }
-   if (h < 0) {
-      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);
-
-   // set destination to the display rectangle
-   s->set_destination_rectangle(x, y, w, h);
-
-   // update area information
-   this->area_info[surface_id].x = x;
-   this->area_info[surface_id].y = y;
-   this->area_info[surface_id].w = w;
-   this->area_info[surface_id].h = h;
-
-   HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }",
-            surface_id, layer_id, x, y, w, h);
+void App::surface_set_layout(int surface_id, optional<int> sub_surface_id)
+{
+    if (!this->controller->surface_exists(surface_id))
+    {
+        HMI_ERROR("wm", "Surface %d does not exist", surface_id);
+        return;
+    }
+
+    auto o_layer_id = this->layers.get_layer_id(surface_id);
+
+    if (!o_layer_id)
+    {
+        HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id);
+        return;
+    }
+
+    uint32_t layer_id = *o_layer_id;
+
+    auto const &layer = this->layers.get_layer(layer_id);
+    auto rect = layer.value().rect;
+    auto &s = this->controller->surfaces[surface_id];
+
+    int x = rect.x;
+    int y = rect.y;
+    int w = rect.w;
+    int h = rect.h;
+
+    // less-than-0 values refer to MAX + 1 - $VALUE
+    // e.g. MAX is either screen width or height
+    if (w < 0)
+    {
+        w = this->controller->output_size.w + 1 + w;
+    }
+    if (h < 0)
+    {
+        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);
+
+    // set destination to the display rectangle
+    s->set_destination_rectangle(x, y, w, h);
+
+    // update area information
+    this->area_info[surface_id].x = x;
+    this->area_info[surface_id].y = y;
+    this->area_info[surface_id].w = w;
+    this->area_info[surface_id].h = h;
+
+    HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }",
+              surface_id, layer_id, x, y, w, h);
 }
 
-void App::layout_commit() {
-   this->controller->commit_changes();
-   this->display->flush();
+void App::layout_commit()
+{
+    this->controller->commit_changes();
+    this->display->flush();
 }
 
-void App::do_allocate_window_resource(unsigned sequence_number){
-    do {
+void App::do_allocate_window_resource(unsigned sequence_number)
+{
+    do
+    {
         // TODO: Tasks will be changed according to policy manager result
         // do task(onTransition (activate))
-    }while (!allocate_list.requestFinished());
+    } while (!app_list.requestFinished());
 
     // lm_.updateLayout(jobj);
-   // TODO: emit syncDraw with application
-   do{
+    // TODO: emit syncDraw with application
+    do
+    {
         //client->emit_syncdraw(role);
-   }while (!allocate_list.requestFinished());
-
-   // is the below necessary?
-   //allocate_list.setAllocated(sequence_number);
-
-   if(timer_ev_src != nullptr){
-       // firsttime set into sd_event
-       int ret = sd_event_add_time(afb_daemon_get_event_loop(), &timer_ev_src,
-          CLOCK_BOOTTIME, time(NULL) + TIME_OUT, 0, processTimerHandler, this);
-       if(ret < 0){
-           HMI_ERROR("wm", "Can't set timer");
-       }
-   }
-   else{
-       // update timer limitation after second time
-       sd_event_source_set_time(timer_ev_src, time(NULL) + TIME_OUT);
-       sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT);
-   }
+    } while (!app_list.requestFinished());
+
+    // is the below necessary?
+    //app_list.setAllocated(sequence_number);
+
+    if (timer_ev_src != nullptr)
+    {
+        // firsttime set into sd_event
+        int ret = sd_event_add_time(afb_daemon_get_event_loop(), &timer_ev_src,
+                                    CLOCK_BOOTTIME, time(NULL) + TIME_OUT, 0, processTimerHandler, this);
+        if (ret < 0)
+        {
+            HMI_ERROR("wm", "Can't set timer");
+        }
+    }
+    else
+    {
+        // update timer limitation after second time
+        sd_event_source_set_time(timer_ev_src, time(NULL) + TIME_OUT);
+        sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT);
+    }
 }
 
-void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) {
-   ST();
+void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply)
+{
+    ST();
 
-   /*
+    /*
    * Check Phase
    */
 
-   auto const &surface_id = this->lookup_id(drawing_name);
-   std::string id  = appid;
-   std::string role = drawing_name;
-   std::string area = drawing_area;
+    auto const &surface_id = this->lookup_id(drawing_name);
+    std::string id = appid;
+    std::string role = drawing_name;
+    std::string area = drawing_area;
 
-   WMClient* client = allocate_list.lookUpClient(id);
-   if(!client){
-       reply("app doesn't request 'requestSurface' yet");
-       return;
-   }
+    if(!app_list.contains(id)){
+        reply("app doesn't request 'requestSurface' yet");
+        return;
+    }
+
+    auto client = app_list.lookUpClient(id);
+
+    /*
+   * Queueing Phase
+   */
+    unsigned current = app_list.currentSequenceNumber();
+    unsigned requested_num = app_list.getSequenceNumber(id);
+    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;
+    }
+
+    WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
+    unsigned new_req = app_list.addAllocateRequest(req);
+
+    HMI_SEQ_DEBUG(new_req, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
+
+    if (new_req != current)
+    {
+        // Add request, then invoked after the previous task is finished
+        HMI_SEQ_DEBUG(new_req, "request is accepted");
+        reply(nullptr);
+        return;
+    }
 
-   // json_object* newState = checkPolicy(role);
-   /* The following error check is not necessary because main.cpp will reject the message form not registered object
+    /*
+    * Check Policy
+    */
+
+    // json_object* newState = checkPolicy(role);
+    /* The following error check is not necessary because main.cpp will reject the message form not registered object
    if(client != nullptr){
        reply("client is not registered");
        return;
    } */
 
-   // get surfaceID from role
-   /* auto const &surface_id_tmp = client->surfaceID(role);
+    // get surfaceID from role
+    /* auto const &surface_id_tmp = client->surfaceID(role);
    auto const &layer_id_tmp = client->layerID();
 
    if(!surface_id_tmp && !layer_id_tmp){
@@ -423,319 +502,343 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char
           appid, role, surface_id_tmp, layer_id_tmp);
    } */
 
-   /*
-   * Queueing Phase
-   */
-   unsigned current = allocate_list.currentSequenceNumber();
-   unsigned requested_num = allocate_list.getSequenceNumber(id, role, area);
-   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;
-   }
+    /*
+    * Do allocate tasks
+    */
+    this->do_allocate_window_resource(new_req);
+
+    if (!surface_id)
+    {
+        reply("Surface does not exist");
+        return;
+    }
+
+    if (!this->controller->surface_exists(*surface_id))
+    {
+        reply("Surface does not exist in controller!");
+        return;
+    }
 
-   WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE);
-   unsigned new_req = allocate_list.addAllocateRequest(req);
+    auto layer_id = this->layers.get_layer_id(*surface_id);
 
-   HMI_SEQ_DEBUG(new_req, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str());
+    if (!layer_id)
+    {
+        reply("Surface is not on any layer!");
+        return;
+    }
 
-    if(new_req != current){
-       // Add request, then invoked after the previous task is finished
-       HMI_SEQ_DEBUG(new_req, "request is accepted");
-       reply(nullptr);
-       return;
+    auto o_state = *this->layers.get_layout_state(*surface_id);
+
+    if (o_state == nullptr)
+    {
+        reply("Could not find layer for surface");
+        return;
     }
 
-    /*
-    * Do allocate tasks
-    */
-    this->do_allocate_window_resource(new_req);
+    HMI_DEBUG("wm", "surface %d is detected", *surface_id);
+    reply(nullptr);
 
-   if (!surface_id)
-   {
-       reply("Surface does not exist");
-       return;
-       }
-
-   if (!this->controller->surface_exists(*surface_id)) {
-      reply("Surface does not exist in controller!");
-      return;
-   }
-
-   auto layer_id = this->layers.get_layer_id(*surface_id);
-
-   if (!layer_id) {
-      reply("Surface is not on any layer!");
-      return;
-   }
-
-   auto o_state = *this->layers.get_layout_state(*surface_id);
-
-   if (o_state == nullptr) {
-      reply("Could not find layer for surface");
-      return;
-   }
-
-   HMI_DEBUG("wm", "surface %d is detected", *surface_id);
-   reply(nullptr);
-
-   struct LayoutState &state = *o_state;
-
-   // 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;
-      if (l.second.state.main != -1) {
-         this->deactivate(l.second.state.main);
-         l.second.state.main = -1;
-         flush = true;
-      }
-
-      if (l.second.state.sub != -1) {
-         this->deactivate(l.second.state.sub);
-         l.second.state.sub = -1;
-         flush = true;
-      }
-
-      if (flush) {
-         this->layout_commit();
-      }
-   }
-
-   auto layer = this->layers.get_layer(*layer_id);
-
-   if (state.main == -1) {
-      this->try_layout(
-         state, LayoutState{*surface_id}, [&] (LayoutState const &nl) {
-            HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
-            this->surface_set_layout(*surface_id);
-            state = nl;
-
-            // Commit for configuraton
+    struct LayoutState &state = *o_state;
+
+    // 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;
+        if (l.second.state.main != -1)
+        {
+            this->deactivate(l.second.state.main);
+            l.second.state.main = -1;
+            flush = true;
+        }
+
+        if (l.second.state.sub != -1)
+        {
+            this->deactivate(l.second.state.sub);
+            l.second.state.sub = -1;
+            flush = true;
+        }
+
+        if (flush)
+        {
             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);
-         });
-   } else {
-      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);
+    auto layer = this->layers.get_layer(*layer_id);
 
-         if (can_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) {
-                      if (state.sub != -1) {
-                         this->deactivate(state.sub);
-                      }
-                  }
-                  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];
-                  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(drawing_name, 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);
-               });
-         } else {
+    if (state.main == -1)
+    {
+        this->try_layout(
+            state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
+                HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal);
+                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);
+            });
+    }
+    else
+    {
+        if (0 == strcmp(drawing_name, "HomeScreen"))
+        {
             this->try_layout(
-               state, LayoutState{*surface_id}, [&] (LayoutState const &nl) {
-                  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) {
-                      if (state.sub != *surface_id) {
-                         this->deactivate(state.sub);
-                      }
-                  }
-                  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);
-               });
-         }
-      }
-   }
+                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)
+            {
+                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)
+                        {
+                            if (state.sub != -1)
+                            {
+                                this->deactivate(state.sub);
+                            }
+                        }
+                        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];
+                        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(drawing_name, 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);
+                    });
+            }
+            else
+            {
+                this->try_layout(
+                    state, LayoutState{*surface_id}, [&](LayoutState const &nl) {
+                        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)
+                        {
+                            if (state.sub != *surface_id)
+                            {
+                                this->deactivate(state.sub);
+                            }
+                        }
+                        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);
+                    });
+            }
+        }
+    }
 }
 
-void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) {
-   ST();
-   auto const &surface_id = this->lookup_id(drawing_name);
-
-   std::string id = appid;
-   WMClient* client = allocate_list.lookUpClient(id);
-
-   if(!client){
-       HMI_ERROR("wm", "client %s is not registered", appid);
-   }
-
-   if (!surface_id) {
-      reply ("Surface does not exist");
-      return;
-   }
-
-   if (*surface_id == this->layers.main_surface) {
-      reply("Cannot deactivate main_surface");
-      return;
-   }
-
-   auto o_state = *this->layers.get_layout_state(*surface_id);
-
-   if (o_state == nullptr) {
-      reply("Could not find layer for surface");
-      return;
-   }
-
-   struct LayoutState &state = *o_state;
-
-   if (state.main == -1) {
-      reply("No surface active");
-      return;
-   }
-
-   // Check against main_surface, main_surface_name is the configuration item.
-   if (*surface_id == this->layers.main_surface) {
-      HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id);
-      reply(nullptr);
-      return;
-   }
-   if((state.main == *surface_id) && (state.sub == *surface_id)){
-       reply("Surface is not active");
-       return;
-   }
-   reply(nullptr);
-
-   if (state.main == *surface_id) {
-      if (state.sub != -1) {
-         this->try_layout(
-            state, LayoutState{state.sub, -1}, [&] (LayoutState const &nl) {
-               std::string sub = std::move(*this->lookup_name(state.sub));
-
-               this->deactivate(*surface_id);
-               this->surface_set_layout(state.sub);
-               state = nl;
-
-               this->layout_commit();
-               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);
-               this->enqueue_flushdraw(state.sub);
-            });
-      } else {
-         this->try_layout(state, LayoutState{-1, -1}, [&] (LayoutState const &nl) {
-            this->deactivate(*surface_id);
-            state = nl;
-            this->layout_commit();
-         });
-      }
-   } else if (state.sub == *surface_id) {
-      this->try_layout(
-         state, LayoutState{state.main, -1}, [&] (LayoutState const &nl) {
-            std::string main = std::move(*this->lookup_name(state.main));
+void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply)
+{
+    ST();
+    auto const &surface_id = this->lookup_id(drawing_name);
 
-            this->deactivate(*surface_id);
-            this->surface_set_layout(state.main);
-            state = nl;
+    std::string id = appid;
 
-            this->layout_commit();
-            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);
-            this->enqueue_flushdraw(state.main);
-         });
-   }
+    if(app_list.contains(id)){
+        reply("app doesn't request 'requestSurface' yet");
+        return;
+    }
+    auto client = app_list.lookUpClient(id);
+
+    if (!surface_id)
+    {
+        reply("Surface does not exist");
+        return;
+    }
+
+    if (*surface_id == this->layers.main_surface)
+    {
+        reply("Cannot deactivate main_surface");
+        return;
+    }
+
+    auto o_state = *this->layers.get_layout_state(*surface_id);
+
+    if (o_state == nullptr)
+    {
+        reply("Could not find layer for surface");
+        return;
+    }
+
+    struct LayoutState &state = *o_state;
+
+    if (state.main == -1)
+    {
+        reply("No surface active");
+        return;
+    }
+
+    // Check against main_surface, main_surface_name is the configuration item.
+    if (*surface_id == this->layers.main_surface)
+    {
+        HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id);
+        reply(nullptr);
+        return;
+    }
+    if ((state.main == *surface_id) && (state.sub == *surface_id))
+    {
+        reply("Surface is not active");
+        return;
+    }
+    reply(nullptr);
+
+    if (state.main == *surface_id)
+    {
+        if (state.sub != -1)
+        {
+            this->try_layout(
+                state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) {
+                    std::string sub = std::move(*this->lookup_name(state.sub));
+
+                    this->deactivate(*surface_id);
+                    this->surface_set_layout(state.sub);
+                    state = nl;
+
+                    this->layout_commit();
+                    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);
+                    this->enqueue_flushdraw(state.sub);
+                });
+        }
+        else
+        {
+            this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) {
+                this->deactivate(*surface_id);
+                state = nl;
+                this->layout_commit();
+            });
+        }
+    }
+    else if (state.sub == *surface_id)
+    {
+        this->try_layout(
+            state, LayoutState{state.main, -1}, [&](LayoutState const &nl) {
+                std::string main = std::move(*this->lookup_name(state.main));
+
+                this->deactivate(*surface_id);
+                this->surface_set_layout(state.main);
+                state = nl;
+
+                this->layout_commit();
+                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);
+                this->enqueue_flushdraw(state.main);
+            });
+    }
 }
 
-void App::enqueue_flushdraw(int surface_id) {
-   this->check_flushdraw(surface_id);
-   HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id);
-   this->pending_end_draw.push_back(surface_id);
+void App::enqueue_flushdraw(int surface_id)
+{
+    this->check_flushdraw(surface_id);
+    HMI_DEBUG("wm", "Enqueuing EndDraw for surface_id %d", surface_id);
+    this->pending_end_draw.push_back(surface_id);
 }
 
-void App::check_flushdraw(int surface_id) {
-   auto i = std::find(std::begin(this->pending_end_draw),
-                      std::end(this->pending_end_draw), surface_id);
-   if (i != std::end(this->pending_end_draw)) {
-      auto n = this->lookup_name(surface_id);
-      HMI_ERROR("wm", "Application %s (%d) has pending EndDraw call(s)!",
-               n ? n->c_str() : "unknown-name", surface_id);
-      std::swap(this->pending_end_draw[std::distance(
-                   std::begin(this->pending_end_draw), i)],
-                this->pending_end_draw.back());
-      this->pending_end_draw.resize(this->pending_end_draw.size() - 1);
-   }
+void App::check_flushdraw(int surface_id)
+{
+    auto i = std::find(std::begin(this->pending_end_draw),
+                       std::end(this->pending_end_draw), surface_id);
+    if (i != std::end(this->pending_end_draw))
+    {
+        auto n = this->lookup_name(surface_id);
+        HMI_ERROR("wm", "Application %s (%d) has pending EndDraw call(s)!",
+                  n ? n->c_str() : "unknown-name", surface_id);
+        std::swap(this->pending_end_draw[std::distance(
+                      std::begin(this->pending_end_draw), i)],
+                  this->pending_end_draw.back());
+        this->pending_end_draw.resize(this->pending_end_draw.size() - 1);
+    }
 }
 
-void App::do_enddraw(unsigned sequence_number){
+void App::do_enddraw(unsigned sequence_number)
+{
     HMI_SEQ_INFO(sequence_number, "do endDraw");
-    do{
+    do
+    {
         // make visible application
-    }while(!allocate_list.requestFinished());
+    } while (!app_list.requestFinished());
 
     HMI_SEQ_INFO(sequence_number, "emit flushDraw");
-    do{
+    do
+    {
         // emit flush Draw
-        //emitFlushDrawToAll(&allocate_list, request_seq);
+        //emitFlushDrawToAll(&app_list, request_seq);
         // emit status change event
-    }while(!allocate_list.requestFinished());
+    } while (!app_list.requestFinished());
 }
 
-void App::process_request(){
-
+void App::process_request()
+{
 }
 
-void App::api_enddraw(char const *appid, char const *drawing_name) {
-    unsigned request_seq = allocate_list.lookUpAllocatingApp(appid);
-    unsigned current_seq = allocate_list.currentSequenceNumber();
-    if(current_seq != request_seq){
-        if(request_seq == 0){
+void App::api_enddraw(char const *appid, char const *drawing_name)
+{
+    std::string id(appid);
+    unsigned request_seq = app_list.lookUpAllocatingApp(id);
+    unsigned current_seq = app_list.currentSequenceNumber();
+    if (current_seq != request_seq)
+    {
+        if (request_seq == 0)
+        {
             HMI_ERROR("wm", "You don't have Window Resource");
         }
-        else{
+        else
+        {
             HMI_ERROR("wm", "unknown error. Application may not obey the sequence manner. please call endDraw after syncDraw");
         }
         return;
@@ -743,86 +846,97 @@ void App::api_enddraw(char const *appid, char const *drawing_name) {
 
     std::string role = drawing_name;
     //std::string area = drawing_area;
-    allocate_list.setEndDrawFinished(request_seq, role);
+    app_list.setEndDrawFinished(request_seq, role);
 
-    if(allocate_list.endDrawFullfilled(request_seq)){
+    if (app_list.endDrawFullfilled(request_seq))
+    {
         // do task for endDraw
         this->do_enddraw(request_seq);
-        allocate_list.removeRequest(request_seq);
+        app_list.removeRequest(request_seq);
         HMI_SEQ_INFO(request_seq, "Finish sequence");
-        allocate_list.setCurrentSequence(request_seq + 1);
-        if(allocate_list.haveRequest()){
+        app_list.setCurrentSequence(request_seq + 1);
+        if (app_list.haveRequest())
+        {
             this->process_request();
         }
     }
-    else{
+    else
+    {
         HMI_SEQ_INFO(request_seq, "Wait other App call endDraw");
         return;
     }
-   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);
-      }
-   }
+    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::api_ping() { this->dispatch_pending_events(); }
 
-void App::send_event(char const *evname, char const *label){
-   HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
+void App::send_event(char const *evname, char const *label)
+{
+    HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
 
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
+    json_object *j = json_object_new_object();
+    json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
 
-   int ret = afb_event_push(this->map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
-   }
+    int ret = afb_event_push(this->map_afb_event[evname], j);
+    if (ret != 0)
+    {
+        HMI_DEBUG("wm", "afb_event_push failed: %m");
+    }
 }
 
 void App::send_event(char const *evname, char const *label, char const *area,
-                             int x, int y, int w, int h) {
-   HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
-             __func__, evname, label, area, x, y, w, h);
-
-   json_object *j_rect = json_object_new_object();
-   json_object_object_add(j_rect, kKeyX,      json_object_new_int(x));
-   json_object_object_add(j_rect, kKeyY,      json_object_new_int(y));
-   json_object_object_add(j_rect, kKeyWidth,  json_object_new_int(w));
-   json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h));
-
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
-   json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
-   json_object_object_add(j, kKeyDrawingRect, j_rect);
-
-   int ret = afb_event_push(this->map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
-   }
+                     int x, int y, int w, int h)
+{
+    HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d",
+              __func__, evname, label, area, x, y, w, h);
+
+    json_object *j_rect = json_object_new_object();
+    json_object_object_add(j_rect, kKeyX, json_object_new_int(x));
+    json_object_object_add(j_rect, kKeyY, json_object_new_int(y));
+    json_object_object_add(j_rect, kKeyWidth, json_object_new_int(w));
+    json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h));
+
+    json_object *j = json_object_new_object();
+    json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
+    json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
+    json_object_object_add(j, kKeyDrawingRect, j_rect);
+
+    int ret = afb_event_push(this->map_afb_event[evname], j);
+    if (ret != 0)
+    {
+        HMI_DEBUG("wm", "afb_event_push failed: %m");
+    }
 }
 
 /**
  * proxied events
  */
-void App::surface_created(uint32_t surface_id) {
-   auto layer_id = this->layers.get_layer_id(surface_id);
-   if (!layer_id) {
-      HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!",
-               surface_id);
-      return;
-   }
-
-   HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id);
-
-   this->controller->layers[*layer_id]->add_surface(surface_id);
-   this->layout_commit();
-   // activate the main_surface right away
-   /*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
+void App::surface_created(uint32_t surface_id)
+{
+    auto layer_id = this->layers.get_layer_id(surface_id);
+    if (!layer_id)
+    {
+        HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!",
+                  surface_id);
+        return;
+    }
+
+    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id);
+
+    this->controller->layers[*layer_id]->add_surface(surface_id);
+    this->layout_commit();
+    // activate the main_surface right away
+    /*if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
       HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id);
 
       this->api_activate_surface(
@@ -830,326 +944,372 @@ void App::surface_created(uint32_t surface_id) {
    }*/
 }
 
-void App::surface_removed(uint32_t surface_id) {
-   HMI_DEBUG("wm", "surface_id is %u", surface_id);
-
-   // We cannot normally deactivate the main_surface, so be explicit
-   // about it:
-   if (int(surface_id) == this->layers.main_surface) {
-      this->deactivate_main_surface();
-   } else {
-      auto drawing_name = this->lookup_name(surface_id);
-      if (drawing_name) {
-         std::string appid = "";
-         /* const WMClient *client = lookUpClient(surface_id);
+void App::surface_removed(uint32_t surface_id)
+{
+    HMI_DEBUG("wm", "surface_id is %u", surface_id);
+
+    // We cannot normally deactivate the main_surface, so be explicit
+    // about it:
+    if (int(surface_id) == this->layers.main_surface)
+    {
+        this->deactivate_main_surface();
+    }
+    else
+    {
+        auto drawing_name = this->lookup_name(surface_id);
+        if (drawing_name)
+        {
+            std::string appid = "";
+            /* auto = lookUpClient(surface_id);
          appid = client->appID();
 
          */
-         this->api_deactivate_surface(appid.c_str(), drawing_name->c_str(), [](const char*){});
-      }
-   }
+            this->api_deactivate_surface(appid.c_str(), drawing_name->c_str(), [](const char *) {});
+        }
+    }
 
-   this->id_alloc.remove_id(surface_id);
-   this->layers.remove_surface(surface_id);
+    this->id_alloc.remove_id(surface_id);
+    this->layers.remove_surface(surface_id);
 }
 
-void App::emit_activated(char const *label) {
-   this->send_event(kListEventName[Event_Active], label);
+void App::emit_activated(char const *label)
+{
+    this->send_event(kListEventName[Event_Active], label);
 }
 
-void App::emit_deactivated(char const *label) {
-   this->send_event(kListEventName[Event_Inactive], label);
+void App::emit_deactivated(char const *label)
+{
+    this->send_event(kListEventName[Event_Inactive], label);
 }
 
-void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) {
-   this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
+void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h)
+{
+    this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h);
 }
 
-void App::emit_flushdraw(char const *label) {
-   this->send_event(kListEventName[Event_FlushDraw], label);
+void App::emit_flushdraw(char const *label)
+{
+    this->send_event(kListEventName[Event_FlushDraw], label);
 }
 
-void App::emit_visible(char const *label, bool is_visible) {
-   this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
+void App::emit_visible(char const *label, bool is_visible)
+{
+    this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
 }
 
-void App::emit_invisible(char const *label) {
-   return emit_visible(label, false);
+void App::emit_invisible(char const *label)
+{
+    return emit_visible(label, false);
 }
 
 void App::emit_visible(char const *label) { return emit_visible(label, true); }
 
-result<int> App::api_request_surface(char const * appid, char const *drawing_name) {
-   auto lid = this->layers.get_layer_id(std::string(drawing_name));
-   if (!lid) {
-      /**
+result<int> App::api_request_surface(char const *appid, char const *drawing_name)
+{
+    auto lid = this->layers.get_layer_id(std::string(drawing_name));
+    if (!lid)
+    {
+        /**
        * register drawing_name as fallback and make it displayed.
        */
-      lid = this->layers.get_layer_id(std::string("Fallback"));
-      HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
-      if(!lid){
-          return Err<int>("Drawing name does not match any role, Fallback is disabled");
-      }
-   }
-
-   auto rname = this->lookup_id(drawing_name);
-   if (!rname) {
-      // name does not exist yet, allocate surface id...
-      auto id = int(this->id_alloc.generate_id(drawing_name));
-      this->layers.add_surface(id, *lid);
-
-      // set the main_surface[_name] here and now
-      if (!this->layers.main_surface_name.empty() &&
-          this->layers.main_surface_name == drawing_name) {
-         this->layers.main_surface = id;
-         HMI_DEBUG("wm", "Set main_surface id to %u", id);
-      }
-
-      // add client into the db
-      WMClient* client = new WMClient(appid, *lid, id, drawing_name); // role is drawing_name for now
-      allocate_list.addClient(client);
-
-      return Ok<int>(id);
-   }
-
-   // Check currently registered drawing names if it is already there.
-   return Err<int>("Surface already present");
+        lid = this->layers.get_layer_id(std::string("Fallback"));
+        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
+        if (!lid)
+        {
+            return Err<int>("Drawing name does not match any role, Fallback is disabled");
+        }
+    }
+
+    auto rname = this->lookup_id(drawing_name);
+    if (!rname)
+    {
+        // name does not exist yet, allocate surface id...
+        auto id = int(this->id_alloc.generate_id(drawing_name));
+        this->layers.add_surface(id, *lid);
+
+        // set the main_surface[_name] here and now
+        if (!this->layers.main_surface_name.empty() &&
+            this->layers.main_surface_name == drawing_name)
+        {
+            this->layers.main_surface = id;
+            HMI_DEBUG("wm", "Set main_surface id to %u", id);
+        }
+
+        // add client into the db
+        std::string appid_str(appid);
+        std::string role(drawing_name);
+        app_list.addClient(appid_str, role);
+
+        return Ok<int>(id);
+    }
+
+    // Check currently registered drawing names if it is already there.
+    return Err<int>("Surface already present");
 }
 
 char const *App::api_request_surface(char const *appid, char const *drawing_name,
-                                     char const *ivi_id) {
-   ST();
+                                     char const *ivi_id)
+{
+    ST();
 
-   auto lid = this->layers.get_layer_id(std::string(drawing_name));
-   unsigned sid = std::stol(ivi_id);
+    auto lid = this->layers.get_layer_id(std::string(drawing_name));
+    unsigned sid = std::stol(ivi_id);
 
-   if (!lid) {
-      /**
+    if (!lid)
+    {
+        /**
        * register drawing_name as fallback and make it displayed.
        */
-      lid = this->layers.get_layer_id(std::string("Fallback"));
-      HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
-      if(!lid){
-          return "Drawing name does not match any role, Fallback is disabled";
-      }
-   }
+        lid = this->layers.get_layer_id(std::string("Fallback"));
+        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", drawing_name);
+        if (!lid)
+        {
+            return "Drawing name does not match any role, Fallback is disabled";
+        }
+    }
 
-   auto rname = this->lookup_id(drawing_name);
+    auto rname = this->lookup_id(drawing_name);
 
-   if (rname) {
-       return "Surface already present";
-   }
+    if (rname)
+    {
+        return "Surface already present";
+    }
 
-   // register pair drawing_name and ivi_id
-   this->id_alloc.register_name_id(drawing_name, sid);
-   this->layers.add_surface(sid, *lid);
+    // register pair drawing_name and ivi_id
+    this->id_alloc.register_name_id(drawing_name, sid);
+    this->layers.add_surface(sid, *lid);
 
-   // this surface is already created
-   HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
+    // this surface is already created
+    HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid);
 
-   this->controller->layers[*lid]->add_surface(sid);
-   this->layout_commit();
+    this->controller->layers[*lid]->add_surface(sid);
+    this->layout_commit();
 
-   return nullptr;
+    return nullptr;
 }
 
-result<json_object *> App::api_get_display_info() {
-   // Check controller
-   if (!this->controller) {
-      return Err<json_object *>("ivi_controller global not available");
-   }
+result<json_object *> App::api_get_display_info()
+{
+    // Check controller
+    if (!this->controller)
+    {
+        return Err<json_object *>("ivi_controller global not available");
+    }
 
-   // Set display info
-   compositor::size o_size = this->controller->output_size;
-   compositor::size p_size = this->controller->physical_size;
+    // Set display info
+    compositor::size o_size = this->controller->output_size;
+    compositor::size p_size = this->controller->physical_size;
 
-   json_object *object = json_object_new_object();
-   json_object_object_add(object, kKeyWidthPixel,  json_object_new_int(o_size.w));
-   json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h));
-   json_object_object_add(object, kKeyWidthMm,     json_object_new_int(p_size.w));
-   json_object_object_add(object, kKeyHeightMm,    json_object_new_int(p_size.h));
+    json_object *object = json_object_new_object();
+    json_object_object_add(object, kKeyWidthPixel, json_object_new_int(o_size.w));
+    json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h));
+    json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w));
+    json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h));
 
-   return Ok<json_object *>(object);
+    return Ok<json_object *>(object);
 }
 
-result<json_object *> App::api_get_area_info(char const *drawing_name) {
-   HMI_DEBUG("wm", "called");
-
-   // Check drawing name, surface/layer id
-   auto const &surface_id = this->lookup_id(drawing_name);
-   if (!surface_id) {
-      return Err<json_object *>("Surface does not exist");
-   }
-
-   if (!this->controller->surface_exists(*surface_id)) {
-      return Err<json_object *>("Surface does not exist in controller!");
-   }
-
-   auto layer_id = this->layers.get_layer_id(*surface_id);
-   if (!layer_id) {
-      return Err<json_object *>("Surface is not on any layer!");
-   }
-
-   auto o_state = *this->layers.get_layout_state(*surface_id);
-   if (o_state == nullptr) {
-      return Err<json_object *>("Could not find layer for surface");
-   }
-
-   struct LayoutState &state = *o_state;
-   if ((state.main != *surface_id) && (state.sub != *surface_id)) {
-      return Err<json_object *>("Surface is inactive");
-   }
-
-   // Set area rectangle
-   compositor::rect area_info = this->area_info[*surface_id];
-   json_object *object = json_object_new_object();
-   json_object_object_add(object, kKeyX,      json_object_new_int(area_info.x));
-   json_object_object_add(object, kKeyY,      json_object_new_int(area_info.y));
-   json_object_object_add(object, kKeyWidth,  json_object_new_int(area_info.w));
-   json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h));
-
-   return Ok<json_object *>(object);
+result<json_object *> App::api_get_area_info(char const *drawing_name)
+{
+    HMI_DEBUG("wm", "called");
+
+    // Check drawing name, surface/layer id
+    auto const &surface_id = this->lookup_id(drawing_name);
+    if (!surface_id)
+    {
+        return Err<json_object *>("Surface does not exist");
+    }
+
+    if (!this->controller->surface_exists(*surface_id))
+    {
+        return Err<json_object *>("Surface does not exist in controller!");
+    }
+
+    auto layer_id = this->layers.get_layer_id(*surface_id);
+    if (!layer_id)
+    {
+        return Err<json_object *>("Surface is not on any layer!");
+    }
+
+    auto o_state = *this->layers.get_layout_state(*surface_id);
+    if (o_state == nullptr)
+    {
+        return Err<json_object *>("Could not find layer for surface");
+    }
+
+    struct LayoutState &state = *o_state;
+    if ((state.main != *surface_id) && (state.sub != *surface_id))
+    {
+        return Err<json_object *>("Surface is inactive");
+    }
+
+    // Set area rectangle
+    compositor::rect area_info = this->area_info[*surface_id];
+    json_object *object = json_object_new_object();
+    json_object_object_add(object, kKeyX, json_object_new_int(area_info.x));
+    json_object_object_add(object, kKeyY, json_object_new_int(area_info.y));
+    json_object_object_add(object, kKeyWidth, json_object_new_int(area_info.w));
+    json_object_object_add(object, kKeyHeight, json_object_new_int(area_info.h));
+
+    return Ok<json_object *>(object);
 }
 
-void App::activate(int id) {
-   auto ip = this->controller->sprops.find(id);
-   if (ip != this->controller->sprops.end()) {
-      this->controller->surfaces[id]->set_visibility(1);
-      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 (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) {
-            if (id == *i) {
-               // Remove id
-               this->surface_bg.erase(i);
-
-               // Remove from BG layer (999)
-               HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
-               this->controller->layers[999]->remove_surface(id);
-
-               // Add to FG layer (1001)
-               HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id);
-               this->controller->layers[1001]->add_surface(id);
-
-               for (int j : this->surface_bg) {
-                 HMI_DEBUG("wm", "Stored id:%d", j);
-               }
-               break;
+void App::activate(int id)
+{
+    auto ip = this->controller->sprops.find(id);
+    if (ip != this->controller->sprops.end())
+    {
+        this->controller->surfaces[id]->set_visibility(1);
+        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 (auto i = surface_bg.begin(); i != surface_bg.end(); ++i)
+            {
+                if (id == *i)
+                {
+                    // Remove id
+                    this->surface_bg.erase(i);
+
+                    // Remove from BG layer (999)
+                    HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id);
+                    this->controller->layers[999]->remove_surface(id);
+
+                    // Add to FG layer (1001)
+                    HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id);
+                    this->controller->layers[1001]->add_surface(id);
+
+                    for (int j : this->surface_bg)
+                    {
+                        HMI_DEBUG("wm", "Stored id:%d", j);
+                    }
+                    break;
+                }
             }
-         }
-      }
-      // <<< FOR CES DEMO
-      this->layout_commit();
-
-      this->emit_visible(label);
-      this->emit_activated(label);
-   }
+        }
+        // <<< FOR CES DEMO
+        this->layout_commit();
+
+        this->emit_visible(label);
+        this->emit_activated(label);
+    }
 }
 
-void App::deactivate(int id) {
-   auto ip = this->controller->sprops.find(id);
-   if (ip != this->controller->sprops.end()) {
-      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"))) {
-
-         // Store id
-         this->surface_bg.push_back(id);
-
-         // Remove from FG layer (1001)
-         HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
-         this->controller->layers[1001]->remove_surface(id);
-
-         // Add to BG layer (999)
-         HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id);
-         this->controller->layers[999]->add_surface(id);
-
-         for (int j : surface_bg) {
-            HMI_DEBUG("wm", "Stored id:%d", j);
-         }
-      }
-      else {
-         this->controller->surfaces[id]->set_visibility(0);
-      }
-      // <<< FOR CES DEMO
-
-      this->emit_deactivated(label);
-      this->emit_invisible(label);
-   }
+void App::deactivate(int id)
+{
+    auto ip = this->controller->sprops.find(id);
+    if (ip != this->controller->sprops.end())
+    {
+        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")))
+        {
+
+            // Store id
+            this->surface_bg.push_back(id);
+
+            // Remove from FG layer (1001)
+            HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id);
+            this->controller->layers[1001]->remove_surface(id);
+
+            // Add to BG layer (999)
+            HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id);
+            this->controller->layers[999]->add_surface(id);
+
+            for (int j : surface_bg)
+            {
+                HMI_DEBUG("wm", "Stored id:%d", j);
+            }
+        }
+        else
+        {
+            this->controller->surfaces[id]->set_visibility(0);
+        }
+        // <<< FOR CES DEMO
+
+        this->emit_deactivated(label);
+        this->emit_invisible(label);
+    }
 }
 
-void App::deactivate_main_surface() {
-   this->layers.main_surface = -1;
-   std::string appid = "HomeScreen";
-   this->api_deactivate_surface(appid.c_str(), this->layers.main_surface_name.c_str(), [](const char*){});
+void App::deactivate_main_surface()
+{
+    this->layers.main_surface = -1;
+    std::string appid = "HomeScreen";
+    this->api_deactivate_surface(appid.c_str(), this->layers.main_surface_name.c_str(), [](const char *) {});
 }
 
-bool App::can_split(struct LayoutState const &state, int new_id) {
-   if (state.main != -1 && state.main != new_id) {
-      auto new_id_layer = this->layers.get_layer_id(new_id).value();
-      auto current_id_layer = this->layers.get_layer_id(state.main).value();
-
-      // surfaces are on separate layers, don't bother.
-      if (new_id_layer != current_id_layer) {
-         return false;
-      }
-
-      std::string const &new_id_str = this->lookup_name(new_id).value();
-      std::string const &cur_id_str = this->lookup_name(state.main).value();
-
-      auto const &layer = this->layers.get_layer(new_id_layer);
-
-      HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str());
-
-      if (layer->layouts.empty()) {
-         return false;
-      }
-
-      for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) {
-         HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str());
-         auto rem = std::regex(i->main_match);
-         if (std::regex_match(cur_id_str, rem)) {
-            // build the second one only if the first already matched
-            HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str());
-            auto res = std::regex(i->sub_match);
-            if (std::regex_match(new_id_str, res)) {
-               HMI_DEBUG("wm", "layout matched!");
-               return true;
+bool App::can_split(struct LayoutState const &state, int new_id)
+{
+    if (state.main != -1 && state.main != new_id)
+    {
+        auto new_id_layer = this->layers.get_layer_id(new_id).value();
+        auto current_id_layer = this->layers.get_layer_id(state.main).value();
+
+        // surfaces are on separate layers, don't bother.
+        if (new_id_layer != current_id_layer)
+        {
+            return false;
+        }
+
+        std::string const &new_id_str = this->lookup_name(new_id).value();
+        std::string const &cur_id_str = this->lookup_name(state.main).value();
+
+        auto const &layer = this->layers.get_layer(new_id_layer);
+
+        HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str());
+
+        if (layer->layouts.empty())
+        {
+            return false;
+        }
+
+        for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++)
+        {
+            HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str());
+            auto rem = std::regex(i->main_match);
+            if (std::regex_match(cur_id_str, rem))
+            {
+                // build the second one only if the first already matched
+                HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str());
+                auto res = std::regex(i->sub_match);
+                if (std::regex_match(new_id_str, res))
+                {
+                    HMI_DEBUG("wm", "layout matched!");
+                    return true;
+                }
             }
-         }
-      }
-   }
+        }
+    }
 
-   return false;
+    return false;
 }
 
 void App::try_layout(struct LayoutState & /*state*/,
                      struct LayoutState const &new_layout,
-                     std::function<void(LayoutState const &nl)> apply) {
-   if (this->policy.layout_is_valid(new_layout)) {
-      apply(new_layout);
-   }
+                     std::function<void(LayoutState const &nl)> apply)
+{
+    if (this->policy.layout_is_valid(new_layout))
+    {
+        apply(new_layout);
+    }
 }
 
 /**
  * controller_hooks
  */
-void controller_hooks::surface_created(uint32_t surface_id) {
-   this->app->surface_created(surface_id);
+void controller_hooks::surface_created(uint32_t surface_id)
+{
+    this->app->surface_created(surface_id);
 }
 
-void controller_hooks::surface_removed(uint32_t surface_id) {
-   this->app->surface_removed(surface_id);
+void controller_hooks::surface_removed(uint32_t surface_id)
+{
+    this->app->surface_removed(surface_id);
 }
 
 void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
@@ -1161,4 +1321,4 @@ void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/,
                                                      uint32_t /*w*/,
                                                      uint32_t /*h*/) {}
 
-}  // namespace wm
+} // namespace wm
diff --git a/src/applist.cpp b/src/applist.cpp
new file mode 100644
index 0000000..477a51b
--- /dev/null
+++ b/src/applist.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <algorithm>
+#include "applist.hpp"
+#include "../include/hmi-debug.h"
+
+using std::shared_ptr;
+using std::string;
+using std::unique_ptr;
+
+namespace wm {
+
+
+AppList::AppList(){}
+AppList::~AppList(){}
+
+void AppList::addClient(const std::string &appid, const std::string &role){
+    shared_ptr<WMClient> client(new WMClient(appid, role));
+    client_list[appid] = client;
+}
+
+void AppList::removeClient(const string &appid){
+    client_list.erase(appid);
+}
+
+bool AppList::contains(const string &appid){
+    auto result = client_list.find(appid);
+    return (client_list.end() != result) ? true : false;
+}
+
+/*
+* Call contains before calling this function
+*/
+shared_ptr <WMClient> AppList::lookUpClient(const string &appid)
+{
+    /* auto result = client_list.find(appid);
+    return (client_list.end() != result) ?
+        &(result->second()) : nullptr; */
+    return client_list[appid];
+}
+
+unsigned AppList::currentSequenceNumber(){
+    return current_seq;
+}
+
+unsigned AppList::getSequenceNumber(const string &appid){
+    for(auto x : req_list){
+        // Since app will not request twice and more, comparing appid is enough?
+        if( (x.appid == appid))
+        {
+            return x.seq_num;
+        }
+    }
+    return 0;
+}
+
+unsigned AppList::addAllocateRequest(WMRequest req){
+    req.seq_num = req_list.back().seq_num + 1;
+    req.allocating = false;
+    req.end_draw_finished = false;
+    req_list.push_back(req);
+    return req.seq_num;
+}
+
+bool AppList::requestFinished(){
+    return req_list.empty();
+}
+
+unsigned AppList::lookUpAllocatingApp(const string &appid){
+    for(auto x: req_list){
+        if(appid == x.appid){
+            if(false == x.allocating)
+                return x.seq_num;
+        }
+    }
+    return 0;
+}
+
+void AppList::setEndDrawFinished(unsigned request_seq, const string &role){
+    for(auto x: req_list){
+        if(request_seq == x.seq_num){
+            if(role == x.role){
+                x.end_draw_finished = true;
+            }
+        }
+    }
+}
+
+bool AppList::endDrawFullfilled(unsigned request_seq){
+    bool result = false;
+    for (auto x : req_list)
+    {
+        if(request_seq < x.seq_num){
+            break;
+        }
+        if(request_seq == x.seq_num){
+            result = x.end_draw_finished && x.allocating;
+            if(result == false){
+                break;
+            }
+        }
+    }
+    return result;
+}
+
+void AppList::removeRequest(unsigned req_seq){
+    req_list.erase(remove_if(req_list.begin(), req_list.end(),
+                            [req_seq](WMRequest x) { return x.seq_num == req_seq;}
+                            ));
+}
+
+void AppList::setCurrentSequence(unsigned req_seq){
+    this->current_seq = req_seq;
+    if(0 == this->current_seq){
+       this->current_seq = 1;
+   }
+}
+
+bool AppList::haveRequest(){
+    return true;
+}
+
+}
\ No newline at end of file
diff --git a/src/allocate_queue.hpp b/src/applist.hpp
index 7b36bfe..55355ef 100644
--- a/src/allocate_queue.hpp
+++ b/src/applist.hpp
@@ -19,10 +19,15 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <memory>
+//#include <experimental/optional>
 #include "windowmanager-client.hpp"
 
 namespace wm {
 
+/* using std::experimental::nullopt;
+using std::experimental::optional; */
+
 typedef enum Task{
     TASK_ALLOCATE,
     TASK_RELEASE
@@ -39,30 +44,31 @@ struct WMRequest{
     std::string area;
     Task task;
     unsigned seq_num;
-    bool end_draw_finished;
     bool allocating;
+    bool end_draw_finished;
 };
 
-class  AllocateRequestList {
+class  AppList {
 public:
-    AllocateRequestList();
-    virtual ~AllocateRequestList();
-    AllocateRequestList(const AllocateRequestList &obj) = delete;
+    AppList();
+    virtual ~AppList();
+    AppList(const AppList &obj) = delete;
 
     // Client Database Interface
-    bool addClient(WMClient *client);
+    void addClient(const std::string &appid, const std::string &role);
     void removeClient(const std::string &appid);
-    WMClient* lookUpClient(const std::string &appid);
+    bool contains(const std::string &appid);
+    std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
 
     // Request Interface
     unsigned currentSequenceNumber();
-    unsigned getSequenceNumber(const std::string &appid, const std::string &role, const std::string &area);
+    unsigned getSequenceNumber(const std::string &appid);
     unsigned addAllocateRequest(WMRequest req);
     /* TODO: consider, which is better WMClient or std::string appid?
     if appid is key to manage resources, it is better to select std::string
     otherwise WMClient is better, IMO */
     bool requestFinished();
-    unsigned lookUpAllocatingApp(const char *appid);
+    unsigned lookUpAllocatingApp(const std::string &appid);
     void setEndDrawFinished(unsigned request_seq, const std::string &role);
     bool endDrawFullfilled(unsigned request_seq);
     void removeRequest(unsigned request_seq);
@@ -82,8 +88,8 @@ public:
 
 private:
     std::vector<WMRequest> req_list;
-    std::map<std::string, WMClient> client_list;
-    unsigned seq_num;
+    std::unordered_map<std::string, std::shared_ptr<WMClient>> client_list;
+    unsigned current_seq;
 };
 
 }
diff --git a/src/request.cpp b/src/request.cpp
new file mode 100644
index 0000000..415a80d
--- /dev/null
+++ b/src/request.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "applist.hpp"
+
+namespace wm {
+
+using std::string;
+
+WMRequest::WMRequest(string appid, string role, string area, Task task){
+
+}
+
+WMRequest::~WMRequest(){
+
+}
+
+WMRequest::WMRequest(const WMRequest &obj){
+
+}
+
+
+}
\ No newline at end of file
diff --git a/src/windowmanager-client.cpp b/src/windowmanager-client.cpp
index 512f271..876ab9f 100644
--- a/src/windowmanager-client.cpp
+++ b/src/windowmanager-client.cpp
@@ -18,18 +18,39 @@
 
 namespace wm {
 
-WMClient::WMClient(){
+using std::string;
 
+const std::vector<std::string> wm_events = {
+    "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive"
+};
+
+WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role)
+    :id(appid),
+    layer(layerID)
+{
+    roles.push_back(role);
+    surfaces.push_back(surfaceID);
+    for(auto x: wm_events){
+        afb_event ev = afb_daemon_make_event(x.c_str());
+        event_list[x] = ev;
+    }
 }
 
-WMClient::WMClient(const char* appid, unsigned layerID, unsigned surfaceID, const char* role)
-    : request_number(0)
+WMClient::WMClient(const string &appid, const string &role)
+    :id(appid)
 {
+    roles.push_back(role);
+    for(auto x: wm_events){
+        afb_event ev = afb_daemon_make_event(x.c_str());
+        event_list[x] = ev;
+    }
+}
 
+WMClient::~WMClient(){
 }
 
 /* const std::vector<optional<unsigned>> surfaceIDList(){
-    
+
 }
 
 std::optional<unsigned> surfaceID(role);
diff --git a/src/windowmanager-client.hpp b/src/windowmanager-client.hpp
index 441dc77..045055b 100644
--- a/src/windowmanager-client.hpp
+++ b/src/windowmanager-client.hpp
@@ -22,6 +22,7 @@
 #include <unordered_map>
 
 extern "C" {
+#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 }
 
@@ -30,7 +31,8 @@ namespace wm {
 class WMClient {
 public:
     WMClient();
-    WMClient(const char* appid, unsigned layerID, unsigned surfaceID, const char* role);
+    WMClient(const std::string &appid, unsigned layerID, unsigned surfaceID, const std::string &role);
+    WMClient(const std::string &appid, const std::string &role);
     virtual ~WMClient();
     //WMClient::WMClient(const WMClient &obj);
     /* const std::vector<optional<unsigned>> surfaceIDList();
@@ -39,10 +41,9 @@ public:
   private:
     unsigned layer;
     std::vector<unsigned> surfaces;
-    std::string appid;
+    std::string id;
     std::vector<std::string> roles;
     std::unordered_map<std::string, struct afb_event> event_list;
-    unsigned request_number;
     //std::vector<Task *> requestingTask;
 };
 }