X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=5b86af847d0b559947d7dc6814365dc9b5aaa1ac;hb=f25e25114ab2ef7e3019bfe4ff9b65ff93c41b90;hp=c66d4cfabe266ae924fdc7374d968196aecb0493;hpb=0f058700e7a34d75ae929088a31055b7efd0e456;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index c66d4cf..5b86af8 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"; @@ -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() @@ -208,142 +217,110 @@ int WindowManager::dispatch_pending_events() return -1; } -bool WindowManager::pop_pending_events() -{ - bool x{true}; - return this->pending_events.compare_exchange_strong( - x, false, std::memory_order_consume); -} - void WindowManager::set_pending_events() { this->pending_events.store(true, std::memory_order_release); } -optional WindowManager::lookup_id(char const *name) -{ - return this->id_alloc.lookup(std::string(name)); -} -optional WindowManager::lookup_name(int id) +result WindowManager::api_request_surface(char const *appid, char const *drawing_name) { - return this->id_alloc.lookup(id); -} + // TODO: application requests by old role, + // so convert role old to new + const char *role = this->convertRoleOldToNew(drawing_name); -/** - * init_layers() - */ -int WindowManager::init_layers() -{ - if (!this->controller) + auto lid = this->layers.get_layer_id(std::string(role)); + if (!lid) { - HMI_ERROR("wm", "ivi_controller global not available"); - return -1; + /** + * 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); + if (!lid) + { + return Err("Drawing name does not match any role, Fallback is disabled"); + } } - if (this->outputs.empty()) + auto rname = this->lookup_id(role); + if (!rname) { - 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; + // name does not exist yet, allocate surface id... + auto id = int(this->id_alloc.generate_id(role)); + this->layers.add_surface(id, *lid); - // 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)}; + // 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); + } - // Clear scene - layers.clear(); + // add client into the db + std::string appid_str(appid); + g_app_list.addClient(appid_str, *lid, id, std::string(role)); - // Clear screen - s->clear(); + // Set role map of (new, old) + this->rolenew2old[role] = std::string(drawing_name); - // 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()); + return Ok(id); } - // Add layers to screen - s->set_render_order(this->layers.layers); - - this->layout_commit(); - - this->layers.setupArea(o->width, o->height); - - return 0; + // Check currently registered drawing names if it is already there. + return Err("Surface already present"); } -void WindowManager::surface_set_layout(int surface_id, const std::string& area) +char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name, + char const *ivi_id) { - if (!this->controller->surface_exists(surface_id)) - { - HMI_ERROR("wm", "Surface %d does not exist", surface_id); - return; - } + ST(); - auto o_layer_id = this->layers.get_layer_id(surface_id); + // TODO: application requests by old role, + // so convert role old to new + const char *role = this->convertRoleOldToNew(drawing_name); - if (!o_layer_id) + auto lid = this->layers.get_layer_id(std::string(role)); + unsigned sid = std::stol(ivi_id); + + if (!lid) { - HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); - return; + /** + * 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); + if (!lid) + { + return "Drawing name does not match any role, Fallback is disabled"; + } } - uint32_t layer_id = *o_layer_id; - - auto const &layer = this->layers.get_layer(layer_id); - auto rect = this->layers.getAreaSize(area); - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "%s : x:%d y:%d w:%d h:%d", area.c_str(), - rect.x, rect.y, rect.w, rect.h); - auto &s = this->controller->surfaces[surface_id]; - - int x = rect.x; - int y = rect.y; - int w = rect.w; - int h = rect.h; + auto rname = this->lookup_id(role); - // 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) + if (rname) { - h = this->controller->output_size.h + 1 + h; + return "Surface already present"; } - HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, - layer_id); + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(role, sid); + this->layers.add_surface(sid, *lid); - // set destination to the display rectangle - s->set_destination_rectangle(x, y, w, h); + // this surface is already created + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); - // 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; + this->controller->layers[*lid]->add_surface(sid); + this->layout_commit(); - HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", - surface_id, layer_id, x, y, w, h); -} + // add client into the db + std::string appid_str(appid); + g_app_list.addClient(appid_str, *lid, sid, std::string(role)); -void WindowManager::layout_commit() -{ - this->controller->commit_changes(); - this->display->flush(); + // Set role map of (new, old) + this->rolenew2old[role] = std::string(drawing_name); + + return nullptr; } void WindowManager::api_activate_surface(char const *appid, char const *drawing_name, @@ -351,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; @@ -394,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; @@ -437,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); @@ -458,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); @@ -471,6 +461,76 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) } } +result WindowManager::api_get_display_info() +{ + // Check controller + if (!this->controller) + { + return Err("ivi_controller global not available"); + } + + // 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)); + + return Ok(object); +} + +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(role); + if (!surface_id) + { + return Err("Surface does not exist"); + } + + if (!this->controller->surface_exists(*surface_id)) + { + return Err("Surface does not exist in controller!"); + } + + auto layer_id = this->layers.get_layer_id(*surface_id); + if (!layer_id) + { + return Err("Surface is not on any layer!"); + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + if (o_state == nullptr) + { + return Err("Could not find layer for surface"); + } + + struct LayoutState &state = *o_state; + if ((state.main != *surface_id) && (state.sub != *surface_id)) + { + return Err("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(object); +} + void WindowManager::api_ping() { this->dispatch_pending_events(); } void WindowManager::send_event(char const *evname, char const *label) @@ -560,6 +620,142 @@ void WindowManager::timerHandler() this->processNextRequest(); } +/* + ******* Private Functions ******* + */ + +bool WindowManager::pop_pending_events() +{ + bool x{true}; + return this->pending_events.compare_exchange_strong( + x, false, std::memory_order_consume); +} + +optional WindowManager::lookup_id(char const *name) +{ + return this->id_alloc.lookup(std::string(name)); +} +optional WindowManager::lookup_name(int id) +{ + return this->id_alloc.lookup(id); +} + +/** + * init_layers() + */ +int WindowManager::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; + } + + 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), + 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, scale_rect.w, scale_rect.h); + auto &l = layers[i.second.layer_id]; + 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()); + } + + // Add layers to screen + s->set_render_order(this->layers.layers); + + this->layout_commit(); + + return 0; +} + +void WindowManager::surface_set_layout(int surface_id, const std::string& area) +{ + 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 = this->layers.getAreaSize(area); + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "%s : x:%d y:%d w:%d h:%d", area.c_str(), + rect.x, rect.y, rect.w, rect.h); + auto &s = this->controller->surfaces[surface_id]; + + int x = rect.x; + int y = rect.y; + int w = rect.w; + int h = rect.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 WindowManager::layout_commit() +{ + this->controller->commit_changes(); + this->display->flush(); +} + void WindowManager::emit_activated(char const *label) { this->send_event(kListEventName[Event_Active], label); @@ -599,159 +795,103 @@ void WindowManager::emit_invisible(char const *label) void WindowManager::emit_visible(char const *label) { return emit_visible(label, true); } -result WindowManager::api_request_surface(char const *appid, char const *drawing_name) +void WindowManager::activate(int id) { - 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("Drawing name does not match any role, Fallback is disabled"); - } - } - - auto rname = this->lookup_id(drawing_name); - if (!rname) + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end()) { - // 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); - g_app_list.addClient(appid_str, *lid, id, role); - - return Ok(id); - } - - // Check currently registered drawing names if it is already there. - return Err("Surface already present"); -} - -char const *WindowManager::api_request_surface(char const *appid, char const *drawing_name, - char const *ivi_id) -{ - ST(); - - auto lid = this->layers.get_layer_id(std::string(drawing_name)); - unsigned sid = std::stol(ivi_id); + this->controller->surfaces[id]->set_visibility(1); + char const *label = + this->lookup_name(id).value_or("unknown-name").c_str(); - 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) + // FOR CES DEMO >>> + if ((0 == strcmp(label, "radio")) || + (0 == strcmp(label, "music")) || + (0 == strcmp(label, "video")) || + (0 == strcmp(label, "map"))) { - return "Drawing name does not match any role, Fallback is disabled"; - } - } - - auto rname = this->lookup_id(drawing_name); + for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) + { + if (id == *i) + { + // Remove id + this->surface_bg.erase(i); - if (rname) - { - return "Surface already present"; - } + // Remove from BG layer (999) + HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id); + this->controller->layers[999]->remove_surface(id); - // register pair drawing_name and ivi_id - this->id_alloc.register_name_id(drawing_name, sid); - this->layers.add_surface(sid, *lid); + // Add to FG layer (1001) + HMI_DEBUG("wm", "Add %s(%d) to FG layer", label, id); + this->controller->layers[1001]->add_surface(id); - // this surface is already created - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); + for (int j : this->surface_bg) + { + HMI_DEBUG("wm", "Stored id:%d", j); + } + break; + } + } + } + // <<< FOR CES DEMO - this->controller->layers[*lid]->add_surface(sid); - this->layout_commit(); + this->layout_commit(); - // add client into the db - std::string appid_str(appid); - std::string role(drawing_name); - g_app_list.addClient(appid_str, *lid, sid, role); + // TODO: application requests by old role, + // so convert role new to old for emitting event + const char* old_role = this->rolenew2old[label].c_str(); - return nullptr; + this->emit_visible(old_role); + this->emit_activated(old_role); + } } -result WindowManager::api_get_display_info() +void WindowManager::deactivate(int id) { - // Check controller - if (!this->controller) + auto ip = this->controller->sprops.find(id); + if (ip != this->controller->sprops.end()) { - return Err("ivi_controller global not available"); - } - - // Set display info - compositor::size o_size = this->controller->output_size; - compositor::size p_size = this->controller->physical_size; + char const *label = + this->lookup_name(id).value_or("unknown-name").c_str(); - 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)); + // FOR CES DEMO >>> + if ((0 == strcmp(label, "radio")) || + (0 == strcmp(label, "music")) || + (0 == strcmp(label, "video")) || + (0 == strcmp(label, "map"))) + { - return Ok(object); -} + // Store id + this->surface_bg.push_back(id); -result WindowManager::api_get_area_info(char const *drawing_name) -{ - HMI_DEBUG("wm", "called"); + // Remove from FG layer (1001) + HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); + this->controller->layers[1001]->remove_surface(id); - // Check drawing name, surface/layer id - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) - { - return Err("Surface does not exist"); - } + // Add to BG layer (999) + HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); + this->controller->layers[999]->add_surface(id); - if (!this->controller->surface_exists(*surface_id)) - { - return Err("Surface does not exist in controller!"); - } + for (int j : surface_bg) + { + HMI_DEBUG("wm", "Stored id:%d", j); + } + } + else + { + this->controller->surfaces[id]->set_visibility(0); + } + // <<< FOR CES DEMO - auto layer_id = this->layers.get_layer_id(*surface_id); - if (!layer_id) - { - return Err("Surface is not on any layer!"); - } + this->layout_commit(); - auto o_state = *this->layers.get_layout_state(*surface_id); - if (o_state == nullptr) - { - return Err("Could not find layer for surface"); - } + // TODO: application requests by old role, + // so convert role new to old for emitting event + const char* old_role = this->rolenew2old[label].c_str(); - struct LayoutState &state = *o_state; - if ((state.main != *surface_id) && (state.sub != *surface_id)) - { - return Err("Surface is inactive"); + this->emit_deactivated(old_role); + this->emit_invisible(old_role); } - - // 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(object); } WMError WindowManager::setRequest(const std::string& appid, const std::string &role, const std::string &area, @@ -889,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!!"); @@ -923,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); */ @@ -956,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; @@ -1143,20 +1288,17 @@ 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()); } } return ret; } -WMError WindowManager::setSurfaceSize(unsigned surface, const std::string &area) -{ - this->surface_set_layout(surface, area); - - return WMError::SUCCESS; -} - WMError WindowManager::layoutChange(const WMAction &action) { if (action.visible == TaskVisible::INVISIBLE) @@ -1203,6 +1345,13 @@ WMError WindowManager::visibilityChange(const WMAction &action) return WMError::SUCCESS; } +WMError WindowManager::setSurfaceSize(unsigned surface, const std::string &area) +{ + this->surface_set_layout(surface, area); + + return WMError::SUCCESS; +} + WMError WindowManager::changeCurrentState(unsigned req_num) { HMI_SEQ_DEBUG(req_num, "Change current layout state"); @@ -1271,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"); @@ -1287,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); } } @@ -1323,123 +1508,134 @@ void WindowManager::processNextRequest() } } -const char *WindowManager::check_surface_exist(const char *drawing_name) +const char* WindowManager::convertRoleOldToNew(char const *old_role) { - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) + const char *new_role = nullptr; + + for (auto const &on : this->roleold2new) { - return "Surface does not exist"; + 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 (!this->controller->surface_exists(*surface_id)) + if (nullptr == new_role) { - return "Surface does not exist in controller!"; + // role is new or fallback. + new_role = old_role; } - auto layer_id = this->layers.get_layer_id(*surface_id); + HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role); - if (!layer_id) + 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) { - return "Surface is not on any layer!"; + 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"); } - auto o_state = *this->layers.get_layout_state(*surface_id); + // 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)); - if (o_state == nullptr) + // Perse apps + json_object* json_cfg; + if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg)) { - return "Could not find layer for surface"; + HMI_ERROR("wm", "Parse Error!!"); + return -1; } - HMI_DEBUG("wm", "surface %d is detected", *surface_id); - return nullptr; -} + 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)); -void WindowManager::activate(int id) -{ - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end()) + for (int i=0; icontroller->surfaces[id]->set_visibility(1); - char const *label = - this->lookup_name(id).value_or("unknown-name").c_str(); + json_object* json_tmp = json_object_array_get_idx(json_cfg, i); - // FOR CES DEMO >>> - if ((0 == strcmp(label, "Radio")) || - (0 == strcmp(label, "MediaPlayer")) || - (0 == strcmp(label, "Music")) || - (0 == strcmp(label, "Navigation"))) + const char* old_role = jh::getStringFromJson(json_tmp, "name"); + if (nullptr == old_role) { - 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); + HMI_ERROR("wm", "Parse Error!!"); + return -1; + } - for (int j : this->surface_bg) - { - HMI_DEBUG("wm", "Stored id:%d", j); - } - break; - } - } + const char* new_role = jh::getStringFromJson(json_tmp, "new"); + if (nullptr == new_role) + { + HMI_ERROR("wm", "Parse Error!!"); + return -1; } - // <<< FOR CES DEMO - this->layout_commit(); - this->emit_visible(label); - this->emit_activated(label); + 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; } -void WindowManager::deactivate(int id) +const char *WindowManager::check_surface_exist(const char *drawing_name) { - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end()) + auto const &surface_id = this->lookup_id(drawing_name); + if (!surface_id) { - 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"))) - { + return "Surface does not exist"; + } - // Store id - this->surface_bg.push_back(id); + if (!this->controller->surface_exists(*surface_id)) + { + return "Surface does not exist in controller!"; + } - // Remove from FG layer (1001) - HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); - this->controller->layers[1001]->remove_surface(id); + auto layer_id = this->layers.get_layer_id(*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); + if (!layer_id) + { + return "Surface is not on any layer!"; + } - for (int j : surface_bg) - { - HMI_DEBUG("wm", "Stored id:%d", j); - } - } - else - { - this->controller->surfaces[id]->set_visibility(0); - } - // <<< FOR CES DEMO + auto o_state = *this->layers.get_layout_state(*surface_id); - this->emit_deactivated(label); - this->emit_invisible(label); + if (o_state == nullptr) + { + return "Could not find layer for surface"; } + + HMI_DEBUG("wm", "surface %d is detected", *surface_id); + return nullptr; } bool WindowManager::can_split(struct LayoutState const &state, int new_id) @@ -1488,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 */