1 files changed, 87 insertions, 103 deletions

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 38541bd..9c1a1c5 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -63,9 +63,9 @@ static WindowManager *g_context;
 namespace
 {
 
-using nlohmann::json;
+// using nlohmann::json;
 
-result<json> file_to_json(char const *filename)
+/* result<json> file_to_json(char const *filename)
 {
     json j;
     std::ifstream i(filename);
@@ -94,7 +94,7 @@ struct result<layer_map> load_layer_map(char const *filename)
     json jids = j.unwrap();
 
     return to_layer_map(jids);
-}
+} */
 
 static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
 {
@@ -117,26 +117,18 @@ static void onError()
 /**
  * WindowManager Impl
  */
-WindowManager::WindowManager(wl::display *d)
+WindowManager::WindowManager()
     : chooks{this},
-      display{d},
-      controller{},
-      outputs(),
-      layers(),
-      id_alloc{},
-      pending_events(false)
+      id_alloc{}
 {
     const char *path = getenv("AFM_APP_INSTALL_DIR");
-    string lm_setting_path = path;
     if (!path)
     {
         HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
     }
-    else
-    {
-        lm_setting_path += "/etc/layers_setting.json";
-    }
-    this->lm = std::make_shared<LayerControl>(lm_setting_path);
+    string root = path;
+
+    this->lc = std::make_shared<LayerControl>(root);
 
 /*     try
     {
@@ -160,7 +152,7 @@ WindowManager::WindowManager(wl::display *d)
 
 int WindowManager::init()
 {
-    if (!this->display->ok())
+    /* if (!this->display->ok())
     {
         return -1;
     }
@@ -169,7 +161,7 @@ int WindowManager::init()
     {
         HMI_ERROR("No surface -> layer mapping loaded");
         return -1;
-    }
+    } */
 
     // TODO: application requests by old role,
     //       so create role map (old, new)
@@ -191,7 +183,7 @@ int WindowManager::init()
         map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]);
     }
 
-    this->display->add_global_handler(
+    /* 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));
         });
@@ -222,12 +214,12 @@ int WindowManager::init()
     // Second level objects
     this->display->roundtrip();
     // Third level objects
-    this->display->roundtrip();
+    this->display->roundtrip(); */
 
     return init_layers();
 }
 
-int WindowManager::dispatch_pending_events()
+/* int WindowManager::dispatch_pending_events()
 {
     if (this->pop_pending_events())
     {
@@ -240,7 +232,7 @@ int WindowManager::dispatch_pending_events()
 void WindowManager::set_pending_events()
 {
     this->pending_events.store(true, std::memory_order_release);
-}
+} */
 
 result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
 {
@@ -248,20 +240,20 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
     //       so convert role old to new
     const char *role = this->convertRoleOldToNew(drawing_name);
 
-    auto lid = this->layers.get_layer_id(string(role));
-    unsigned l_id = this->lm->getNewLayerID(role);
+    // auto lid = this->layers.get_layer_id(string(role));
+    unsigned l_id = this->lc->getNewLayerID(role);
     if (l_id != 0)
     {
         /**
        * register drawing_name as fallback and make it displayed.
        */
-        lid = this->layers.get_layer_id(string("fallback"));
-        l_id = this->lm->getNewLayerID("fallback");
+        // lid = this->layers.get_layer_id(string("fallback"));
+        l_id = this->lc->getNewLayerID("fallback");
         HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
-        if (!lid)
+        /* if (!lid)
         {
             return Err<int>("Drawing name does not match any role, fallback is disabled");
-        }
+        } */
     }
 
     // generate surface ID for ivi-shell application
@@ -312,22 +304,22 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
     // TODO: application requests by old role,
     //       so convert role old to new
     const char *role = this->convertRoleOldToNew(drawing_name);
+    string str = role;
 
-    auto lid = this->layers.get_layer_id(string(role));
+    // auto lid = this->layers.get_layer_id(string(role));
+    unsigned lid = this->lc->getNewLayerID(str);
     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(string("fallback"));
+        //register drawing_name as fallback and make it displayed.
+        // lid = this->layers.get_layer_id(string("fallback"));
         HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
         if (!lid)
         {
             return "Drawing name does not match any role, fallback is disabled";
         }
-    }
+    } */
 
     auto rname = this->lookup_id(role);
 
@@ -338,17 +330,17 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
 
     // register pair drawing_name and ivi_id
     this->id_alloc.register_name_id(role, sid);
-    this->layers.add_surface(sid, *lid);
+    // this->layers.add_surface(sid, *lid);
 
     // this surface is already created
-    HMI_DEBUG("surface_id is %u, layer_id is %u", sid, *lid);
+    // HMI_DEBUG("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();
 
     // add client into the db
     string appid_str(appid);
-    g_app_list.addClient(appid_str, *lid, sid, string(role));
+    g_app_list.addClient(appid_str, lid, sid, string(role));
 
     // Set role map of (new, old)
     this->rolenew2old[role] = string(drawing_name);
@@ -375,20 +367,18 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     bool ret = false;
 
     // get layer ID which role should be in
-    auto lid = this->layers.get_layer_id(role);
-    if (!lid)
+    // auto lid = this->layers.get_layer_id(role);
+    unsigned lid = this->lc->getNewLayerID(role);
+    /* if (!lid)
     {
-        /**
-       * register drawing_name as fallback and make it displayed.
-       */
-        lid = this->layers.get_layer_id(string("fallback"));
+        // lid = this->layers.get_layer_id(string("fallback"));
         HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str());
         if (!lid)
         {
             HMI_ERROR("Drawing name does not match any role, fallback is disabled");
             return ret;
         }
-    }
+    } */
 
     if(0 != pid){
         // search floating surfaceID from pid if pid is designated.
@@ -402,7 +392,7 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     }
     if(wm_err != WMError::SUCCESS){
         HMI_ERROR("No floating surface for app: %s", id.c_str());
-        g_app_list.addFloatingClient(id, *lid, role);
+        g_app_list.addFloatingClient(id, lid, role);
         HMI_NOTICE("%s : Waiting for surface creation", id.c_str());
         return ret;
     }
@@ -419,19 +409,19 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     }
     else{
         HMI_INFO("Create new client: %s, surface: %d into layer: %d with role: %s",
-                 id.c_str(), surface, *lid, role.c_str());
-        g_app_list.addClient(id, *lid, surface, role);
+                 id.c_str(), surface, lid, role.c_str());
+        g_app_list.addClient(id, lid, surface, role);
     }
 
     // register pair drawing_name and ivi_id
     this->id_alloc.register_name_id(role.c_str(), surface);
-    this->layers.add_surface(surface, *lid);
+    // this->layers.add_surface(surface, *lid);
 
     // this surface is already created
-    HMI_DEBUG("surface_id is %u, layer_id is %u", surface, *lid);
+    HMI_DEBUG("surface_id is %u, layer_id is %u", surface, lid);
 
-    const auto &o_layer = this->layers.get_layer(*lid);
-    auto rect = o_layer.value().rect;
+    // const auto &o_layer = this->layers.get_layer(*lid);
+    /* auto rect = o_layer.value().rect;
     if(rect.w < 0)
     {
         rect.w = this->controller->output_size.w + 1 + rect.w;
@@ -439,9 +429,9 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     if(rect.h < 0)
     {
         rect.h = this->controller->output_size.h + 1 + rect.h;
-    }
+    } */
 
-    this->controller->layers[*lid]->add_surface(surface);
+    // this->controller->layers[*lid]->add_surface(surface);
     this->layout_commit();
 
     return ret;
@@ -607,22 +597,22 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
 
 result<json_object *> WindowManager::api_get_display_info()
 {
-    if (!this->display->ok())
+    /* if (!this->display->ok())
     {
         return Err<json_object *>("Wayland compositor is not available");
-    }
+    } */
 
     // Set display info
-    compositor::size o_size = this->controller->output_size;
-    compositor::size p_size = this->controller->physical_size;
+/*     size o_size = this->controller->output_size;
+    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, 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_add(object, kKeyScale, json_object_new_double(this->controller->scale));
-
+ */
     return Ok<json_object *>(object);
 }
 
@@ -641,19 +631,19 @@ result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
         return Err<json_object *>("Surface does not exist");
     }
 
-    if (!this->controller->surface_exists(*surface_id))
+    /* 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);
+    /* // auto layer_id = this->layers.get_layer_id(*surface_id);
     if (!layer_id)
     {
         return Err<json_object *>("Surface is not on any layer!");
-    }
+    } */
 
     // Set area rectangle
-    compositor::rect area_info = this->area_info[*surface_id];
+    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));
@@ -663,7 +653,7 @@ result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
     return Ok<json_object *>(object);
 }
 
-void WindowManager::api_ping() { this->dispatch_pending_events(); }
+void WindowManager::api_ping() { /* this->dispatch_pending_events(); */ }
 
 void WindowManager::send_event(char const *evname, char const *label)
 {
@@ -708,7 +698,7 @@ void WindowManager::send_event(char const *evname, char const *label, char const
  */
 void WindowManager::surface_created(uint32_t surface_id)
 {
-    this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
+    /* this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
 
     auto layer_id = this->layers.get_layer_id(surface_id);
     if (!layer_id)
@@ -721,14 +711,14 @@ void WindowManager::surface_created(uint32_t surface_id)
     HMI_DEBUG("surface_id is %u, layer_id is %u", surface_id, *layer_id);
 
     this->controller->layers[*layer_id]->add_surface(surface_id);
-    this->layout_commit();
+    this->layout_commit(); */
 }
 
 void WindowManager::surface_removed(uint32_t surface_id)
 {
     HMI_DEBUG("Delete surface_id %u", surface_id);
     this->id_alloc.remove_id(surface_id);
-    this->layers.remove_surface(surface_id);
+    // this->layers.remove_surface(surface_id);
     g_app_list.removeSurface(surface_id);
 }
 
@@ -887,13 +877,6 @@ void WindowManager::processError(WMError error)
  ******* Private Functions *******
  */
 
-bool WindowManager::pop_pending_events()
-{
-    bool x{true};
-    return this->pending_events.compare_exchange_strong(
-        x, false, std::memory_order_consume);
-}
-
 optional<int> WindowManager::lookup_id(char const *name)
 {
     return this->id_alloc.lookup(string(name));
@@ -908,7 +891,7 @@ optional<string> WindowManager::lookup_name(int id)
  */
 int WindowManager::init_layers()
 {
-    if (!this->controller)
+    /* if (!this->controller)
     {
         HMI_ERROR("ivi_controller global not available");
         return -1;
@@ -935,7 +918,7 @@ int WindowManager::init_layers()
     HMI_DEBUG("SCALING: screen (%dx%d), physical (%dx%d)",
               o->width, o->height, o->physical_width, o->physical_height);
 
-    this->layers.loadAreaDb();
+    // this->layers.loadAreaDb();
 
     const compositor::rect css_bg = this->layers.getAreaSize("fullscreen");
     rectangle dp_bg(o->width, o->height);
@@ -947,10 +930,10 @@ int WindowManager::init_layers()
               css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
 
     // Clear scene
-    layers.clear();
+    // layers.clear();
 
     // Clear screen
-    s->clear();
+    // s->clear();
 
     // Quick and dirty setup of layers
     for (auto const &i : this->layers.mapping)
@@ -970,13 +953,13 @@ int WindowManager::init_layers()
 
     c->scale = static_cast<double>(dp_bg.height()) / css_bg.h;
     this->layers.setupArea(c->scale);
-
+ */
     return 0;
 }
 
 void WindowManager::surface_set_layout(int surface_id, const string& area)
 {
-    if (!this->controller->surface_exists(surface_id))
+    /* if (!this->controller->surface_exists(surface_id))
     {
         HMI_ERROR("Surface %d does not exist", surface_id);
         return;
@@ -1016,13 +999,13 @@ void WindowManager::surface_set_layout(int surface_id, const string& area)
     this->area_info[surface_id].h = h;
 
     HMI_DEBUG("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
-              surface_id, layer_id, x, y, w, h);
+              surface_id, layer_id, x, y, w, h); */
 }
 
 void WindowManager::layout_commit()
 {
-    this->controller->commit_changes();
-    this->display->flush();
+/*     this->controller->commit_changes();
+    this->display->flush(); */
 }
 
 void WindowManager::emit_activated(char const *label)
@@ -1042,9 +1025,9 @@ void WindowManager::emit_syncdraw(char const *label, char const *area, int x, in
 
 void WindowManager::emit_syncdraw(const string &role, const string &area)
 {
-    compositor::rect rect = this->layers.getAreaSize(area);
+/*     rect rect = this->layers.getAreaSize(area);
     this->send_event(kListEventName[Event_SyncDraw],
-        role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h);
+        role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h); */
 }
 
 void WindowManager::emit_flushdraw(char const *label)
@@ -1066,14 +1049,15 @@ void WindowManager::emit_visible(char const *label) { return emit_visible(label,
 
 void WindowManager::activate(int id)
 {
-    auto ip = this->controller->sprops.find(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 >>>
+        /* // FOR CES DEMO >>>
         if ((0 == strcmp(label, "radio")) ||
             (0 == strcmp(label, "music")) ||
             (0 == strcmp(label, "video")) ||
@@ -1104,7 +1088,7 @@ void WindowManager::activate(int id)
         }
         // <<< FOR CES DEMO
 
-        this->layout_commit();
+        this->layout_commit(); */
 
         // TODO: application requests by old role,
         //       so convert role new to old for emitting event
@@ -1112,18 +1096,18 @@ void WindowManager::activate(int id)
 
         this->emit_visible(old_role);
         this->emit_activated(old_role);
-    }
+    // }
 }
 
 void WindowManager::deactivate(int id)
 {
-    auto ip = this->controller->sprops.find(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 >>>
+        /*// FOR CES DEMO >>>
         if ((0 == strcmp(label, "radio")) ||
             (0 == strcmp(label, "music")) ||
             (0 == strcmp(label, "video")) ||
@@ -1152,7 +1136,7 @@ void WindowManager::deactivate(int id)
         }
         // <<< FOR CES DEMO
 
-        this->layout_commit();
+        this->layout_commit(); */
 
         // TODO: application requests by old role,
         //       so convert role new to old for emitting event
@@ -1160,7 +1144,7 @@ void WindowManager::deactivate(int id)
 
         this->emit_deactivated(old_role);
         this->emit_invisible(old_role);
-    }
+    // }
 }
 
 WMError WindowManager::setRequest(const string& appid, const string &role, const string &area,
@@ -1340,7 +1324,7 @@ WMError WindowManager::doEndDraw(unsigned req_num)
                 return ret;
             }
             HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
-            //this->lm_enddraw(act.role.c_str());
+            //this->lc_enddraw(act.role.c_str());
         }
     }
     this->layout_commit();
@@ -1609,17 +1593,17 @@ const char *WindowManager::check_surface_exist(const char *drawing_name)
         return "Surface does not exist";
     }
 
-    if (!this->controller->surface_exists(*surface_id))
+    /* if (!this->controller->surface_exists(*surface_id))
     {
         return "Surface does not exist in controller!";
-    }
+    } */
 
-    auto layer_id = this->layers.get_layer_id(*surface_id);
+    /* auto layer_id = this->layers.get_layer_id(*surface_id);
 
     if (!layer_id)
     {
         return "Surface is not on any layer!";
-    }
+    } */
 
     HMI_DEBUG("surface %d is detected", *surface_id);
     return nullptr;