X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=5b86af847d0b559947d7dc6814365dc9b5aaa1ac;hb=f25e25114ab2ef7e3019bfe4ff9b65ff93c41b90;hp=28ef8687061718e082992ff72f39e587544f68a8;hpb=3e58f01b27b293717ce081ea094294890843eb06;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 28ef868..5b86af8 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -18,7 +18,8 @@
 #include <regex>
 
 #include "window_manager.hpp"
-#include "../include/json.hpp"
+#include "json_helper.hpp"
+#include "wm_config.hpp"
 #include "applist.hpp"
 
 extern "C"
@@ -29,7 +30,7 @@ extern "C"
 namespace wm
 {
 
-static const unsigned kTimeOut = 3000000UL; /* 3s */
+static const uint64_t kTimeOut = 3ULL; /* 3s */
 
 /* DrawingArea name used by "{layout}.{area}" */
 const char kNameLayoutNormal[] = "normal";
@@ -50,6 +51,7 @@ const char kKeyWidthPixel[]  = "width_pixel";
 const char kKeyHeightPixel[] = "height_pixel";
 const char kKeyWidthMm[]     = "width_mm";
 const char kKeyHeightMm[]    = "height_mm";
+const char kKeyIds[]         = "ids";
 
 static sd_event_source *g_timer_ev_src = nullptr;
 static AppList g_app_list;
@@ -145,6 +147,7 @@ WindowManager::WindowManager(wl::display *d)
 
 int WindowManager::init()
 {
+    int ret;
     if (!this->display->ok())
     {
         return -1;
@@ -156,6 +159,11 @@ int WindowManager::init()
         return -1;
     }
 
+    // TODO: application requests by old role,
+    //       so create role map (old, new)
+    // Load old_role.db
+    this->loadOldRoleDb();
+
     // Make afb event
     for (int i = Event_Val_Min; i <= Event_Val_Max; i++)
     {
@@ -195,7 +203,8 @@ int WindowManager::init()
     // Third level objects
     this->display->roundtrip();
 
-    return init_layers();
+    ret = init_layers();
+    return ret;
 }
 
 int WindowManager::dispatch_pending_events()
@@ -215,25 +224,29 @@ void WindowManager::set_pending_events()
 
 result<int> WindowManager::api_request_surface(char const *appid, char const *drawing_name)
 {
-    auto lid = this->layers.get_layer_id(std::string(drawing_name));
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *role = this->convertRoleOldToNew(drawing_name);
+
+    auto lid = this->layers.get_layer_id(std::string(role));
     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);
+        lid = this->layers.get_layer_id(std::string("fallback"));
+        HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role);
         if (!lid)
         {
             return Err<int>("Drawing name does not match any role, Fallback is disabled");
         }
     }
 
-    auto rname = this->lookup_id(drawing_name);
+    auto rname = this->lookup_id(role);
     if (!rname)
     {
         // name does not exist yet, allocate surface id...
-        auto id = int(this->id_alloc.generate_id(drawing_name));
+        auto id = int(this->id_alloc.generate_id(role));
         this->layers.add_surface(id, *lid);
 
         // set the main_surface[_name] here and now
@@ -246,8 +259,10 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
 
         // add client into the db
         std::string appid_str(appid);
-        std::string role(drawing_name);
-        g_app_list.addClient(appid_str, *lid, id, role);
+        g_app_list.addClient(appid_str, *lid, id, std::string(role));
+
+        // Set role map of (new, old)
+        this->rolenew2old[role] = std::string(drawing_name);
 
         return Ok<int>(id);
     }
@@ -261,7 +276,11 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
 {
     ST();
 
-    auto lid = this->layers.get_layer_id(std::string(drawing_name));
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *role = this->convertRoleOldToNew(drawing_name);
+
+    auto lid = this->layers.get_layer_id(std::string(role));
     unsigned sid = std::stol(ivi_id);
 
     if (!lid)
@@ -269,15 +288,15 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
         /**
        * 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);
+        lid = this->layers.get_layer_id(std::string("fallback"));
+        HMI_DEBUG("wm", "%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(drawing_name);
+    auto rname = this->lookup_id(role);
 
     if (rname)
     {
@@ -285,7 +304,7 @@ 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(drawing_name, sid);
+    this->id_alloc.register_name_id(role, sid);
     this->layers.add_surface(sid, *lid);
 
     // this surface is already created
@@ -296,8 +315,10 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
 
     // add client into the db
     std::string appid_str(appid);
-    std::string role(drawing_name);
-    g_app_list.addClient(appid_str, *lid, sid, role);
+    g_app_list.addClient(appid_str, *lid, sid, std::string(role));
+
+    // Set role map of (new, old)
+    this->rolenew2old[role] = std::string(drawing_name);
 
     return nullptr;
 }
@@ -307,8 +328,12 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
 {
     ST();
 
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *c_role = this->convertRoleOldToNew(drawing_name);
+
     std::string id = appid;
-    std::string role = drawing_name;
+    std::string role = c_role;
     std::string area = drawing_area;
     Task task = Task::TASK_ALLOCATE;
     unsigned req_num = 0;
@@ -350,11 +375,15 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
 {
     ST();
 
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *c_role = this->convertRoleOldToNew(drawing_name);
+
     /*
     * Check Phase
     */
     std::string id = appid;
-    std::string role = drawing_name;
+    std::string role = c_role;
     std::string area = ""; //drawing_area;
     Task task = Task::TASK_RELEASE;
     unsigned req_num = 0;
@@ -393,8 +422,12 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
 
 void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
 {
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *c_role = this->convertRoleOldToNew(drawing_name);
+
     std::string id = appid;
-    std::string role = drawing_name;
+    std::string role = c_role;
     unsigned current_req = g_app_list.currentRequestNumber();
     bool result = g_app_list.setEndDrawFinished(current_req, id, role);
 
@@ -414,6 +447,7 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name)
         {
             //this->emit_error();
         }
+        this->emitScreenUpdated(current_req);
         HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret));
 
         g_app_list.removeRequest(current_req);
@@ -452,8 +486,12 @@ result<json_object *> WindowManager::api_get_area_info(char const *drawing_name)
 {
     HMI_DEBUG("wm", "called");
 
+    // TODO: application requests by old role,
+    //       so convert role old to new
+    const char *role = this->convertRoleOldToNew(drawing_name);
+
     // Check drawing name, surface/layer id
-    auto const &surface_id = this->lookup_id(drawing_name);
+    auto const &surface_id = this->lookup_id(role);
     if (!surface_id)
     {
         return Err<json_object *>("Surface does not exist");
@@ -619,12 +657,22 @@ int WindowManager::init_layers()
         return -1;
     }
 
+    WMConfig wm_config;
+    wm_config.loadConfigs();
+
     auto &c = this->controller;
 
     auto &o = this->outputs.front();
     auto &s = c->screens.begin()->second;
     auto &layers = c->layers;
 
+    this->layers.loadAreaDb();
+    const compositor::rect base = this->layers.getAreaSize("fullscreen");
+
+    const std::string aspect_setting = wm_config.getConfigAspect();
+    const compositor::rect scale_rect =
+        this->layers.getScaleDestRect(o->width, o->height, aspect_setting);
+
     // 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),
@@ -639,9 +687,11 @@ int WindowManager::init_layers()
     // Quick and dirty setup of layers
     for (auto const &i : this->layers.mapping)
     {
-        c->layer_create(i.second.layer_id, o->width, o->height);
+        c->layer_create(i.second.layer_id, scale_rect.w, scale_rect.h);
         auto &l = layers[i.second.layer_id];
-        l->set_destination_rectangle(0, 0, o->width, o->height);
+        l->set_source_rectangle(0, 0, base.w, base.h);
+        l->set_destination_rectangle(
+            scale_rect.x, scale_rect.y, scale_rect.w, scale_rect.h);
         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());
@@ -652,8 +702,6 @@ int WindowManager::init_layers()
 
     this->layout_commit();
 
-    this->layers.setupArea(o->width, o->height);
-
     return 0;
 }
 
@@ -686,17 +734,6 @@ void WindowManager::surface_set_layout(int surface_id, const std::string& area)
     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;
-    }
-
     HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id,
               layer_id);
 
@@ -768,10 +805,10 @@ void WindowManager::activate(int id)
             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")))
+        if ((0 == strcmp(label, "radio")) ||
+            (0 == strcmp(label, "music")) ||
+            (0 == strcmp(label, "video")) ||
+            (0 == strcmp(label, "map")))
         {
             for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i)
             {
@@ -797,10 +834,15 @@ void WindowManager::activate(int id)
             }
         }
         // <<< FOR CES DEMO
+
         this->layout_commit();
 
-        this->emit_visible(label);
-        this->emit_activated(label);
+        // TODO: application requests by old role,
+        //       so convert role new to old for emitting event
+        const char* old_role = this->rolenew2old[label].c_str();
+
+        this->emit_visible(old_role);
+        this->emit_activated(old_role);
     }
 }
 
@@ -813,10 +855,10 @@ void WindowManager::deactivate(int id)
             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")))
+        if ((0 == strcmp(label, "radio")) ||
+            (0 == strcmp(label, "music")) ||
+            (0 == strcmp(label, "video")) ||
+            (0 == strcmp(label, "map")))
         {
 
             // Store id
@@ -841,8 +883,14 @@ void WindowManager::deactivate(int id)
         }
         // <<< FOR CES DEMO
 
-        this->emit_deactivated(label);
-        this->emit_invisible(label);
+        this->layout_commit();
+
+        // TODO: application requests by old role,
+        //       so convert role new to old for emitting event
+        const char* old_role = this->rolenew2old[label].c_str();
+
+        this->emit_deactivated(old_role);
+        this->emit_invisible(old_role);
     }
 }
 
@@ -981,7 +1029,7 @@ WMError WindowManager::checkPolicy(unsigned req_num)
 
     /*  get new status from Policy Manager */
     HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is");
-    if(trigger.role == "HomeScreen")
+    if(trigger.role == "homescreen")
     {
         // TODO : Remove when Policy Manager completed
         HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!");
@@ -1015,7 +1063,12 @@ WMError WindowManager::startTransition(unsigned req_num)
         if (action.visible != TaskVisible::INVISIBLE)
         {
             sync_draw_happen = true;
-            this->emit_syncdraw(action.role, action.area);
+
+            // TODO: application requests by old role,
+            //       so convert role new to old for emitting event
+            std::string old_role = this->rolenew2old[action.role];
+
+            this->emit_syncdraw(old_role, action.area);
             /* TODO: emit event for app not subscriber
             if(g_app_list.contains(y.appid))
                 g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */
@@ -1048,8 +1101,8 @@ WMError WindowManager::setInvisibleTask(const std::string &role, bool split)
     unsigned req_num = g_app_list.currentRequestNumber();
     HMI_SEQ_DEBUG(req_num, "set current visible app to invisible task");
     // This task is copied from original actiavete surface
-    const char *drawing_name = role.c_str();
-    auto const &surface_id = this->lookup_id(drawing_name);
+    const char *drawing_name = this->rolenew2old[role].c_str();
+    auto const &surface_id = this->lookup_id(role.c_str());
     auto layer_id = this->layers.get_layer_id(*surface_id);
     auto o_state = *this->layers.get_layout_state(*surface_id);
     struct LayoutState &state = *o_state;
@@ -1235,7 +1288,11 @@ WMError WindowManager::doEndDraw(unsigned req_num)
     {
         if(act_flush.visible != TaskVisible::INVISIBLE)
         {
-            this->emit_flushdraw(act_flush.role.c_str());
+            // TODO: application requests by old role,
+            //       so convert role new to old for emitting event
+            std::string old_role = this->rolenew2old[act_flush.role];
+
+            this->emit_flushdraw(old_role.c_str());
         }
     }
 
@@ -1363,14 +1420,50 @@ WMError WindowManager::changeCurrentState(unsigned req_num)
     return WMError::SUCCESS;
 }
 
+void WindowManager::emitScreenUpdated(unsigned req_num)
+{
+    // Get visible apps
+    HMI_SEQ_DEBUG(req_num, "emit screen updated");
+    bool found = false;
+    auto actions = g_app_list.getActions(req_num, &found);
+
+    // create json object
+    json_object *j = json_object_new_object();
+    json_object *jarray = json_object_new_array();
+
+    for(const auto& action: actions)
+    {
+        if(action.visible != TaskVisible::INVISIBLE)
+        {
+            json_object_array_add(jarray, json_object_new_string(action.appid.c_str()));
+        }
+    }
+    json_object_object_add(j, kKeyIds, jarray);
+    HMI_SEQ_INFO(req_num, "Visible app: %s", json_object_get_string(j));
+
+    int ret = afb_event_push(
+        this->map_afb_event[kListEventName[Event_ScreenUpdated]], j);
+    if (ret != 0)
+    {
+        HMI_DEBUG("wm", "afb_event_push failed: %m");
+    }
+    json_object_put(jarray);
+}
+
 void WindowManager::setTimer()
 {
+    struct timespec ts;
+    if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
+        HMI_ERROR("wm", "Could't set time (clock_gettime() returns with error");
+        return;
+    }
+
     HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
     if (g_timer_ev_src == nullptr)
     {
         // firsttime set into sd_event
         int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
-            CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
+            CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
         if (ret < 0)
         {
             HMI_ERROR("wm", "Could't set timer");
@@ -1379,7 +1472,7 @@ void WindowManager::setTimer()
     else
     {
         // update timer limitation after second time
-        sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut);
+        sd_event_source_set_time(g_timer_ev_src, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL);
         sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT);
     }
 }
@@ -1415,6 +1508,105 @@ void WindowManager::processNextRequest()
     }
 }
 
+const char* WindowManager::convertRoleOldToNew(char const *old_role)
+{
+    const char *new_role = nullptr;
+
+    for (auto const &on : this->roleold2new)
+    {
+        std::regex regex = std::regex(on.first);
+        if (std::regex_match(old_role, regex))
+        {
+            // role is old. So convert to new.
+            new_role = on.second.c_str();
+            break;
+        }
+    }
+
+    if (nullptr == new_role)
+    {
+        // role is new or fallback.
+        new_role = old_role;
+    }
+
+    HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role);
+
+    return new_role;
+}
+
+int WindowManager::loadOldRoleDb()
+{
+    // Get afm application installed dir
+    char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
+    HMI_DEBUG("wm", "afm_app_install_dir:%s", afm_app_install_dir);
+
+    std::string file_name;
+    if (!afm_app_install_dir)
+    {
+        HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
+    }
+    else
+    {
+        file_name = std::string(afm_app_install_dir) + std::string("/etc/old_roles.db");
+    }
+
+    // Load old_role.db
+    json_object* json_obj;
+    int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
+    if (0 > ret)
+    {
+        HMI_ERROR("wm", "Could not open old_role.db, so use default old_role information");
+        json_obj = json_tokener_parse(kDefaultOldRoleDb);
+    }
+    HMI_DEBUG("wm", "json_obj dump:%s", json_object_get_string(json_obj));
+
+    // Perse apps
+    json_object* json_cfg;
+    if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg))
+    {
+        HMI_ERROR("wm", "Parse Error!!");
+        return -1;
+    }
+
+    int len = json_object_array_length(json_cfg);
+    HMI_DEBUG("wm", "json_cfg len:%d", len);
+    HMI_DEBUG("wm", "json_cfg dump:%s", json_object_get_string(json_cfg));
+
+    for (int i=0; i<len; i++)
+    {
+        json_object* json_tmp = json_object_array_get_idx(json_cfg, i);
+
+        const char* old_role = jh::getStringFromJson(json_tmp, "name");
+        if (nullptr == old_role)
+        {
+            HMI_ERROR("wm", "Parse Error!!");
+            return -1;
+        }
+
+        const char* new_role = jh::getStringFromJson(json_tmp, "new");
+        if (nullptr == new_role)
+        {
+            HMI_ERROR("wm", "Parse Error!!");
+            return -1;
+        }
+
+        this->roleold2new[old_role] = std::string(new_role);
+    }
+
+    // Check
+    for(auto itr = this->roleold2new.begin();
+      itr != this->roleold2new.end(); ++itr)
+    {
+        HMI_DEBUG("wm", ">>> role old:%s new:%s",
+                  itr->first.c_str(), itr->second.c_str());
+    }
+
+    // Release json_object
+    json_object_put(json_obj);
+
+    return 0;
+}
+
 const char *WindowManager::check_surface_exist(const char *drawing_name)
 {
     auto const &surface_id = this->lookup_id(drawing_name);
@@ -1492,6 +1684,75 @@ bool WindowManager::can_split(struct LayoutState const &state, int new_id)
     return false;
 }
 
+const char* WindowManager::kDefaultOldRoleDb = "{ \
+    \"old_roles\": [ \
+        { \
+            \"name\": \"HomeScreen\", \
+            \"new\": \"homescreen\" \
+        }, \
+        { \
+            \"name\": \"Music\", \
+            \"new\": \"music\" \
+        }, \
+        { \
+            \"name\": \"MediaPlayer\", \
+            \"new\": \"music\" \
+        }, \
+        { \
+            \"name\": \"Video\", \
+            \"new\": \"video\" \
+        }, \
+        { \
+            \"name\": \"VideoPlayer\", \
+            \"new\": \"video\" \
+        }, \
+        { \
+            \"name\": \"WebBrowser\", \
+            \"new\": \"browser\" \
+        }, \
+        { \
+            \"name\": \"Radio\", \
+            \"new\": \"radio\" \
+        }, \
+        { \
+            \"name\": \"Phone\", \
+            \"new\": \"phone\" \
+        }, \
+        { \
+            \"name\": \"Navigation\", \
+            \"new\": \"map\" \
+        }, \
+        { \
+            \"name\": \"HVAC\", \
+            \"new\": \"hvac\" \
+        }, \
+        { \
+            \"name\": \"Settings\", \
+            \"new\": \"settings\" \
+        }, \
+        { \
+            \"name\": \"Dashboard\", \
+            \"new\": \"dashboard\" \
+        }, \
+        { \
+            \"name\": \"POI\", \
+            \"new\": \"poi\" \
+        }, \
+        { \
+            \"name\": \"Mixer\", \
+            \"new\": \"mixer\" \
+        }, \
+        { \
+            \"name\": \"Restriction\", \
+            \"new\": \"restriction\" \
+        }, \
+        { \
+            \"name\": \"^OnScreen.*\", \
+            \"new\": \"on_screen\" \
+        } \
+    ] \
+}";
+
 /**
  * controller_hooks
  */