X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=9c1a1c56ebf1ab4d900ecdb3e1cf6c967f2b6c82;hb=e5295c77d4c436212265edeca7f9a4818a5133e6;hp=6045eaadf5ba051106572e7714d8f015b4934260;hpb=741a9924776e40293b91eff00ec91d5a72f5da7f;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 6045eaa..9c1a1c5 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -26,6 +26,9 @@ extern "C" #include } +using std::string; +using std::vector; + namespace wm { @@ -60,15 +63,15 @@ static WindowManager *g_context; namespace { -using nlohmann::json; +// using nlohmann::json; -result file_to_json(char const *filename) +/* result file_to_json(char const *filename) { json j; std::ifstream i(filename); if (i.fail()) { - HMI_DEBUG("wm", "Could not open config file, so use default layer information"); + HMI_DEBUG("Could not open config file, so use default layer information"); j = default_layers_json; } else @@ -81,7 +84,7 @@ result file_to_json(char const *filename) struct result load_layer_map(char const *filename) { - HMI_DEBUG("wm", "loading IDs from %s", filename); + HMI_DEBUG("loading IDs from %s", filename); auto j = file_to_json(filename); if (j.is_err()) @@ -91,16 +94,16 @@ struct result load_layer_map(char const *filename) json jids = j.unwrap(); return to_layer_map(jids); -} +} */ static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) { - HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request"); + HMI_NOTICE("Time out occurs because the client replys endDraw slow, so revert the request"); reinterpret_cast(userdata)->timerHandler(); return 0; } -static void onStateTransitioned(std::vector actions) +static void onStateTransitioned(vector actions) { g_context->startTransitionWrapper(actions); } @@ -114,28 +117,20 @@ static void onError() /** * WindowManager Impl */ -WindowManager::WindowManager(wl::display *d) +WindowManager::WindowManager() : chooks{this}, - display{d}, - controller{}, - outputs(), - layers(), - id_alloc{}, - pending_events(false) + id_alloc{} { - char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR"); - std::string path; - if (!path_layers_json) + const char *path = getenv("AFM_APP_INSTALL_DIR"); + if (!path) { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - path = std::string(path_layers_json); - } - else - { - path = std::string(path_layers_json) + std::string("/etc/layers.json"); + HMI_ERROR("AFM_APP_INSTALL_DIR is not defined"); } + string root = path; + + this->lc = std::make_shared(root); - try +/* try { { auto l = load_layer_map(path.c_str()); @@ -145,28 +140,28 @@ WindowManager::WindowManager(wl::display *d) } else { - HMI_ERROR("wm", "%s", l.err().value()); + HMI_ERROR("%s", l.err().value()); } } } catch (std::exception &e) { - HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); - } + HMI_ERROR("Loading of configuration failed: %s", e.what()); + } */ } int WindowManager::init() { - if (!this->display->ok()) + /* if (!this->display->ok()) { return -1; } if (this->layers.mapping.empty()) { - HMI_ERROR("wm", "No surface -> layer mapping loaded"); + HMI_ERROR("No surface -> layer mapping loaded"); return -1; - } + } */ // TODO: application requests by old role, // so create role map (old, new) @@ -188,7 +183,7 @@ int WindowManager::init() map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); } - this->display->add_global_handler( + /* 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)); }); @@ -219,12 +214,12 @@ int WindowManager::init() // Second level objects this->display->roundtrip(); // Third level objects - this->display->roundtrip(); + this->display->roundtrip(); */ return init_layers(); } -int WindowManager::dispatch_pending_events() +/* int WindowManager::dispatch_pending_events() { if (this->pop_pending_events()) { @@ -237,7 +232,7 @@ int WindowManager::dispatch_pending_events() void WindowManager::set_pending_events() { this->pending_events.store(true, std::memory_order_release); -} +} */ result WindowManager::api_request_surface(char const *appid, char const *drawing_name) { @@ -245,44 +240,57 @@ result WindowManager::api_request_surface(char const *appid, char const *dr // so convert role old to new const char *role = this->convertRoleOldToNew(drawing_name); - auto lid = this->layers.get_layer_id(std::string(role)); - if (!lid) + // auto lid = this->layers.get_layer_id(string(role)); + unsigned l_id = this->lc->getNewLayerID(role); + if (l_id != 0) { /** * 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->layers.get_layer_id(string("fallback")); + l_id = this->lc->getNewLayerID("fallback"); + HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); + /* if (!lid) { return Err("Drawing name does not match any role, fallback is disabled"); - } + } */ } - auto rname = this->lookup_id(role); - if (!rname) - { + // generate surface ID for ivi-shell application + + // auto rname = this->lookup_id(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); + // 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); - } + // if (!this->layers.main_surface_name.empty() && + // this->layers.main_surface_name == drawing_name) + // { + // this->layers.main_surface = id; + // HMI_DEBUG("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)); + string appid_str(appid); + if(g_app_list.contains(appid_str)) + { + // add surface into app + auto client = g_app_list.lookUpClient(appid_str); + // client.addSurface(id); + } + else + { + g_app_list.addClient(appid_str, l_id, id, string(role)); + } // Set role map of (new, old) - this->rolenew2old[role] = std::string(drawing_name); + this->rolenew2old[role] = string(drawing_name); return Ok(id); - } + // } // Check currently registered drawing names if it is already there. return Err("Surface already present"); @@ -291,27 +299,27 @@ 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 = role; - auto lid = this->layers.get_layer_id(std::string(role)); + // auto lid = this->layers.get_layer_id(string(role)); + unsigned lid = this->lc->getNewLayerID(str); unsigned sid = std::stol(ivi_id); - if (!lid) + /* if (!lid) { - /** - * register drawing_name as fallback and make it displayed. - */ - lid = this->layers.get_layer_id(std::string("fallback")); - HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role); + //register drawing_name as fallback and make it displayed. + // lid = this->layers.get_layer_id(string("fallback")); + HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); if (!lid) { return "Drawing name does not match any role, fallback is disabled"; } - } + } */ auto rname = this->lookup_id(role); @@ -322,20 +330,20 @@ 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->layers.add_surface(sid, *lid); // this surface is already created - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", sid, *lid); + // HMI_DEBUG("surface_id is %u, layer_id is %u", sid, *lid); - this->controller->layers[*lid]->add_surface(sid); - this->layout_commit(); + // this->controller->layers[*lid]->add_surface(sid); + // this->layout_commit(); // add client into the db - std::string appid_str(appid); - g_app_list.addClient(appid_str, *lid, sid, std::string(role)); + string appid_str(appid); + g_app_list.addClient(appid_str, lid, sid, string(role)); // Set role map of (new, old) - this->rolenew2old[role] = std::string(drawing_name); + this->rolenew2old[role] = string(drawing_name); return nullptr; } @@ -352,27 +360,25 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr * This will be removed. * */ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){ - std::string id = appid; - std::string role = drawing_name; + string id = appid; + string role = drawing_name; unsigned surface = 0; WMError wm_err = WMError::UNKNOWN; bool ret = false; // get layer ID which role should be in - auto lid = this->layers.get_layer_id(role); - if (!lid) + // auto lid = this->layers.get_layer_id(role); + unsigned lid = this->lc->getNewLayerID(role); + /* if (!lid) { - /** - * register drawing_name as fallback and make it displayed. - */ - lid = this->layers.get_layer_id(std::string("fallback")); - HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role.c_str()); + // lid = this->layers.get_layer_id(string("fallback")); + HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str()); if (!lid) { - HMI_ERROR("wm", "Drawing name does not match any role, fallback is disabled"); + HMI_ERROR("Drawing name does not match any role, fallback is disabled"); return ret; } - } + } */ if(0 != pid){ // search floating surfaceID from pid if pid is designated. @@ -385,37 +391,37 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un //wm_err = g_app_list.popFloatingSurface(id); } if(wm_err != WMError::SUCCESS){ - HMI_ERROR("wm", "No floating surface for app: %s", id.c_str()); - g_app_list.addFloatingClient(id, *lid, role); - HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str()); + HMI_ERROR("No floating surface for app: %s", id.c_str()); + g_app_list.addFloatingClient(id, lid, role); + HMI_NOTICE("%s : Waiting for surface creation", id.c_str()); return ret; } ret = true; if (g_app_list.contains(id)) { - HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.", + HMI_INFO("Add role: %s with surface: %d. Client %s has multi surfaces.", role.c_str(), surface, id.c_str()); wm_err = g_app_list.appendRole(id, role, surface); if(wm_err != WMError::SUCCESS){ - HMI_INFO("wm", errorDescription(wm_err)); + HMI_INFO(errorDescription(wm_err)); } } else{ - HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s", - id.c_str(), surface, *lid, role.c_str()); - g_app_list.addClient(id, *lid, surface, role); + HMI_INFO("Create new client: %s, surface: %d into layer: %d with role: %s", + id.c_str(), surface, lid, role.c_str()); + g_app_list.addClient(id, lid, surface, role); } // register pair drawing_name and ivi_id this->id_alloc.register_name_id(role.c_str(), surface); - this->layers.add_surface(surface, *lid); + // this->layers.add_surface(surface, *lid); // this surface is already created - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid); + HMI_DEBUG("surface_id is %u, layer_id is %u", surface, lid); - const auto &o_layer = this->layers.get_layer(*lid); - auto rect = o_layer.value().rect; + // const auto &o_layer = this->layers.get_layer(*lid); + /* auto rect = o_layer.value().rect; if(rect.w < 0) { rect.w = this->controller->output_size.w + 1 + rect.w; @@ -423,9 +429,9 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un if(rect.h < 0) { rect.h = this->controller->output_size.h + 1 + rect.h; - } + } */ - this->controller->layers[*lid]->add_surface(surface); + // this->controller->layers[*lid]->add_surface(surface); this->layout_commit(); return ret; @@ -434,15 +440,15 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un void WindowManager::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) { - ST(); + ; // TODO: application requests by old role, // so convert role old to new const char *c_role = this->convertRoleOldToNew(drawing_name); - std::string id = appid; - std::string role = c_role; - std::string area = drawing_area; + string id = appid; + string role = c_role; + string area = drawing_area; if(!g_app_list.contains(id)) { @@ -454,7 +460,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ unsigned srfc = client->surfaceID(role); if(srfc == 0) { - HMI_ERROR("wm", "role sould be set with surface"); + HMI_ERROR("role sould be set with surface"); reply("role sould be set with surface"); return; } @@ -468,7 +474,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; } @@ -498,7 +504,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ void WindowManager::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) { - ST(); + ; // TODO: application requests by old role, // so convert role old to new @@ -507,9 +513,9 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin /* * Check Phase */ - std::string id = appid; - std::string role = c_role; - std::string area = ""; //drawing_area; + string id = appid; + string role = c_role; + string area = ""; //drawing_area; Task task = Task::TASK_RELEASE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; @@ -518,7 +524,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; } @@ -551,14 +557,14 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) // 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 = c_role; 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; } @@ -591,28 +597,28 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) result WindowManager::api_get_display_info() { - if (!this->display->ok()) + /* if (!this->display->ok()) { return Err("Wayland compositor is not available"); - } + } */ // Set display info - compositor::size o_size = this->controller->output_size; - compositor::size p_size = this->controller->physical_size; +/* size o_size = this->controller->output_size; + 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, kKeyWidthPixel, json_object_new_int(o_size.w)); json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h)); json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w)); json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h)); json_object_object_add(object, kKeyScale, json_object_new_double(this->controller->scale)); - + */ 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 @@ -625,19 +631,19 @@ result WindowManager::api_get_area_info(char const *drawing_name) return Err("Surface does not exist"); } - if (!this->controller->surface_exists(*surface_id)) + /* 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); + /* // auto layer_id = this->layers.get_layer_id(*surface_id); if (!layer_id) { return Err("Surface is not on any layer!"); - } + } */ // Set area rectangle - compositor::rect area_info = this->area_info[*surface_id]; + 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)); @@ -647,11 +653,11 @@ result WindowManager::api_get_area_info(char const *drawing_name) return Ok(object); } -void WindowManager::api_ping() { this->dispatch_pending_events(); } +void WindowManager::api_ping() { /* this->dispatch_pending_events(); */ } void WindowManager::send_event(char const *evname, char const *label) { - HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label); + HMI_DEBUG("%s: %s(%s)", __func__, evname, label); json_object *j = json_object_new_object(); json_object_object_add(j, kKeyDrawingName, json_object_new_string(label)); @@ -659,14 +665,14 @@ void WindowManager::send_event(char const *evname, char const *label) 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, int x, int y, int w, int h) { - HMI_DEBUG("wm", "%s: %s(%s, %s) x:%d y:%d w:%d h:%d", + HMI_DEBUG("%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(); @@ -683,7 +689,7 @@ void WindowManager::send_event(char const *evname, char const *label, char const 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"); } } @@ -692,48 +698,48 @@ void WindowManager::send_event(char const *evname, char const *label, char const */ void WindowManager::surface_created(uint32_t surface_id) { - this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE); + /* this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE); auto layer_id = this->layers.get_layer_id(surface_id); if (!layer_id) { - HMI_DEBUG("wm", "Newly created surfce %d is not associated with any layer!", + HMI_DEBUG("Newly created surfce %d is not associated with any layer!", surface_id); return; } - HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface_id, *layer_id); + HMI_DEBUG("surface_id is %u, layer_id is %u", surface_id, *layer_id); this->controller->layers[*layer_id]->add_surface(surface_id); - this->layout_commit(); + this->layout_commit(); */ } void WindowManager::surface_removed(uint32_t surface_id) { - HMI_DEBUG("wm", "Delete surface_id %u", surface_id); + HMI_DEBUG("Delete surface_id %u", surface_id); this->id_alloc.remove_id(surface_id); - this->layers.remove_surface(surface_id); + // this->layers.remove_surface(surface_id); g_app_list.removeSurface(surface_id); } void WindowManager::surface_properties(unsigned surface_id, unsigned pid) { - HMI_DEBUG("wm", "get surface properties"); + HMI_DEBUG("get surface properties"); // search pid from surfaceID /*json_object *response; afb_service_call_sync("afm-main", "runners", nullptr, &response); // retrieve appid from pid from application manager - std::string appid = ""; + string appid = ""; if(response == nullptr) { - HMI_ERROR("wm", "No runners"); + HMI_ERROR("No runners"); } else { // check appid then add it to the client - HMI_INFO("wm", "Runners:%s", json_object_get_string(response)); + HMI_INFO("Runners:%s", json_object_get_string(response)); int size = json_object_array_length(response); for(int i = 0; i < size; i++) { @@ -755,9 +761,9 @@ void WindowManager::surface_properties(unsigned surface_id, unsigned pid) g_app_list.addFloatingSurface(appid, surface_id, pid);*/ } -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()); g_app_list.removeClient(appid); } @@ -779,7 +785,7 @@ void WindowManager::timerHandler() this->processNextRequest(); } -void WindowManager::startTransitionWrapper(std::vector &actions) +void WindowManager::startTransitionWrapper(vector &actions) { WMError ret; unsigned req_num = g_app_list.currentRequestNumber(); @@ -804,7 +810,7 @@ void WindowManager::startTransitionWrapper(std::vector &actions) { bool found; auto const &surface_id = this->lookup_id(act.role.c_str()); - std::string appid = g_app_list.getAppID(*surface_id, act.role, &found); + string appid = g_app_list.getAppID(*surface_id, act.role, &found); if (!found) { if (TaskVisible::INVISIBLE == act.visible) @@ -871,18 +877,11 @@ void WindowManager::processError(WMError error) ******* 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)); + return this->id_alloc.lookup(string(name)); } -optional WindowManager::lookup_name(int id) +optional WindowManager::lookup_name(int id) { return this->id_alloc.lookup(id); } @@ -892,15 +891,15 @@ optional WindowManager::lookup_name(int id) */ int WindowManager::init_layers() { - if (!this->controller) + /* if (!this->controller) { - HMI_ERROR("wm", "ivi_controller global not available"); + HMI_ERROR("ivi_controller global not available"); return -1; } if (this->outputs.empty()) { - HMI_ERROR("wm", "no output was set up!"); + HMI_ERROR("no output was set up!"); return -1; } @@ -916,10 +915,10 @@ int WindowManager::init_layers() uint32_t(o->physical_height)}; - HMI_DEBUG("wm", "SCALING: screen (%dx%d), physical (%dx%d)", + HMI_DEBUG("SCALING: screen (%dx%d), physical (%dx%d)", o->width, o->height, o->physical_width, o->physical_height); - this->layers.loadAreaDb(); + // this->layers.loadAreaDb(); const compositor::rect css_bg = this->layers.getAreaSize("fullscreen"); rectangle dp_bg(o->width, o->height); @@ -927,14 +926,14 @@ int WindowManager::init_layers() dp_bg.set_aspect(static_cast(css_bg.w) / css_bg.h); dp_bg.fit(o->width, o->height); dp_bg.center(o->width, o->height); - HMI_DEBUG("wm", "SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)", + 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()); // Clear scene - layers.clear(); + // layers.clear(); // Clear screen - s->clear(); + // s->clear(); // Quick and dirty setup of layers for (auto const &i : this->layers.mapping) @@ -943,7 +942,7 @@ int WindowManager::init_layers() auto &l = layers[i.second.layer_id]; l->set_destination_rectangle(dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height()); l->set_visibility(1); - HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"", + HMI_DEBUG("Setting up layer %s (%d) for surface role match \"%s\"", i.second.name.c_str(), i.second.layer_id, i.second.role.c_str()); } @@ -954,15 +953,15 @@ int WindowManager::init_layers() c->scale = static_cast(dp_bg.height()) / css_bg.h; this->layers.setupArea(c->scale); - + */ return 0; } -void WindowManager::surface_set_layout(int surface_id, const std::string& area) +void WindowManager::surface_set_layout(int surface_id, const string& area) { - if (!this->controller->surface_exists(surface_id)) + /* if (!this->controller->surface_exists(surface_id)) { - HMI_ERROR("wm", "Surface %d does not exist", surface_id); + HMI_ERROR("Surface %d does not exist", surface_id); return; } @@ -970,7 +969,7 @@ void WindowManager::surface_set_layout(int surface_id, const std::string& area) if (!o_layer_id) { - HMI_ERROR("wm", "Surface %d is not associated with any layer!", surface_id); + HMI_ERROR("Surface %d is not associated with any layer!", surface_id); return; } @@ -987,7 +986,7 @@ void WindowManager::surface_set_layout(int surface_id, const std::string& area) int w = rect.w; int h = rect.h; - HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, + HMI_DEBUG("surface_set_layout for surface %u on layer %u", surface_id, layer_id); // set destination to the display rectangle @@ -999,14 +998,14 @@ void WindowManager::surface_set_layout(int surface_id, const std::string& area) 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); + HMI_DEBUG("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(); +/* this->controller->commit_changes(); + this->display->flush(); */ } void WindowManager::emit_activated(char const *label) @@ -1024,11 +1023,11 @@ void WindowManager::emit_syncdraw(char const *label, char const *area, int x, in this->send_event(kListEventName[Event_SyncDraw], label, 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); +/* rect rect = this->layers.getAreaSize(area); this->send_event(kListEventName[Event_SyncDraw], - role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h); + role.c_str(), area.c_str(), rect.x, rect.y, rect.w, rect.h); */ } void WindowManager::emit_flushdraw(char const *label) @@ -1050,14 +1049,15 @@ void WindowManager::emit_visible(char const *label) { return emit_visible(label, void WindowManager::activate(int id) { - auto ip = this->controller->sprops.find(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 >>> + /* // FOR CES DEMO >>> if ((0 == strcmp(label, "radio")) || (0 == strcmp(label, "music")) || (0 == strcmp(label, "video")) || @@ -1071,16 +1071,16 @@ void WindowManager::activate(int id) this->surface_bg.erase(i); // Remove from BG layer (999) - HMI_DEBUG("wm", "Remove %s(%d) from BG layer", label, id); + HMI_DEBUG("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); + HMI_DEBUG("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); + HMI_DEBUG("Stored id:%d", j); } break; } @@ -1088,7 +1088,7 @@ void WindowManager::activate(int id) } // <<< FOR CES DEMO - this->layout_commit(); + this->layout_commit(); */ // TODO: application requests by old role, // so convert role new to old for emitting event @@ -1096,18 +1096,18 @@ void WindowManager::activate(int id) this->emit_visible(old_role); this->emit_activated(old_role); - } + // } } void WindowManager::deactivate(int id) { - auto ip = this->controller->sprops.find(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 >>> + /*// FOR CES DEMO >>> if ((0 == strcmp(label, "radio")) || (0 == strcmp(label, "music")) || (0 == strcmp(label, "video")) || @@ -1118,16 +1118,16 @@ void WindowManager::deactivate(int id) this->surface_bg.push_back(id); // Remove from FG layer (1001) - HMI_DEBUG("wm", "Remove %s(%d) from FG layer", label, id); + HMI_DEBUG("Remove %s(%d) from FG layer", label, id); this->controller->layers[1001]->remove_surface(id); // Add to BG layer (999) - HMI_DEBUG("wm", "Add %s(%d) to BG layer", label, id); + HMI_DEBUG("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); + HMI_DEBUG("Stored id:%d", j); } } else @@ -1136,7 +1136,7 @@ void WindowManager::deactivate(int id) } // <<< FOR CES DEMO - this->layout_commit(); + this->layout_commit(); */ // TODO: application requests by old role, // so convert role new to old for emitting event @@ -1144,10 +1144,10 @@ void WindowManager::deactivate(int id) 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)) @@ -1200,7 +1200,7 @@ WMError WindowManager::checkPolicy(unsigned req_num) ret = WMError::NO_ENTRY; return ret; } - std::string req_area = trigger.area; + string req_area = trigger.area; if (trigger.task == Task::TASK_ALLOCATE) { @@ -1256,7 +1256,7 @@ WMError WindowManager::startTransition(unsigned req_num) // TODO: application requests by old role, // so convert role new to old for emitting event - std::string old_role = this->rolenew2old[action.role]; + string old_role = this->rolenew2old[action.role]; this->emit_syncdraw(old_role, action.area); /* TODO: emit event for app not subscriber @@ -1324,7 +1324,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) return ret; } HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); - //this->lm_enddraw(act.role.c_str()); + //this->lc_enddraw(act.role.c_str()); } } this->layout_commit(); @@ -1337,7 +1337,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) { // TODO: application requests by old role, // so convert role new to old for emitting event - std::string old_role = this->rolenew2old[act_flush.role]; + string old_role = this->rolenew2old[act_flush.role]; this->emit_flushdraw(old_role.c_str()); } @@ -1392,7 +1392,7 @@ WMError WindowManager::visibilityChange(const WMAction &action) return WMError::SUCCESS; } -WMError WindowManager::setSurfaceSize(unsigned surface, const std::string &area) +WMError WindowManager::setSurfaceSize(unsigned surface, const string &area) { this->surface_set_layout(surface, area); @@ -1424,7 +1424,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"); } } @@ -1432,7 +1432,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; } @@ -1444,7 +1444,7 @@ void WindowManager::setTimer() 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 @@ -1507,7 +1507,7 @@ const char* WindowManager::convertRoleOldToNew(char const *old_role) new_role = old_role; } - HMI_DEBUG("wm", "old:%s -> new:%s", old_role, new_role); + HMI_DEBUG("old:%s -> new:%s", old_role, new_role); return new_role; } @@ -1516,16 +1516,16 @@ 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); + HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir); - std::string file_name; + string file_name; if (!afm_app_install_dir) { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); + HMI_ERROR("AFM_APP_INSTALL_DIR is not defined"); } else { - file_name = std::string(afm_app_install_dir) + std::string("/etc/old_roles.db"); + file_name = string(afm_app_install_dir) + string("/etc/old_roles.db"); } // Load old_role.db @@ -1533,22 +1533,22 @@ int WindowManager::loadOldRoleDb() 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"); + HMI_ERROR("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)); + HMI_DEBUG("json_obj dump:%s", json_object_get_string(json_obj)); // Perse apps json_object* json_cfg; if (!json_object_object_get_ex(json_obj, "old_roles", &json_cfg)) { - HMI_ERROR("wm", "Parse Error!!"); + HMI_ERROR("Parse Error!!"); return -1; } int len = json_object_array_length(json_cfg); - HMI_DEBUG("wm", "json_cfg len:%d", len); - HMI_DEBUG("wm", "json_cfg dump:%s", json_object_get_string(json_cfg)); + HMI_DEBUG("json_cfg len:%d", len); + HMI_DEBUG("json_cfg dump:%s", json_object_get_string(json_cfg)); for (int i=0; iroleold2new[old_role] = std::string(new_role); + this->roleold2new[old_role] = string(new_role); } // Check for(auto itr = this->roleold2new.begin(); itr != this->roleold2new.end(); ++itr) { - HMI_DEBUG("wm", ">>> role old:%s new:%s", + HMI_DEBUG(">>> role old:%s new:%s", itr->first.c_str(), itr->second.c_str()); } @@ -1593,19 +1593,19 @@ const char *WindowManager::check_surface_exist(const char *drawing_name) return "Surface does not exist"; } - if (!this->controller->surface_exists(*surface_id)) + /* if (!this->controller->surface_exists(*surface_id)) { return "Surface does not exist in controller!"; - } + } */ - auto layer_id = this->layers.get_layer_id(*surface_id); + /* auto layer_id = this->layers.get_layer_id(*surface_id); if (!layer_id) { return "Surface is not on any layer!"; - } + } */ - HMI_DEBUG("wm", "surface %d is detected", *surface_id); + HMI_DEBUG("surface %d is detected", *surface_id); return nullptr; }