X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=bbfd08ccffa014559420947310667129dbb3ab4a;hb=refs%2Fheads%2Fsandbox%2Fruke47%2Flifecycle;hp=c57ab09a25985d003cfbe6cd07851ceabbf0bad6;hpb=6d11d35f86649511e6a5b4b8ab6b6ae13cb4d556;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index c57ab09..bbfd08c 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -19,7 +19,6 @@ #include "window_manager.hpp" #include "json_helper.hpp" -#include "wm_config.hpp" #include "applist.hpp" extern "C" @@ -27,6 +26,9 @@ extern "C" #include } +using std::string; +using std::vector; + namespace wm { @@ -51,218 +53,144 @@ const char kKeyWidthPixel[] = "width_pixel"; const char kKeyHeightPixel[] = "height_pixel"; const char kKeyWidthMm[] = "width_mm"; const char kKeyHeightMm[] = "height_mm"; +const char kKeyScale[] = "scale"; const char kKeyIds[] = "ids"; +static const vector kListEventName{ + "active", + "inactive", + "visible", + "invisible", + "syncDraw", + "flushDraw", + "screenUpdated", + "error"}; + static sd_event_source *g_timer_ev_src = nullptr; static AppList g_app_list; +static WindowManager *g_context; namespace { -using nlohmann::json; - -result file_to_json(char const *filename) +static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) { - json j; - std::ifstream i(filename); - if (i.fail()) - { - HMI_DEBUG("wm", "Could not open config file, so use default layer information"); - j = default_layers_json; - } - else - { - i >> j; - } - - return Ok(j); + HMI_NOTICE("Time out occurs because the client replys endDraw slow, so revert the request"); + reinterpret_cast(userdata)->timerHandler(); + return 0; } -struct result load_layer_map(char const *filename) +static void onStateTransitioned(vector actions) { - HMI_DEBUG("wm", "loading IDs from %s", filename); - - auto j = file_to_json(filename); - if (j.is_err()) - { - return Err(j.unwrap_err()); - } - json jids = j.unwrap(); - - return to_layer_map(jids); + g_context->startTransitionWrapper(actions); } -static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) +static void onError() { - HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request"); - reinterpret_cast(userdata)->timerHandler(); - return 0; + g_context->processError(WMError::LAYOUT_CHANGE_FAIL); } - } // namespace /** * WindowManager Impl */ -WindowManager::WindowManager(wl::display *d) - : chooks{this}, - display{d}, - controller{}, - outputs(), - layers(), - id_alloc{}, - pending_events(false) +WindowManager::WindowManager() + : id_alloc{} { - char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR"); - std::string path; - if (!path_layers_json) - { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - path = std::string(path_layers_json); - } - else + const char *path = getenv("AFM_APP_INSTALL_DIR"); + if (!path) { - path = std::string(path_layers_json) + std::string("/etc/layers.json"); + HMI_ERROR("AFM_APP_INSTALL_DIR is not defined"); } + string root = path; - try - { - { - auto l = load_layer_map(path.c_str()); - if (l.is_ok()) - { - this->layers = l.unwrap(); - } - else - { - HMI_ERROR("wm", "%s", l.err().value()); - } - } - } - catch (std::exception &e) - { - HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); - } + this->lc = std::make_shared(root); + + HMI_DEBUG("Layer Controller initialized"); } int WindowManager::init() { - int ret; - if (!this->display->ok()) - { - return -1; - } + LayerControlCallbacks lmcb; + lmcb.surfaceCreated = [&](unsigned pid, unsigned surface){ + this->surface_created(surface); + }; + lmcb.surfaceDestroyed = [&](unsigned surface){ + this->surface_removed(surface); + }; - if (this->layers.mapping.empty()) + if(this->lc->init(lmcb) != WMError::SUCCESS) { - HMI_ERROR("wm", "No surface -> layer mapping loaded"); return -1; } - // TODO: application requests by old role, - // so create role map (old, new) - // Load old_role.db - this->loadOldRoleDb(); + // Store my context for calling callback from PolicyManager + g_context = this; + + // Initialize PMWrapper + this->pmw.initialize(); + + // Register callback to PolicyManager + this->pmw.registerCallback(onStateTransitioned, onError); // Make afb event for (int i = Event_Val_Min; i <= Event_Val_Max; i++) { - map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); + map_afb_event[kListEventName[i]] = afb_api_make_event(afbBindingV3root, kListEventName[i].c_str()); } - this->display->add_global_handler( - "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) { - this->outputs.emplace_back(std::make_unique(r, name, v)); - }); - - this->display->add_global_handler( - "ivi_wm", [this](wl_registry *r, uint32_t name, uint32_t v) { - this->controller = - std::make_unique(r, name, v); - - // Init controller hooks - this->controller->chooks = &this->chooks; + const struct rect css_bg = this->lc->getAreaSize("fullscreen"); + Screen screen = this->lc->getScreenInfo(); + rectangle dp_bg(screen.width(), screen.height()); - // This protocol needs the output, so lets just add our mapping here... - this->controller->add_proxy_to_id_mapping( - this->outputs.back()->proxy.get(), - wl_proxy_get_id(reinterpret_cast( - this->outputs.back()->proxy.get()))); + dp_bg.set_aspect(static_cast(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()); - // Create screen - this->controller->create_screen(this->outputs.back()->proxy.get()); + double scale = static_cast(dp_bg.height()) / css_bg.h; + this->lc->setupArea(dp_bg, scale); - // Set display to controller - this->controller->display = this->display; - }); - - // First level objects - this->display->roundtrip(); - // Second level objects - this->display->roundtrip(); - // Third level objects - this->display->roundtrip(); - - ret = init_layers(); - return ret; -} - -int WindowManager::dispatch_pending_events() -{ - if (this->pop_pending_events()) - { - this->display->dispatch_pending(); - return 0; - } - return -1; -} - -void WindowManager::set_pending_events() -{ - this->pending_events.store(true, std::memory_order_release); + return 0; } result WindowManager::api_request_surface(char const *appid, char const *drawing_name) { - // TODO: application requests by old role, - // so convert role old to new - const char *role = this->convertRoleOldToNew(drawing_name); + string str_id = appid; + string role = drawing_name; + unsigned lid = 0; - auto lid = this->layers.get_layer_id(std::string(role)); - if (!lid) + if(!g_app_list.contains(str_id)) { - /** - * 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) + lid = this->lc->getNewLayerID(role); + if (lid == 0) { - return Err("Drawing name does not match any role, fallback is disabled"); + // register drawing_name as fallback and make it displayed. + lid = this->lc->getNewLayerID(string("fallback")); + HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); + if (lid == 0) + { + return Err("Designated role does not match any role, fallback is disabled"); + } } + this->lc->createNewLayer(lid); + // add client into the db + g_app_list.addClient(str_id, lid, role); } - auto rname = this->lookup_id(role); + // generate surface ID for ivi-shell application + auto rname = this->id_alloc.lookup(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); - - // 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); - g_app_list.addClient(appid_str, *lid, id, std::string(role)); + this->tmp_surface2app[id] = {str_id, lid}; - // Set role map of (new, old) - this->rolenew2old[role] = std::string(drawing_name); + // POI: AGL LifeCycle Management + this->amgr.states[str_id] = lcm::CREATED; + this->amgr.emit_activity_status_changed(str_id.c_str(), + this->amgr.states_s[lcm::CREATED]); return Ok(id); } @@ -274,29 +202,43 @@ result 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) { - ST(); - - // TODO: application requests by old role, - // so convert role old to new - const char *role = this->convertRoleOldToNew(drawing_name); + string str_id = appid; + string role = drawing_name; - auto lid = this->layers.get_layer_id(std::string(role)); unsigned sid = std::stol(ivi_id); + HMI_DEBUG("This API(requestSurfaceXDG) is for XDG Application using runXDG"); + /* + * IVI-shell doesn't send surface_size event via ivi-wm protocol + * if the application is using XDG surface. + * So WM has to set surface size with original size here + */ + WMError ret = this->lc->setXDGSurfaceOriginSize(sid); + if(ret != SUCCESS) + { + HMI_ERROR("%s", errorDescription(ret)); + HMI_WARNING("The main user of this API is runXDG"); + return "fail"; + } - if (!lid) + if(!g_app_list.contains(str_id)) { - /** - * 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) + unsigned l_id = this->lc->getNewLayerID(role); + if (l_id == 0) { - return "Drawing name does not match any role, fallback is disabled"; + // register drawing_name as fallback and make it displayed. + l_id = this->lc->getNewLayerID("fallback"); + HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); + if (l_id == 0) + { + return "Designated role does not match any role, fallback is disabled"; + } } + this->lc->createNewLayer(l_id); + // add client into the db + g_app_list.addClient(str_id, l_id, role); } - auto rname = this->lookup_id(role); + auto rname = this->id_alloc.lookup(role); if (rname) { @@ -305,36 +247,32 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr // register pair drawing_name and ivi_id this->id_alloc.register_name_id(role, sid); - this->layers.add_surface(sid, *lid); - - // this surface is already created - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); - this->controller->layers[*lid]->add_surface(sid); - this->layout_commit(); + auto client = g_app_list.lookUpClient(str_id); + client->addSurface(sid); - // add client into the db - std::string appid_str(appid); - g_app_list.addClient(appid_str, *lid, sid, std::string(role)); - - // Set role map of (new, old) - this->rolenew2old[role] = std::string(drawing_name); + // POI: AGL LifeCycle Management + this->amgr.states[str_id] = lcm::CREATED; + this->amgr.emit_activity_status_changed(str_id.c_str(), + this->amgr.states_s[lcm::CREATED]); return nullptr; } -void WindowManager::api_activate_surface(char const *appid, char const *drawing_name, +void WindowManager::api_activate_window(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) { - ST(); + string id = appid; + string role = drawing_name; + string area = drawing_area; - // TODO: application requests by old role, - // so convert role old to new - const char *c_role = this->convertRoleOldToNew(drawing_name); + if(!g_app_list.contains(id)) + { + reply("app doesn't request 'requestSurface' or 'setRole' yet"); + return; + } + auto client = g_app_list.lookUpClient(id); - std::string id = appid; - std::string role = c_role; - std::string area = drawing_area; Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; @@ -343,7 +281,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ if(ret != WMError::SUCCESS) { - HMI_ERROR("wm", errorDescription(ret)); + HMI_ERROR(errorDescription(ret)); reply("Failed to set request"); return; } @@ -356,10 +294,9 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ return; } - /* - * Do allocate tasks - */ - ret = this->doTransition(req_num); + // Do allocate tasks + + ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { @@ -367,24 +304,23 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ HMI_SEQ_ERROR(req_num, errorDescription(ret)); g_app_list.removeRequest(req_num); this->processNextRequest(); + } else { + // POI: AGL LifeCycle Management + if (this->amgr.states[id] == lcm::CREATED) { + this->amgr.states[id] = lcm::STARTED; + this->amgr.emit_activity_status_changed(id.c_str(), + this->amgr.states_s[lcm::STARTED]); + } } } -void WindowManager::api_deactivate_surface(char const *appid, char const *drawing_name, +void WindowManager::api_deactivate_window(char const *appid, char const *drawing_name, 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); - - /* - * Check Phase - */ - std::string id = appid; - std::string role = c_role; - std::string area = ""; //drawing_area; + // Check Phase + string id = appid; + string role = drawing_name; + string area = ""; //drawing_area; Task task = Task::TASK_RELEASE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; @@ -393,7 +329,7 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin if (ret != WMError::SUCCESS) { - HMI_ERROR("wm", errorDescription(ret)); + HMI_ERROR(errorDescription(ret)); reply("Failed to set request"); return; } @@ -406,10 +342,8 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin return; } - /* - * Do allocate tasks - */ - ret = this->doTransition(req_num); + // Do allocate tasks + ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { @@ -417,23 +351,27 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin HMI_SEQ_ERROR(req_num, errorDescription(ret)); g_app_list.removeRequest(req_num); this->processNextRequest(); + } else { + // POI: AGL LifeCycle Management + int state = this->amgr.states[id]; + if (state == lcm::STARTED || state == lcm::BACKGROUND) { + this->amgr.states[id] = lcm::STOPPED; + this->amgr.emit_activity_status_changed(id.c_str(), + this->amgr.states_s[lcm::STOPPED]); + } } } 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 = c_role; + string id = appid; + string role = drawing_name; unsigned current_req = g_app_list.currentRequestNumber(); bool result = g_app_list.setEndDrawFinished(current_req, id, role); if (!result) { - HMI_ERROR("wm", "%s is not in transition state", id.c_str()); + HMI_ERROR("%s is not in transition state", id.c_str()); return; } @@ -446,6 +384,10 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) if(ret != WMError::SUCCESS) { //this->emit_error(); + + // 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)); @@ -461,67 +403,42 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) } } -result WindowManager::api_get_display_info() +int WindowManager::api_subscribe(afb_req_t req, int event_id) { - // Check controller - if (!this->controller) - { - return Err("ivi_controller global not available"); - } + afb_event_t event = this->map_afb_event[kListEventName[event_id]]; + return afb_req_subscribe(req, event); +} - // Set display info - compositor::size o_size = this->controller->output_size; - compositor::size p_size = this->controller->physical_size; +result WindowManager::api_get_display_info() +{ + 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, 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(object); } result WindowManager::api_get_area_info(char const *drawing_name) { - HMI_DEBUG("wm", "called"); + HMI_DEBUG("called"); - // TODO: application requests by old role, - // so convert role old to new - const char *role = this->convertRoleOldToNew(drawing_name); + string role = drawing_name; // Check drawing name, surface/layer id - auto const &surface_id = this->lookup_id(role); + auto const &surface_id = this->id_alloc.lookup(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]; + struct 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)); @@ -531,28 +448,21 @@ result WindowManager::api_get_area_info(char const *drawing_name) return Ok(object); } -void WindowManager::api_ping() { this->dispatch_pending_events(); } - -void WindowManager::send_event(char const *evname, char const *label) +void WindowManager::send_event(const string& evname, const string& role) { - HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label); - json_object *j = json_object_new_object(); - json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); + json_object_object_add(j, kKeyDrawingName, json_object_new_string(role.c_str())); int ret = afb_event_push(this->map_afb_event[evname], j); if (ret != 0) { - HMI_DEBUG("wm", "afb_event_push failed: %m"); + HMI_DEBUG("afb_event_push failed: %m"); } } -void WindowManager::send_event(char const *evname, char const *label, char const *area, +void WindowManager::send_event(const string& evname, const string& role, const string& area, int x, int y, int w, int h) { - HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d", - __func__, evname, label, area, x, y, w, h); - json_object *j_rect = json_object_new_object(); json_object_object_add(j_rect, kKeyX, json_object_new_int(x)); json_object_object_add(j_rect, kKeyY, json_object_new_int(y)); @@ -560,48 +470,59 @@ void WindowManager::send_event(char const *evname, char const *label, char const json_object_object_add(j_rect, kKeyHeight, json_object_new_int(h)); json_object *j = json_object_new_object(); - json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); - json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area)); + json_object_object_add(j, kKeyDrawingName, json_object_new_string(role.c_str())); + json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area.c_str())); json_object_object_add(j, kKeyDrawingRect, j_rect); int ret = afb_event_push(this->map_afb_event[evname], j); if (ret != 0) { - HMI_DEBUG("wm", "afb_event_push failed: %m"); + HMI_DEBUG("afb_event_push failed: %m"); } } /** * proxied events */ -void WindowManager::surface_created(uint32_t surface_id) +void WindowManager::surface_created(unsigned 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) + // requestSurface + if(this->tmp_surface2app.count(surface_id) != 0) { - HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!", - surface_id); - return; + string appid = this->tmp_surface2app[surface_id].appid; + auto client = g_app_list.lookUpClient(appid); + if(client != nullptr) + { + WMError ret = client->addSurface(surface_id); + HMI_INFO("Add surface %d to \"%s\"", surface_id, appid.c_str()); + if(ret != WMError::SUCCESS) + { + HMI_ERROR("Failed to add surface to client %s", client->appID().c_str()); + } + } + this->tmp_surface2app.erase(surface_id); } - - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id); - - this->controller->layers[*layer_id]->add_surface(surface_id); - this->layout_commit(); } -void WindowManager::surface_removed(uint32_t surface_id) +void WindowManager::surface_removed(unsigned surface_id) { - HMI_DEBUG("wm", "surface_id is %u", surface_id); + HMI_DEBUG("Delete surface_id %u", surface_id); + this->id_alloc.remove_id(surface_id); g_app_list.removeSurface(surface_id); } -void WindowManager::removeClient(const std::string &appid) +void WindowManager::removeClient(const string &appid) { - HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); + HMI_DEBUG("Remove clinet %s from list", appid.c_str()); + auto client = g_app_list.lookUpClient(appid); + this->lc->appTerminated(client); g_app_list.removeClient(appid); + // POI: AGL LifeCycle Management + if (this->amgr.states[appid] != lcm::DESTROYED) { + this->amgr.states[appid] = lcm::DESTROYED; + this->amgr.emit_activity_status_changed(appid.c_str(), + this->amgr.states_s[lcm::DESTROYED]); + } } void WindowManager::exceptionProcessForTransition() @@ -622,281 +543,144 @@ 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) +void WindowManager::startTransitionWrapper(vector &actions) { - return this->id_alloc.lookup(id); -} + WMError ret; + unsigned req_num = g_app_list.currentRequestNumber(); -/** - * init_layers() - */ -int WindowManager::init_layers() -{ - if (!this->controller) + if (actions.empty()) { - HMI_ERROR("wm", "ivi_controller global not available"); - return -1; + if (g_app_list.haveRequest()) + { + HMI_SEQ_DEBUG(req_num, "There is no WMAction for this request"); + goto proc_remove_request; + } + else + { + HMI_SEQ_DEBUG(req_num, "There is no request"); + return; + } } - if (this->outputs.empty()) + for (auto &act : actions) { - 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(); + if ("" != act.role) + { + bool found; + auto const &surface_id = this->id_alloc.lookup(act.role); + if(surface_id == nullopt) + { + goto proc_remove_request; + } + string appid = g_app_list.getAppID(*surface_id, &found); + if (!found) + { + if (TaskVisible::INVISIBLE == act.visible) + { + // App is killed, so do not set this action + continue; + } + else + { + HMI_SEQ_ERROR(req_num, "appid which is visible is not found"); + ret = WMError::FAIL; + goto error; + } + } + auto client = g_app_list.lookUpClient(appid); + act.req_num = req_num; + act.client = client; + } - // Clear screen - s->clear(); + ret = g_app_list.setAction(req_num, act); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Setting action is failed"); + goto error; + } + } - // Quick and dirty setup of layers - for (auto const &i : this->layers.mapping) + HMI_SEQ_DEBUG(req_num, "Start transition."); + ret = this->startTransition(req_num); + if (ret != WMError::SUCCESS) { - 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()); + if (ret == WMError::NO_LAYOUT_CHANGE) + { + goto proc_remove_request; + } + else + { + HMI_SEQ_ERROR(req_num, "Transition state is failed"); + goto error; + } } - // Add layers to screen - s->set_render_order(this->layers.layers); + return; - this->layout_commit(); +error: + //this->emit_error() + HMI_SEQ_ERROR(req_num, errorDescription(ret)); + this->pmw.undoState(); - return 0; +proc_remove_request: + g_app_list.removeRequest(req_num); + this->processNextRequest(); } -void WindowManager::surface_set_layout(int surface_id, const std::string& area) +void WindowManager::processError(WMError error) { - 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; + unsigned req_num = g_app_list.currentRequestNumber(); - HMI_DEBUG("wm", "Surface %u now on layer %u with rect { %d, %d, %d, %d }", - surface_id, layer_id, x, y, w, h); + //this->emit_error() + HMI_SEQ_ERROR(req_num, errorDescription(error)); + g_app_list.removeRequest(req_num); + this->processNextRequest(); } -void WindowManager::layout_commit() -{ - this->controller->commit_changes(); - this->display->flush(); -} +/* + ******* Private Functions ******* + */ -void WindowManager::emit_activated(char const *label) +void WindowManager::emit_activated(const string& role) { - this->send_event(kListEventName[Event_Active], label); + this->send_event(kListEventName[Event_Active], role); } -void WindowManager::emit_deactivated(char const *label) +void WindowManager::emit_deactivated(const string& role) { - this->send_event(kListEventName[Event_Inactive], label); + this->send_event(kListEventName[Event_Inactive], role); } -void WindowManager::emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h) +void WindowManager::emit_syncdraw(const string& role, char const *area, int x, int y, int w, int h) { - this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); + this->send_event(kListEventName[Event_SyncDraw], role, area, x, y, w, h); } -void WindowManager::emit_syncdraw(const std::string &role, const std::string &area) +void WindowManager::emit_syncdraw(const string &role, const string &area) { - compositor::rect rect = this->layers.getAreaSize(area); + struct 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, area, rect.x, rect.y, rect.w, rect.h); } -void WindowManager::emit_flushdraw(char const *label) +void WindowManager::emit_flushdraw(const string& role) { - this->send_event(kListEventName[Event_FlushDraw], label); + this->send_event(kListEventName[Event_FlushDraw], role); } -void WindowManager::emit_visible(char const *label, bool is_visible) +void WindowManager::emit_visible(const string& role, bool is_visible) { - this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label); + this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], role); } -void WindowManager::emit_invisible(char const *label) +void WindowManager::emit_invisible(const string& role) { - return emit_visible(label, false); -} - -void WindowManager::emit_visible(char const *label) { return emit_visible(label, true); } - -void WindowManager::activate(int id) -{ - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end()) - { - this->controller->surfaces[id]->set_visibility(1); - char const *label = - this->lookup_name(id).value_or("unknown-name").c_str(); - - // FOR CES DEMO >>> - 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) - { - 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); - - for (int j : this->surface_bg) - { - HMI_DEBUG("wm", "Stored id:%d", j); - } - break; - } - } - } - // <<< FOR CES DEMO - - 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_visible(old_role); - this->emit_activated(old_role); - } + return emit_visible(role, false); } -void WindowManager::deactivate(int id) -{ - auto ip = this->controller->sprops.find(id); - if (ip != this->controller->sprops.end()) - { - char const *label = - this->lookup_name(id).value_or("unknown-name").c_str(); - - // FOR CES DEMO >>> - if ((0 == strcmp(label, "radio")) || - (0 == strcmp(label, "music")) || - (0 == strcmp(label, "video")) || - (0 == strcmp(label, "map"))) - { - - // Store id - this->surface_bg.push_back(id); - - // Remove from FG layer (1001) - HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); - this->controller->layers[1001]->remove_surface(id); +void WindowManager::emit_visible(const string& role) { return emit_visible(role, true); } - // Add to BG layer (999) - HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); - this->controller->layers[999]->add_surface(id); - - for (int j : surface_bg) - { - HMI_DEBUG("wm", "Stored id:%d", j); - } - } - else - { - this->controller->surfaces[id]->set_visibility(0); - } - // <<< FOR CES DEMO - - 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); - } -} - -WMError WindowManager::setRequest(const std::string& appid, const std::string &role, const std::string &area, +WMError WindowManager::setRequest(const string& appid, const string &role, const string &area, Task task, unsigned* req_num) { if (!g_app_list.contains(appid)) @@ -928,19 +712,6 @@ WMError WindowManager::setRequest(const std::string& appid, const std::string &r return WMError::SUCCESS; } -WMError WindowManager::doTransition(unsigned req_num) -{ - HMI_SEQ_DEBUG(req_num, "check policy"); - WMError ret = this->checkPolicy(req_num); - if (ret != WMError::SUCCESS) - { - return ret; - } - HMI_SEQ_DEBUG(req_num, "Start transition."); - ret = this->startTransition(req_num); - return ret; -} - WMError WindowManager::checkPolicy(unsigned req_num) { /* @@ -948,7 +719,6 @@ WMError WindowManager::checkPolicy(unsigned req_num) */ // get current trigger bool found = false; - bool split = false; WMError ret = WMError::LAYOUT_CHANGE_FAIL; auto trigger = g_app_list.getRequest(req_num, &found); if (!found) @@ -956,91 +726,24 @@ WMError WindowManager::checkPolicy(unsigned req_num) ret = WMError::NO_ENTRY; return ret; } - std::string req_area = trigger.area; - - // >>>> Compatible with current window manager until policy manager coming - if (trigger.task == Task::TASK_ALLOCATE) - { - HMI_SEQ_DEBUG(req_num, "Check split or not"); - const char *msg = this->check_surface_exist(trigger.role.c_str()); - - if (msg) - { - HMI_SEQ_ERROR(req_num, msg); - ret = WMError::LAYOUT_CHANGE_FAIL; - return ret; - } - - auto const &surface_id = this->lookup_id(trigger.role.c_str()); - auto o_state = *this->layers.get_layout_state(*surface_id); - struct LayoutState &state = *o_state; + string req_area = trigger.area; - unsigned curernt_sid = state.main; - split = this->can_split(state, *surface_id); - - if (split) - { - HMI_SEQ_DEBUG(req_num, "Split happens"); - // Get current visible role - std::string add_role = this->lookup_name(state.main).value(); - // Set next area - std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); - // Change request area - req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); - HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split happens", - trigger.area.c_str(), req_area.c_str()); - // set another action - std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found); - if (!found) - { - HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %d", curernt_sid); - ret = WMError::NOT_REGISTERED; - return ret; - } - HMI_SEQ_INFO(req_num, "Additional split app %s, role: %s, area: %s", - add_name.c_str(), add_role.c_str(), add_area.c_str()); - // Set split action - bool end_draw_finished = false; - WMAction split_action{ - add_name, - add_role, - add_area, - TaskVisible::VISIBLE, - end_draw_finished}; - WMError ret = g_app_list.setAction(req_num, split_action); - if (ret != WMError::SUCCESS) - { - HMI_SEQ_ERROR(req_num, "Failed to set action"); - return ret; - } - g_app_list.reqDump(); - } - } - else + // Input event data to PolicyManager + if (0 > this->pmw.setInputEventData(trigger.task, trigger.role, trigger.area)) { - HMI_SEQ_DEBUG(req_num, "split doesn't happen"); + HMI_SEQ_ERROR(req_num, "Failed to set input event data to PolicyManager"); + return ret; } - // Set invisible task(Remove if policy manager finish) - ret = this->setInvisibleTask(trigger.role, split); - if(ret != WMError::SUCCESS) + // Execute state transition of PolicyManager + if (0 > this->pmw.executeStateTransition()) { - HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret)); + HMI_SEQ_ERROR(req_num, "Failed to execute state transition of PolicyManager"); return ret; } - /* 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") - { - // TODO : Remove when Policy Manager completed - HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!"); - req_area = "fullscreen"; - } - TaskVisible task_visible = - (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE; + ret = WMError::SUCCESS; - ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible); g_app_list.reqDump(); return ret; @@ -1060,17 +763,13 @@ WMError WindowManager::startTransition(unsigned req_num) return ret; } + g_app_list.reqDump(); for (const auto &action : actions) { - if (action.visible != TaskVisible::INVISIBLE) + if (action.visible == TaskVisible::VISIBLE) { sync_draw_happen = true; - - // 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); + this->emit_syncdraw(action.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); */ @@ -1087,169 +786,20 @@ 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); + emit_deactivated(x.role); + /* if (g_app_list.contains(x.client->appID())) { - auto client = g_app_list.lookUpClient(x.appid); + auto client = g_app_list.lookUpClient(x.client->appID()); this->deactivate(client->surfaceID(x.role)); - } + } */ } - ret = NO_LAYOUT_CHANGE; + this->lc->renderLayers(); + ret = WMError::NO_LAYOUT_CHANGE; } return ret; } -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 = 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; - std::string add_name, add_role; - std::string add_area = ""; - int surface; - TaskVisible task_visible = TaskVisible::INVISIBLE; - bool end_draw_finished = true; - - for (auto const &l : this->layers.mapping) - { - if (l.second.layer_id <= *layer_id) - { - continue; - } - HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub); - if (l.second.state.main != -1) - { - //this->deactivate(l.second.state.main); - surface = l.second.state.main; - add_role = *this->id_alloc.lookup(surface); - add_name = g_app_list.getAppID(surface, add_role, &found); - if(!found){ - return WMError::NOT_REGISTERED; - } - HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str()); - WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished}; - g_app_list.setAction(req_num, act); - l.second.state.main = -1; - } - - if (l.second.state.sub != -1) - { - //this->deactivate(l.second.state.sub); - surface = l.second.state.sub; - add_role = *this->id_alloc.lookup(surface); - add_name = g_app_list.getAppID(surface, add_role, &found); - if (!found) - { - return WMError::NOT_REGISTERED; - } - HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str()); - WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished}; - g_app_list.setAction(req_num, act); - l.second.state.sub = -1; - } - } - - // change current state here, but this is hack - auto layer = this->layers.get_layer(*layer_id); - - if (state.main == -1) - { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); - } - else - { - if (0 != strcmp(drawing_name, "HomeScreen")) - { - if (split) - { - if (state.sub != *surface_id) - { - if (state.sub != -1) - { - //this->deactivate(state.sub); - WMAction deact_sub; - deact_sub.role = - std::move(*this->id_alloc.lookup(state.sub)); - deact_sub.area = add_area; - deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); - if (!found) - { - HMI_SEQ_ERROR(req_num, "App doesn't exist for role : %s", - deact_sub.role.c_str()); - return WMError::NOT_REGISTERED; - } - deact_sub.visible = task_visible; - deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req_num, "Set invisible task for %s", deact_sub.appid.c_str()); - g_app_list.setAction(req_num, deact_sub); - } - } - //state = LayoutState{state.main, *surface_id}; - } - else - { - HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); - - //this->surface_set_layout(*surface_id); - if (state.main != *surface_id) - { - // this->deactivate(state.main); - WMAction deact_main; - deact_main.role = std::move(*this->id_alloc.lookup(state.main)); - ; - deact_main.area = add_area; - deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found); - if (!found) - { - HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist"); - return WMError::NOT_REGISTERED; - } - deact_main.visible = task_visible; - deact_main.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); - g_app_list.setAction(req_num, deact_main); - } - if (state.sub != -1) - { - if (state.sub != *surface_id) - { - //this->deactivate(state.sub); - WMAction deact_sub; - deact_sub.role = std::move(*this->id_alloc.lookup(state.sub)); - ; - deact_sub.area = add_area; - deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); - if (!found) - { - HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist"); - return WMError::NOT_REGISTERED; - } - deact_sub.visible = task_visible; - deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); - g_app_list.setAction(req_num, deact_sub); - } - } - //state = LayoutState{*surface_id}; - } - } - } - return WMError::SUCCESS; -} - WMError WindowManager::doEndDraw(unsigned req_num) { // get actions @@ -1267,176 +817,66 @@ WMError WindowManager::doEndDraw(unsigned req_num) // layout change and make it visible for (const auto &act : actions) { - // layout change - if(!g_app_list.contains(act.appid)){ - ret = WMError::NOT_REGISTERED; - } - ret = this->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); - if (ret != WMError::SUCCESS) + if(act.visible != TaskVisible::NO_CHANGE) { - HMI_SEQ_WARNING(req_num, - "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); - return ret; + // layout change + 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->lc->visibilityChange(act); + + if(act.visible == VISIBLE) + { + emit_visible(act.role); + emit_activated(act.role); + } + else + { + emit_invisible(act.role); + emit_deactivated(act.role); + } + + if (ret != WMError::SUCCESS) + { + HMI_SEQ_WARNING(req_num, + "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); + return ret; + } + HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); } - 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); + this->lc->renderLayers(); HMI_SEQ_INFO(req_num, "emit flushDraw"); for(const auto &act_flush : actions) { - if(act_flush.visible != TaskVisible::INVISIBLE) + if(act_flush.visible == TaskVisible::VISIBLE) { - // 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()); + this->emit_flushdraw(act_flush.role); } } return ret; } -WMError WindowManager::layoutChange(const WMAction &action) -{ - if (action.visible == TaskVisible::INVISIBLE) - { - // Visibility is not change -> no redraw is required - return WMError::SUCCESS; - } - auto client = g_app_list.lookUpClient(action.appid); - unsigned surface = client->surfaceID(action.role); - if (surface == 0) - { - HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), - "client doesn't have surface with role(%s)", action.role.c_str()); - return WMError::NOT_REGISTERED; - } - // Layout Manager - 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)){ - return WMError::NOT_REGISTERED; - } - auto client = g_app_list.lookUpClient(action.appid); - unsigned surface = client->surfaceID(action.role); - if(surface == 0) - { - HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), - "client doesn't have surface with role(%s)", action.role.c_str()); - return WMError::NOT_REGISTERED; - } - - if (action.visible != TaskVisible::INVISIBLE) - { - this->activate(surface); // Layout Manager task - } - else - { - this->deactivate(surface); // Layout Manager task - } - 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"); - bool trigger_found = false, action_found = false; - auto trigger = g_app_list.getRequest(req_num, &trigger_found); - auto actions = g_app_list.getActions(req_num, &action_found); - if (!trigger_found || !action_found) - { - HMI_SEQ_ERROR(req_num, "Action not found"); - return WMError::LAYOUT_CHANGE_FAIL; - } - - // Layout state reset - struct LayoutState reset_state{-1, -1}; - HMI_SEQ_DEBUG(req_num,"Reset layout state"); - for (const auto &action : actions) - { - if(!g_app_list.contains(action.appid)){ - return WMError::NOT_REGISTERED; - } - auto client = g_app_list.lookUpClient(action.appid); - auto pCurState = *this->layers.get_layout_state((int)client->surfaceID(action.role)); - if(pCurState == nullptr) - { - HMI_SEQ_ERROR(req_num, "Counldn't find current status"); - continue; - } - pCurState->main = reset_state.main; - pCurState->sub = reset_state.sub; - } - - HMI_SEQ_DEBUG(req_num, "Change state"); - 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)); - if (pLayerCurState == nullptr) - { - HMI_SEQ_ERROR(req_num, "Counldn't find current status"); - continue; - } - int surface = -1; - - if (action.visible != TaskVisible::INVISIBLE) - { - surface = (int)client->surfaceID(action.role); - 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 - if(action.area == "normal.full" || action.area == "split.main") - { - pLayerCurState->main = surface; - } - else if (action.area == "split.sub") - { - pLayerCurState->sub = surface; - } - else - { - // normalfull - pLayerCurState->main = surface; - } - } - } - - 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); + if (!found) + { + HMI_SEQ_ERROR(req_num, + "Window Manager bug :%s : Action is not set", + errorDescription(WMError::NO_ENTRY)); + return; + } // create json object json_object *j = json_object_new_object(); @@ -1444,9 +884,22 @@ void WindowManager::emitScreenUpdated(unsigned req_num) for(const auto& action: actions) { + std::string appid = action.client->appID(); + 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(appid.c_str())); + // POI: AGL LifeCycle Management + if (this->amgr.states[appid] != lcm::FOREGROUND) { + this->amgr.states[appid] = lcm::FOREGROUND; + this->amgr.emit_activity_status_changed(appid.c_str(), this->amgr.states_s[lcm::FOREGROUND]); + } + } else { + // POI: AGL LifeCycle Management + if (this->amgr.states[appid] != lcm::BACKGROUND) { + this->amgr.states[appid] = lcm::BACKGROUND; + this->amgr.emit_activity_status_changed(appid.c_str(), this->amgr.states_s[lcm::BACKGROUND]); + } } } json_object_object_add(j, kKeyIds, jarray); @@ -1456,7 +909,7 @@ void WindowManager::emitScreenUpdated(unsigned req_num) this->map_afb_event[kListEventName[Event_ScreenUpdated]], j); if (ret != 0) { - HMI_DEBUG("wm", "afb_event_push failed: %m"); + HMI_DEBUG("afb_event_push failed: %m"); } } @@ -1464,7 +917,7 @@ 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"); + HMI_ERROR("Could't set time (clock_gettime() returns with error"); return; } @@ -1472,11 +925,11 @@ void WindowManager::setTimer() 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, + int ret = sd_event_add_time(afb_api_get_event_loop(afbBindingV3root), &g_timer_ev_src, CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this); if (ret < 0) { - HMI_ERROR("wm", "Could't set timer"); + HMI_ERROR("Could't set timer"); } } else @@ -1506,7 +959,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)); @@ -1518,271 +971,165 @@ 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; - } +} // namespace wm - HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role); +namespace lcm +{ - return new_role; +ActivityManager::ActivityManager (void) + : states_s { "NOTEXISTS", + "CREATED", + "DESTROYED", + "STARTED", + "STOPPED", + "FOREGROUND", + "BACKGROUND" } +{ + ; } -int WindowManager::loadOldRoleDb() +void ActivityManager::api_register_activity_observer (afb_req_t req, void* &lcm_ctx) { - // 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"); - } + //std::string observer = afb_req_get_application_id(req); + observer* obs = static_cast(lcm_ctx); + + json_object *j_data = afb_req_json(req); + json_object *j_target; + if (!json_object_object_get_ex(j_data, LCM_TARGET, &j_target)) { + afb_req_fail(req, "failed", "Need char const* argument target"); + return; + } + std::string target(json_object_get_string(j_target)); + + if (obs == nullptr) { + // New observer + afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED); + //afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED); + obs = new observer({ + event, + std::bitset(ACTIVITY_FILTER_ALL_SET) + }); + + if (afb_req_subscribe(req, event) != 0) { + afb_req_fail(req, "failed", "cannot subscribe event"); + return; + } + HMI_DEBUG("observer(%p, target=\"%s\") is created.[NEW]", obs, target.c_str()); + + lcm_ctx = static_cast(obs); + } + + if (this->map_observers.count(target)) { + // already registered + HMI_DEBUG("observer(%p, target=\"%s\") is already exist", obs, target.c_str()); + std::vector obs_v = this->map_observers[target]; + auto result = std::find(obs_v.begin(), obs_v.end(), obs); + if (result != obs_v.end()) { + HMI_DEBUG("observer(%p, target=\"%s\") is already registered", obs, target.c_str()); + return; + } + } + HMI_DEBUG("observer(%p, target=\"%s\") is registered", obs, target.c_str()); + (this->map_observers[target]).push_back(obs); +} - // 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)); +void ActivityManager::remove_observer (observer *obs, std::vector& obs_v) +{ + auto obs_itr = obs_v.begin(); + while (obs_itr != obs_v.end()) { + if (*obs_itr == obs) { + obs_itr = obs_v.erase(obs_itr); + } else { + obs_itr++; + } + } +} - // 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; - } +void ActivityManager::api_unregister_activity_observer (afb_req_t req, void* &lcm_ctx) +{ + observer *obs = static_cast(lcm_ctx); - 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)); + json_object *j_data = afb_req_json(req); + json_object *j_target; - for (int i=0; i\"%s\") is unregistered.", obs, target.c_str()); - const char* new_role = jh::getStringFromJson(json_tmp, "new"); - if (nullptr == new_role) - { - HMI_ERROR("wm", "Parse Error!!"); - return -1; - } + if (this->map_observers.count(target) != 0) { + remove_observer(obs, this->map_observers[target]); + } +} - this->roleold2new[old_role] = std::string(new_role); - } +void ActivityManager::lcm_clear_context (void* &lcm_ctx) +{ + observer *obs = static_cast(lcm_ctx); - // 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()); - } + for (auto itr = this->map_observers.begin(); itr != this->map_observers.end(); itr++) { + remove_observer(obs, itr->second); + } - // Release json_object - json_object_put(json_obj); + HMI_DEBUG("observer(%p) is removed.", obs); - return 0; + delete obs; } -const char *WindowManager::check_surface_exist(const char *drawing_name) +wm::result ActivityManager::api_get_activity_status (const char *appid) { - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) - { - return "Surface does not exist"; - } - - if (!this->controller->surface_exists(*surface_id)) - { - return "Surface does not exist in controller!"; - } + std::string id = appid; + int st = NOTEXISTS; - auto layer_id = this->layers.get_layer_id(*surface_id); + if (this->states.count(id)) { + st = this->states[id]; - if (!layer_id) - { - return "Surface is not on any layer!"; + if (st < 0 || st >= NUM_STATUS) { + HMI_ERROR("Illegal lifecycle state (%d) of [%s]", st, appid); + return wm::Err("Illegal lifecycle state"); } + } - auto o_state = *this->layers.get_layout_state(*surface_id); + const char * state = this->states_s[st]; - if (o_state == nullptr) - { - return "Could not find layer for surface"; - } + json_object *object = json_object_new_object(); + json_object_object_add(object, LCM_API, json_object_new_string(LCM_API_GET_ACTIVITY_STATUS)); + json_object_object_add(object, LCM_TARGET, json_object_new_string(appid)); + json_object_object_add(object, LCM_STATE, json_object_new_string(state)); - HMI_DEBUG("wm", "surface %d is detected", *surface_id); - return nullptr; + return wm::Ok(object); } -bool WindowManager::can_split(struct LayoutState const &state, int new_id) +void ActivityManager::emit_activity_status_changed (const char* appid, const char* state) { - if (state.main != -1 && state.main != new_id) - { - auto new_id_layer = this->layers.get_layer_id(new_id).value(); - auto current_id_layer = this->layers.get_layer_id(state.main).value(); + // POI: AGL LifeCycle Management + // E.g. statusChanged(CREATED->STARTED) + HMI_DEBUG("emit_activity_status_changed(%s, %s)", appid, state); - // surfaces are on separate layers, don't bother. - if (new_id_layer != current_id_layer) - { - return false; - } + std::string id = appid; - std::string const &new_id_str = this->lookup_name(new_id).value(); - std::string const &cur_id_str = this->lookup_name(state.main).value(); + if (this->map_observers.count(id)) { + std::vector& obs_v = this->map_observers[id]; - auto const &layer = this->layers.get_layer(new_id_layer); + for (auto itr = obs_v.begin(); itr != obs_v.end(); ++itr) { + auto obs = *itr; + afb_event_t event = obs->event; + if (afb_event_is_valid(event)) { + json_object *data = json_object_new_object(); + json_object_object_add(data, LCM_STATE, json_object_new_string(state)); + json_object_object_add(data, LCM_TARGET, json_object_new_string(appid)); - HMI_DEBUG("wm", "layer info name: %s", layer->name.c_str()); + HMI_DEBUG("send Event_statusChanged(%s, %s)", appid, state); - if (layer->layouts.empty()) - { - return false; - } - - for (auto i = layer->layouts.cbegin(); i != layer->layouts.cend(); i++) - { - HMI_DEBUG("wm", "%d main_match '%s'", new_id_layer, i->main_match.c_str()); - auto rem = std::regex(i->main_match); - if (std::regex_match(cur_id_str, rem)) - { - // build the second one only if the first already matched - HMI_DEBUG("wm", "%d sub_match '%s'", new_id_layer, i->sub_match.c_str()); - auto res = std::regex(i->sub_match); - if (std::regex_match(new_id_str, res)) - { - HMI_DEBUG("wm", "layout matched!"); - return true; - } - } - } + afb_event_push(event, json_object_get(data)); + json_object_put(data); + } else { + HMI_ERROR("afb_event is not valid"); + } } - - 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->wmgr->surface_created(surface_id); -} - -void controller_hooks::surface_removed(uint32_t surface_id) -{ - this->wmgr->surface_removed(surface_id); + } } -void controller_hooks::surface_visibility(uint32_t /*surface_id*/, - uint32_t /*v*/) {} - -void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, - uint32_t /*x*/, - uint32_t /*y*/, - uint32_t /*w*/, - uint32_t /*h*/) {} - -} // namespace wm +} // namespace lcm