X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fwindow_manager.cpp;h=62bbbcb59089b6360359ab9481070580ca8a7d43;hb=25e4aae46a08a2a58a8d05702e11451fec235f7d;hp=fcc0906b486466a4b024c3b3e601ec82149a55f7;hpb=6373ce04e2d6c6ae77246bcf7560447b3daaed3d;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index fcc0906..62bbbcb 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -18,7 +18,8 @@ #include #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"; @@ -146,6 +147,7 @@ WindowManager::WindowManager(wl::display *d) int WindowManager::init() { + int ret; if (!this->display->ok()) { return -1; @@ -157,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++) { @@ -178,12 +185,12 @@ int WindowManager::init() // This protocol needs the output, so lets just add our mapping here... this->controller->add_proxy_to_id_mapping( - this->outputs.back()->proxy.get(), + this->outputs.front()->proxy.get(), wl_proxy_get_id(reinterpret_cast( - this->outputs.back()->proxy.get()))); + this->outputs.front()->proxy.get()))); // Create screen - this->controller->create_screen(this->outputs.back()->proxy.get()); + this->controller->create_screen(this->outputs.front()->proxy.get()); // Set display to controller this->controller->display = this->display; @@ -196,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() @@ -216,25 +224,29 @@ void WindowManager::set_pending_events() result 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("Drawing name does not match any role, Fallback is disabled"); + return Err("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 @@ -247,8 +259,10 @@ result 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(id); } @@ -262,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) @@ -270,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"; + 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) { @@ -286,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 @@ -297,20 +315,134 @@ 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; } +/** + * This function is substitute of requestSurface + * If surface creation is faster than application request of this function, + * WM will bind surfaceID with application and role. + * If surface creation is slower than application request of thie function, + * WM will put Client into pending list. + * + * Note : + * Application can request with pid but this is temporary solution for now. + * This will be removed. + * */ +bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){ + std::string id = appid; + std::string role = drawing_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); + 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", role.c_str()); + if (!lid) + { + HMI_ERROR("wm", "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{ + // get floating surface with appid. If WM queries appid from pid, + // WM can bind surface and role with appid(not implemented yet) + //wm_err = g_app_list.popFloatingSurface(id); + } + if(wm_err != WMError::SUCCESS){ + HMI_ERROR("wm", "No floating surface for app: %s", id.c_str()); + g_app_list.addFloatingClient(id, *lid, role); + HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str()); + return ret; + } + + ret = true; + if (g_app_list.contains(id)) + { + HMI_INFO("wm", "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("wm", errorDescription(wm_err)); + } + } + else{ + HMI_INFO("wm", "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); + } + + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(role.c_str(), surface); + this->layers.add_surface(surface, *lid); + + // this surface is already created + HMI_DEBUG("wm", "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; + if(rect.w < 0) + { + rect.w = this->controller->output_size.w + 1 + rect.w; + } + if(rect.h < 0) + { + rect.h = this->controller->output_size.h + 1 + rect.h; + } + + this->controller->layers[*lid]->add_surface(surface); + this->layout_commit(); + + return ret; +} + void WindowManager::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) { 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; + + if(!g_app_list.contains(id)) + { + reply("app doesn't request 'requestSurface' or 'setRole' yet"); + return; + } + auto client = g_app_list.lookUpClient(id); + + unsigned srfc = client->surfaceID(); + if(srfc == 0) + { + HMI_ERROR("wm", "role sould be set with surface"); + reply("role sould be set with surface"); + return; + } + g_app_list.removeFloatingSurface(client->surfaceID()); + Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; @@ -351,11 +483,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; @@ -394,8 +530,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); @@ -454,8 +594,12 @@ result 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("Surface does not exist"); @@ -540,6 +684,8 @@ 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); + auto layer_id = this->layers.get_layer_id(surface_id); if (!layer_id) { @@ -560,6 +706,45 @@ void WindowManager::surface_removed(uint32_t surface_id) g_app_list.removeSurface(surface_id); } +void WindowManager::surface_properties(unsigned surface_id, unsigned pid) +{ + HMI_DEBUG("wm", "get surface properties"); + + // search pid from surfaceID + json_object *response; + afb_service_call_sync("afm-main", "runners", nullptr, &response); + + // retrieve appid from pid from application manager + std::string appid = ""; + if(response == nullptr) + { + HMI_ERROR("wm", "No runners"); + } + else + { + // check appid then add it to the client + HMI_INFO("wm", "Runners:%s", json_object_get_string(response)); + int size = json_object_array_length(response); + for(int i = 0; i < size; i++) + { + json_object *j = json_object_array_get_idx(response, i); + const char* id = jh::getStringFromJson(j, "id"); + int runid = jh::getIntFromJson(j, "runid"); + if(id && (runid > 0)) + { + if(runid == pid) + { + appid = id; + break; + } + } + } + } + json_object_put(response); + + g_app_list.addFloatingSurface(appid, surface_id, pid); +} + void WindowManager::removeClient(const std::string &appid) { HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); @@ -621,12 +806,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), @@ -641,9 +836,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()); @@ -654,8 +851,6 @@ int WindowManager::init_layers() this->layout_commit(); - this->layers.setupArea(o->width, o->height); - return 0; } @@ -688,17 +883,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); @@ -770,10 +954,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) { @@ -799,10 +983,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); } } @@ -815,10 +1004,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 @@ -843,8 +1032,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); } } @@ -983,7 +1178,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!!"); @@ -1017,7 +1212,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); */ @@ -1037,7 +1237,7 @@ WMError WindowManager::startTransition(unsigned req_num) 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()); } } ret = NO_LAYOUT_CHANGE; @@ -1049,9 +1249,18 @@ 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"); + bool found = false; + auto trigger = g_app_list.getRequest(req_num, &found); + // I don't check found == true here because this is checked in caller. + if(trigger.role == "homescreen") + { + HMI_SEQ_INFO(req_num, "In case of 'homescreen' visible, don't change app to invisible"); + return WMError::SUCCESS; + } + // 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; @@ -1060,7 +1269,6 @@ WMError WindowManager::setInvisibleTask(const std::string &role, bool split) int surface; TaskVisible task_visible = TaskVisible::INVISIBLE; bool end_draw_finished = true; - bool found = false; for (auto const &l : this->layers.mapping) { @@ -1227,6 +1435,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); //this->lm_enddraw(act.role.c_str()); } + this->layout_commit(); // Change current state this->changeCurrentState(req_num); @@ -1237,7 +1446,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()); } } @@ -1252,7 +1465,7 @@ WMError WindowManager::layoutChange(const WMAction &action) return WMError::SUCCESS; } auto client = g_app_list.lookUpClient(action.appid); - unsigned surface = client->surfaceID(action.role); + unsigned surface = client->surfaceID(); if (surface == 0) { HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), @@ -1271,7 +1484,7 @@ WMError WindowManager::visibilityChange(const WMAction &action) return WMError::NOT_REGISTERED; } auto client = g_app_list.lookUpClient(action.appid); - unsigned surface = client->surfaceID(action.role); + unsigned surface = client->surfaceID(); if(surface == 0) { HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), @@ -1318,7 +1531,7 @@ WMError WindowManager::changeCurrentState(unsigned req_num) return WMError::NOT_REGISTERED; } auto client = g_app_list.lookUpClient(action.appid); - auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role)); + auto pCurState = *this->layers.get_layout_state((int)client->surfaceID()); if(pCurState == nullptr) { HMI_SEQ_ERROR(req_num, "Counldn't find current status"); @@ -1332,7 +1545,7 @@ WMError WindowManager::changeCurrentState(unsigned req_num) for (const auto &action : actions) { auto client = g_app_list.lookUpClient(action.appid); - auto pLayerCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role)); + auto pLayerCurState = *this->layers.get_layout_state((int)client->surfaceID()); if (pLayerCurState == nullptr) { HMI_SEQ_ERROR(req_num, "Counldn't find current status"); @@ -1342,7 +1555,7 @@ WMError WindowManager::changeCurrentState(unsigned req_num) if (action.visible != TaskVisible::INVISIBLE) { - surface = (int)client->surfaceID(action.role); + surface = (int)client->surfaceID(); HMI_SEQ_INFO(req_num, "Change %s surface : %d, state visible area : %s", action.role.c_str(), surface, action.area.c_str()); // visible == true -> layout changes @@ -1392,17 +1605,22 @@ void WindowManager::emitScreenUpdated(unsigned req_num) { 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"); @@ -1411,7 +1629,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); } } @@ -1447,6 +1665,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; iroleold2new[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); @@ -1524,17 +1841,86 @@ 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 */ void controller_hooks::surface_created(uint32_t surface_id) { - this->app->surface_created(surface_id); + this->wmgr->surface_created(surface_id); } void controller_hooks::surface_removed(uint32_t surface_id) { - this->app->surface_removed(surface_id); + this->wmgr->surface_removed(surface_id); } void controller_hooks::surface_visibility(uint32_t /*surface_id*/, @@ -1546,4 +1932,9 @@ void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, uint32_t /*w*/, uint32_t /*h*/) {} +void controller_hooks::surface_properties(uint32_t surface_id, uint32_t pid) +{ + this->wmgr->surface_properties(surface_id, pid); +} + } // namespace wm