X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=a924ab56189d1138c677d32f8efa3dba764bd7fd;hb=1b1051702003391f958f4bf68c5dfe88676d56d4;hp=9c1a1c56ebf1ab4d900ecdb3e1cf6c967f2b6c82;hpb=5d36c79042c3f513392cb765940252acb860b7a9;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 9c1a1c5..a924ab5 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -130,6 +130,8 @@ WindowManager::WindowManager()
 
     this->lc = std::make_shared<LayerControl>(root);
 
+    HMI_DEBUG("Layer Controller initialized");
+
 /*     try
     {
         {
@@ -166,6 +168,11 @@ int WindowManager::init()
     // TODO: application requests by old role,
     //       so create role map (old, new)
     // Load old_role.db
+    LayerControlCallbacks lmcb;
+    lmcb.surfaceCreated = [&](unsigned pid, unsigned surface){
+        this->surface_created(surface);
+        };
+    this->lc->init(lmcb);
     this->loadOldRoleDb();
 
     // Store my context for calling callback from PolicyManager
@@ -183,6 +190,19 @@ int WindowManager::init()
         map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]);
     }
 
+    const struct rect css_bg = this->lc->getAreaSize("fullscreen");
+    Screen screen = this->lc->getScreenInfo();
+    rectangle dp_bg(screen.width(), screen.height());
+
+    dp_bg.set_aspect(static_cast<double>(css_bg.w) / css_bg.h);
+    dp_bg.fit(screen.width(), screen.height());
+    dp_bg.center(screen.width(), screen.height());
+    HMI_DEBUG("SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)",
+              css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
+
+    double scale = static_cast<double>(dp_bg.height()) / css_bg.h;
+    this->lc->setupArea(scale);
+
     /* 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));
@@ -216,7 +236,7 @@ int WindowManager::init()
     // Third level objects
     this->display->roundtrip(); */
 
-    return init_layers();
+    return 0; //init_layers();
 }
 
 /* int WindowManager::dispatch_pending_events()
@@ -239,28 +259,37 @@ result<int> 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 l_name;
+    string s_appid = appid;
+    string s_role = drawing_name;
 
-    // auto lid = this->layers.get_layer_id(string(role));
-    unsigned l_id = this->lc->getNewLayerID(role);
-    if (l_id != 0)
+    if(!g_app_list.contains(s_appid))
     {
-        /**
-       * register drawing_name as fallback and make it displayed.
-       */
-        // 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)
+        // auto lid = this->layers.get_layer_id(string(role));
+        unsigned l_id = this->lc->getNewLayerID(s_role, &l_name);
+        if (l_id == 0)
         {
-            return Err<int>("Drawing name does not match any role, fallback is disabled");
-        } */
+            /**
+         * register drawing_name as fallback and make it displayed.
+         */
+            // lid = this->layers.get_layer_id(string("fallback"));
+            l_id = this->lc->getNewLayerID("fallback", &l_name);
+            HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+            if (l_id == 0)
+            {
+                return Err<int>("Designated role does not match any role, fallback is disabled");
+            }
+        }
+        this->lc->createNewLayer(l_id);
+        // add client into the db
+        g_app_list.addClient(s_appid, l_id, s_role);
     }
 
     // generate surface ID for ivi-shell application
 
-    // auto rname = this->lookup_id(role);
-    // if (!rname)
-    // {
+    auto rname = this->id_alloc.lookup(string(role));
+    if (!rname)
+    {
         // name does not exist yet, allocate surface id...
         auto id = int(this->id_alloc.generate_id(role));
         // this->layers.add_surface(id, *lid);
@@ -273,9 +302,9 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
         //     HMI_DEBUG("Set main_surface id to %u", id);
         // }
 
-        // add client into the db
-        string appid_str(appid);
-        if(g_app_list.contains(appid_str))
+
+
+        /* if(g_app_list.contains(appid_str))
         {
             // add surface into app
             auto client = g_app_list.lookUpClient(appid_str);
@@ -284,13 +313,13 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
         else
         {
             g_app_list.addClient(appid_str, l_id, id, string(role));
-        }
+        } */
 
         // Set role map of (new, old)
         this->rolenew2old[role] = string(drawing_name);
 
         return Ok<int>(id);
-    // }
+    }
 
     // Check currently registered drawing names if it is already there.
     return Err<int>("Surface already present");
@@ -299,29 +328,30 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
 char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name,
                                      char const *ivi_id)
 {
-    ;
-
     // TODO: application requests by old role,
     //       so convert role old to new
     const char *role = this->convertRoleOldToNew(drawing_name);
     string str = role;
+    string l_name;
 
     // auto lid = this->layers.get_layer_id(string(role));
-    unsigned lid = this->lc->getNewLayerID(str);
+    unsigned lid = this->lc->getNewLayerID(str, &l_name);
     unsigned sid = std::stol(ivi_id);
 
-    /* if (!lid)
+    if (lid == 0)
     {
         //register drawing_name as fallback and make it displayed.
-        // lid = this->layers.get_layer_id(string("fallback"));
+        lid = this->lc->getNewLayerID(str, &l_name);
         HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
-        if (!lid)
+        if (lid == 0)
         {
             return "Drawing name does not match any role, fallback is disabled";
         }
-    } */
+    }
 
-    auto rname = this->lookup_id(role);
+    this->lc->createNewLayer(lid);
+
+    auto rname = this->id_alloc.lookup(str);
 
     if (rname)
     {
@@ -340,7 +370,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
 
     // 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, string(role));
 
     // Set role map of (new, old)
     this->rolenew2old[role] = string(drawing_name);
@@ -362,27 +392,27 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
 bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){
     string id = appid;
     string role = drawing_name;
+    string l_name;
     unsigned surface = 0;
     WMError wm_err = WMError::UNKNOWN;
     bool ret = false;
 
     // get layer ID which role should be in
     // auto lid = this->layers.get_layer_id(role);
-    unsigned lid = this->lc->getNewLayerID(role);
-    /* if (!lid)
+    unsigned lid = this->lc->getNewLayerID(role, &l_name);
+    if (lid == 0)
     {
         // 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)
+        if (lid == 0)
         {
             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.
-        // It is not good that application request with its pid
         wm_err = g_app_list.popFloatingSurface(pid, &surface);
     }
     else{
@@ -402,15 +432,13 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     {
         HMI_INFO("Add role: %s with surface: %d. Client %s has multi surfaces.",
                  role.c_str(), surface, id.c_str());
-        wm_err = g_app_list.appendRole(id, role, surface);
-        if(wm_err != WMError::SUCCESS){
-            HMI_INFO(errorDescription(wm_err));
-        }
+        auto client = g_app_list.lookUpClient(id);
+        client->appendRole(role);
     }
     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);
+        g_app_list.addClient(id, lid, role);
     }
 
     // register pair drawing_name and ivi_id
@@ -432,7 +460,7 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un
     } */
 
     // this->controller->layers[*lid]->add_surface(surface);
-    this->layout_commit();
+    // this->layout_commit();
 
     return ret;
 }
@@ -457,14 +485,11 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
     }
     auto client = g_app_list.lookUpClient(id);
 
-    unsigned srfc = client->surfaceID(role);
-    if(srfc == 0)
-    {
-        HMI_ERROR("role sould be set with surface");
-        reply("role sould be set with surface");
-        return;
-    }
-    g_app_list.removeFloatingSurface(client->surfaceID());
+    // unsigned srfc = client->surfaceID(role);
+    // unsigned layer = client->layerID();
+
+    // g_app_list.removeFloatingSurface(client->surfaceID());
+    // g_app_list.removeFloatingSurface(client);
 
     Task task = Task::TASK_ALLOCATE;
     unsigned req_num = 0;
@@ -472,6 +497,9 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
 
     ret = this->setRequest(id, role, area, task, &req_num);
 
+    //vector<WMLayerState> current_states = this->lc->getCurrentStates();
+    // ret = this->setRequest(id, role, area, task, current_states, &req_num);
+
     if(ret != WMError::SUCCESS)
     {
         HMI_ERROR(errorDescription(ret));
@@ -490,7 +518,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
     /*
      * Do allocate tasks
      */
-    ret = this->doTransition(req_num);
+    ret = this->checkPolicy(req_num);
 
     if (ret != WMError::SUCCESS)
     {
@@ -521,6 +549,8 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
     WMError ret = WMError::UNKNOWN;
 
     ret = this->setRequest(id, role, area, task, &req_num);
+    //vector<WMLayerState> current_states = this->lc->getCurrentStates();
+    // ret = this->setRequest(id, role, area, task, current_states, &req_num);
 
     if (ret != WMError::SUCCESS)
     {
@@ -540,7 +570,7 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
     /*
     * Do allocate tasks
     */
-    ret = this->doTransition(req_num);
+    ret = this->checkPolicy(req_num);
 
     if (ret != WMError::SUCCESS)
     {
@@ -580,6 +610,7 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
 
             // Undo state of PolicyManager
             this->pmw.undoState();
+            this->lc->undoUpdate();
         }
         this->emitScreenUpdated(current_req);
         HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
@@ -605,14 +636,16 @@ result<json_object *> WindowManager::api_get_display_info()
     // Set display info
 /*     size o_size = this->controller->output_size;
     size p_size = this->controller->physical_size; */
+    Screen screen = this->lc->getScreenInfo();
 
     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_add(object, kKeyScale, json_object_new_double(this->controller->scale));
- */
+    json_object_object_add(object, kKeyWidthPixel, json_object_new_int(screen.width()));
+    json_object_object_add(object, kKeyHeightPixel, json_object_new_int(screen.height()));
+    // TODO: set size
+    json_object_object_add(object, kKeyWidthMm, json_object_new_int(0));
+    json_object_object_add(object, kKeyHeightMm, json_object_new_int(0));
+    json_object_object_add(object, kKeyScale, json_object_new_double(this->lc->scale()));
+
     return Ok<json_object *>(object);
 }
 
@@ -625,7 +658,7 @@ result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
     const char *role = this->convertRoleOldToNew(drawing_name);
 
     // Check drawing name, surface/layer id
-    auto const &surface_id = this->lookup_id(role);
+    auto const &surface_id = this->id_alloc.lookup(string(role));
     if (!surface_id)
     {
         return Err<json_object *>("Surface does not exist");
@@ -698,6 +731,7 @@ void WindowManager::send_event(char const *evname, char const *label, char const
  */
 void WindowManager::surface_created(uint32_t surface_id)
 {
+    HMI_DEBUG("current : %d", surface_id);
     /* this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
 
     auto layer_id = this->layers.get_layer_id(surface_id);
@@ -788,6 +822,7 @@ void WindowManager::timerHandler()
 void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
 {
     WMError ret;
+    // req_num is guaranteed by Window Manager
     unsigned req_num = g_app_list.currentRequestNumber();
 
     if (actions.empty())
@@ -809,7 +844,7 @@ void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
         if ("" != act.role)
         {
             bool found;
-            auto const &surface_id = this->lookup_id(act.role.c_str());
+            auto const &surface_id = this->id_alloc.lookup(act.role);
             string appid = g_app_list.getAppID(*surface_id, act.role, &found);
             if (!found)
             {
@@ -825,7 +860,9 @@ void WindowManager::startTransitionWrapper(vector<WMAction> &actions)
                     goto error;
                 }
             }
-            act.appid = appid;
+            auto client = g_app_list.lookUpClient(appid);
+            act.req_num = req_num;
+            act.client = client;
         }
 
         ret = g_app_list.setAction(req_num, act);
@@ -877,15 +914,6 @@ void WindowManager::processError(WMError error)
  ******* Private Functions *******
  */
 
-optional<int> WindowManager::lookup_id(char const *name)
-{
-    return this->id_alloc.lookup(string(name));
-}
-optional<string> WindowManager::lookup_name(int id)
-{
-    return this->id_alloc.lookup(id);
-}
-
 /**
  * init_layers()
  */
@@ -1025,9 +1053,9 @@ void WindowManager::emit_syncdraw(char const *label, char const *area, int x, in
 
 void WindowManager::emit_syncdraw(const string &role, const string &area)
 {
-/*     rect rect = this->layers.getAreaSize(area);
+    rect rect = this->lc->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)
@@ -1055,7 +1083,7 @@ void WindowManager::activate(int id)
         this->controller->surfaces[id]->set_visibility(1);
         */
         char const *label =
-            this->lookup_name(id).value_or("unknown-name").c_str();
+            this->id_alloc.lookup(id).value_or("unknown-name").c_str();
 
         /* // FOR CES DEMO >>>
         if ((0 == strcmp(label, "radio")) ||
@@ -1105,7 +1133,7 @@ void WindowManager::deactivate(int id)
     if (ip != this->controller->sprops.end())
     {*/
         char const *label =
-            this->lookup_name(id).value_or("unknown-name").c_str();
+            this->id_alloc.lookup(id).value_or("unknown-name").c_str();
 
         /*// FOR CES DEMO >>>
         if ((0 == strcmp(label, "radio")) ||
@@ -1179,13 +1207,6 @@ WMError WindowManager::setRequest(const string& appid, const string &role, const
     return WMError::SUCCESS;
 }
 
-WMError WindowManager::doTransition(unsigned req_num)
-{
-    HMI_SEQ_DEBUG(req_num, "check policy");
-    WMError ret = this->checkPolicy(req_num);
-    return ret;
-}
-
 WMError WindowManager::checkPolicy(unsigned req_num)
 {
     /*
@@ -1248,6 +1269,7 @@ WMError WindowManager::startTransition(unsigned req_num)
         return ret;
     }
 
+    g_app_list.reqDump();
     for (const auto &action : actions)
     {
         if (action.visible == TaskVisible::VISIBLE)
@@ -1275,12 +1297,14 @@ WMError WindowManager::startTransition(unsigned req_num)
         // Make it deactivate here
         for (const auto &x : actions)
         {
-            if (g_app_list.contains(x.appid))
+            this->lc->visibilityChange(x);
+            /* if (g_app_list.contains(x.appid))
             {
                 auto client = g_app_list.lookUpClient(x.appid);
-                this->deactivate(client->surfaceID(x.role));
-            }
+                //this->deactivate(client->surfaceID(x.role));
+            } */
         }
+        this->lc->commitChange();
         ret = WMError::NO_LAYOUT_CHANGE;
     }
     return ret;
@@ -1306,17 +1330,14 @@ WMError WindowManager::doEndDraw(unsigned req_num)
         if(act.visible != TaskVisible::NO_CHANGE)
         {
             // layout change
-            if(!g_app_list.contains(act.appid)){
-                ret = WMError::NOT_REGISTERED;
-            }
-            ret = this->layoutChange(act);
+            ret = this->lc->layoutChange(act);
             if(ret != WMError::SUCCESS)
             {
                 HMI_SEQ_WARNING(req_num,
                     "Failed to manipulate surfaces while state change : %s", errorDescription(ret));
                 return ret;
             }
-            ret = this->visibilityChange(act);
+            ret = this->lc->visibilityChange(act);
             if (ret != WMError::SUCCESS)
             {
                 HMI_SEQ_WARNING(req_num,
@@ -1327,7 +1348,7 @@ WMError WindowManager::doEndDraw(unsigned req_num)
             //this->lc_enddraw(act.role.c_str());
         }
     }
-    this->layout_commit();
+    this->lc->commitChange();
 
     HMI_SEQ_INFO(req_num, "emit flushDraw");
 
@@ -1353,7 +1374,8 @@ WMError WindowManager::layoutChange(const WMAction &action)
         // Visibility is not change -> no redraw is required
         return WMError::SUCCESS;
     }
-    auto client = g_app_list.lookUpClient(action.appid);
+    WMError ret = this->lc->layoutChange(action);
+    /* auto client = g_app_list.lookUpClient(action.appid);
     unsigned surface = client->surfaceID(action.role);
     if (surface == 0)
     {
@@ -1362,14 +1384,14 @@ WMError WindowManager::layoutChange(const WMAction &action)
         return WMError::NOT_REGISTERED;
     }
     // Layout Manager
-    WMError ret = this->setSurfaceSize(surface, action.area);
+    WMError ret = this->setSurfaceSize(surface, action.area); */
     return ret;
 }
 
 WMError WindowManager::visibilityChange(const WMAction &action)
 {
     HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Change visibility");
-    if(!g_app_list.contains(action.appid)){
+    /* if(!g_app_list.contains(action.appid)){
         return WMError::NOT_REGISTERED;
     }
     auto client = g_app_list.lookUpClient(action.appid);
@@ -1379,17 +1401,18 @@ WMError WindowManager::visibilityChange(const WMAction &action)
         HMI_SEQ_ERROR(g_app_list.currentRequestNumber(),
                       "client doesn't have surface with role(%s)", action.role.c_str());
         return WMError::NOT_REGISTERED;
-    }
+    } */
+    WMError ret = this->lc->visibilityChange(action);
 
-    if (action.visible != TaskVisible::INVISIBLE)
+/*     if (action.visible != TaskVisible::INVISIBLE)
     {
         this->activate(surface); // Layout Manager task
     }
     else
     {
         this->deactivate(surface); // Layout Manager task
-    }
-    return WMError::SUCCESS;
+    } */
+    return ret;
 }
 
 WMError WindowManager::setSurfaceSize(unsigned surface, const string &area)
@@ -1414,7 +1437,7 @@ void WindowManager::emitScreenUpdated(unsigned req_num)
     {
         if(action.visible != TaskVisible::INVISIBLE)
         {
-            json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
+            json_object_array_add(jarray, json_object_new_string(action.client->appID().c_str()));
         }
     }
     json_object_object_add(j, kKeyIds, jarray);
@@ -1474,7 +1497,7 @@ void WindowManager::processNextRequest()
     if (g_app_list.haveRequest())
     {
         HMI_SEQ_DEBUG(req_num, "Process next request");
-        WMError rc = doTransition(req_num);
+        WMError rc = checkPolicy(req_num);
         if (rc != WMError::SUCCESS)
         {
             HMI_SEQ_ERROR(req_num, errorDescription(rc));
@@ -1587,7 +1610,7 @@ int WindowManager::loadOldRoleDb()
 
 const char *WindowManager::check_surface_exist(const char *drawing_name)
 {
-    auto const &surface_id = this->lookup_id(drawing_name);
+    auto const &surface_id = this->id_alloc.lookup(string(drawing_name));
     if (!surface_id)
     {
         return "Surface does not exist";