X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=95b0d5ac225b9c02793ecab5f98610be72942a5b;hb=3a9996eb359accdbadb0e5eaa5259c910b7ae46a;hp=38541bddd7218dbf0268fb11f2ecb90b54af6b58;hpb=c3291c967516a188789a860821471d8c872fbb47;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 38541bd..95b0d5a 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -63,9 +63,9 @@ 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); @@ -94,7 +94,7 @@ 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) { @@ -117,26 +117,18 @@ 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{} { const char *path = getenv("AFM_APP_INSTALL_DIR"); - string lm_setting_path = path; if (!path) { HMI_ERROR("AFM_APP_INSTALL_DIR is not defined"); } - else - { - lm_setting_path += "/etc/layers_setting.json"; - } - this->lm = std::make_shared(lm_setting_path); + string root = path; + + this->lc = std::make_shared(root); /* try { @@ -160,7 +152,7 @@ WindowManager::WindowManager(wl::display *d) int WindowManager::init() { - if (!this->display->ok()) + /* if (!this->display->ok()) { return -1; } @@ -169,7 +161,7 @@ int WindowManager::init() { HMI_ERROR("No surface -> layer mapping loaded"); return -1; - } + } */ // TODO: application requests by old role, // so create role map (old, new) @@ -191,7 +183,20 @@ int WindowManager::init() map_afb_event[kListEventName[i]] = afb_daemon_make_event(kListEventName[i]); } - this->display->add_global_handler( + const struct rect css_bg = this->lc->getAreaSize("fullscreen"); + Screen screen = this->lc->getScreenInfo(); + rectangle dp_bg(screen.width(), screen.height()); + + 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()); + + double scale = static_cast(dp_bg.height()) / css_bg.h; + this->lc->setupArea(scale); + + /* 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)); }); @@ -222,12 +227,12 @@ int WindowManager::init() // Second level objects this->display->roundtrip(); // Third level objects - this->display->roundtrip(); + this->display->roundtrip(); */ - return init_layers(); + return 0; //init_layers(); } -int WindowManager::dispatch_pending_events() +/* int WindowManager::dispatch_pending_events() { if (this->pop_pending_events()) { @@ -240,35 +245,36 @@ 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) { // TODO: application requests by old role, // so convert role old to new const char *role = this->convertRoleOldToNew(drawing_name); + string l_name; - auto lid = this->layers.get_layer_id(string(role)); - unsigned l_id = this->lm->getNewLayerID(role); - if (l_id != 0) + // auto lid = this->layers.get_layer_id(string(role)); + unsigned l_id = this->lc->getNewLayerID(role, &l_name); + if (l_id == 0) { /** * register drawing_name as fallback and make it displayed. */ - lid = this->layers.get_layer_id(string("fallback")); - l_id = this->lm->getNewLayerID("fallback"); + // lid = this->layers.get_layer_id(string("fallback")); + l_id = this->lc->getNewLayerID("fallback", &l_name); HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); - if (!lid) + if (l_id == 0) { - return Err("Drawing name does not match any role, fallback is disabled"); + return Err("Designated role does not match any role, fallback is disabled"); } } // generate surface ID for ivi-shell application - // auto rname = this->lookup_id(role); - // if (!rname) - // { + auto rname = this->id_alloc.lookup(string(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); @@ -283,7 +289,9 @@ result WindowManager::api_request_surface(char const *appid, char const *dr // add client into the db string appid_str(appid); - if(g_app_list.contains(appid_str)) + g_app_list.addClient(appid_str, l_id, l_name, id, string(role)); + + /* if(g_app_list.contains(appid_str)) { // add surface into app auto client = g_app_list.lookUpClient(appid_str); @@ -292,13 +300,13 @@ result WindowManager::api_request_surface(char const *appid, char const *dr else { g_app_list.addClient(appid_str, l_id, id, string(role)); - } + } */ // Set role map of (new, old) this->rolenew2old[role] = string(drawing_name); return Ok(id); - // } + } // Check currently registered drawing names if it is already there. return Err("Surface already present"); @@ -307,29 +315,28 @@ 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) { - ; - // TODO: application requests by old role, // so convert role old to new const char *role = this->convertRoleOldToNew(drawing_name); + string str = role; + string l_name; - auto lid = this->layers.get_layer_id(string(role)); + // auto lid = this->layers.get_layer_id(string(role)); + unsigned lid = this->lc->getNewLayerID(str, &l_name); unsigned sid = std::stol(ivi_id); - if (!lid) + if (lid == 0) { - /** - * register drawing_name as fallback and make it displayed. - */ - lid = this->layers.get_layer_id(string("fallback")); + //register drawing_name as fallback and make it displayed. + lid = this->lc->getNewLayerID(str, &l_name); HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role); - if (!lid) + if (lid == 0) { return "Drawing name does not match any role, fallback is disabled"; } } - auto rname = this->lookup_id(role); + auto rname = this->id_alloc.lookup(str); if (rname) { @@ -338,17 +345,17 @@ 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("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 string appid_str(appid); - g_app_list.addClient(appid_str, *lid, sid, string(role)); + g_app_list.addClient(appid_str, lid, l_name, sid, string(role)); // Set role map of (new, old) this->rolenew2old[role] = string(drawing_name); @@ -370,20 +377,19 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr bool WindowManager::api_set_role(char const *appid, char const *drawing_name, unsigned pid){ string id = appid; string role = drawing_name; + string l_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, &l_name); + if (lid == 0) { - /** - * register drawing_name as fallback and make it displayed. - */ - lid = this->layers.get_layer_id(string("fallback")); + // 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) + if (lid == 0) { HMI_ERROR("Drawing name does not match any role, fallback is disabled"); return ret; @@ -392,7 +398,6 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un if(0 != pid){ // search floating surfaceID from pid if pid is designated. - // It is not good that application request with its pid wm_err = g_app_list.popFloatingSurface(pid, &surface); } else{ @@ -402,7 +407,7 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un } if(wm_err != WMError::SUCCESS){ HMI_ERROR("No floating surface for app: %s", id.c_str()); - g_app_list.addFloatingClient(id, *lid, role); + g_app_list.addFloatingClient(id, lid, role); HMI_NOTICE("%s : Waiting for surface creation", id.c_str()); return ret; } @@ -412,26 +417,24 @@ bool WindowManager::api_set_role(char const *appid, char const *drawing_name, un { 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(errorDescription(wm_err)); - } + auto client = g_app_list.lookUpClient(id); + client->appendRole(role); } else{ 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); + id.c_str(), surface, lid, role.c_str()); + g_app_list.addClient(id, lid, l_name, 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("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; @@ -439,10 +442,10 @@ 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->layout_commit(); + // this->controller->layers[*lid]->add_surface(surface); + // this->layout_commit(); return ret; } @@ -467,14 +470,11 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ } auto client = g_app_list.lookUpClient(id); - unsigned srfc = client->surfaceID(role); - if(srfc == 0) - { - HMI_ERROR("role sould be set with surface"); - reply("role sould be set with surface"); - return; - } - g_app_list.removeFloatingSurface(client->surfaceID()); + // unsigned srfc = client->surfaceID(role); + // unsigned layer = client->layerID(); + + // g_app_list.removeFloatingSurface(client->surfaceID()); + // g_app_list.removeFloatingSurface(client); Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; @@ -482,6 +482,9 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_ ret = this->setRequest(id, role, area, task, &req_num); + //vector current_states = this->lc->getCurrentStates(); + // ret = this->setRequest(id, role, area, task, current_states, &req_num); + if(ret != WMError::SUCCESS) { HMI_ERROR(errorDescription(ret)); @@ -531,6 +534,8 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin WMError ret = WMError::UNKNOWN; ret = this->setRequest(id, role, area, task, &req_num); + //vector current_states = this->lc->getCurrentStates(); + // ret = this->setRequest(id, role, area, task, current_states, &req_num); if (ret != WMError::SUCCESS) { @@ -590,6 +595,7 @@ void WindowManager::api_enddraw(char const *appid, char const *drawing_name) // 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)); @@ -607,21 +613,23 @@ 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; */ + 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, kKeyScale, json_object_new_double(this->controller->scale)); + 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); } @@ -635,25 +643,25 @@ result WindowManager::api_get_area_info(char const *drawing_name) const char *role = this->convertRoleOldToNew(drawing_name); // Check drawing name, surface/layer id - auto const &surface_id = this->lookup_id(role); + auto const &surface_id = this->id_alloc.lookup(string(role)); if (!surface_id) { 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)); @@ -663,7 +671,7 @@ 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) { @@ -708,7 +716,7 @@ 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) @@ -721,14 +729,14 @@ void WindowManager::surface_created(uint32_t surface_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("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); } @@ -819,7 +827,7 @@ void WindowManager::startTransitionWrapper(vector &actions) if ("" != act.role) { bool found; - auto const &surface_id = this->lookup_id(act.role.c_str()); + auto const &surface_id = this->id_alloc.lookup(act.role); string appid = g_app_list.getAppID(*surface_id, act.role, &found); if (!found) { @@ -887,28 +895,12 @@ 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(string(name)); -} -optional WindowManager::lookup_name(int id) -{ - return this->id_alloc.lookup(id); -} - /** * init_layers() */ int WindowManager::init_layers() { - if (!this->controller) + /* if (!this->controller) { HMI_ERROR("ivi_controller global not available"); return -1; @@ -935,7 +927,7 @@ int WindowManager::init_layers() 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); @@ -947,10 +939,10 @@ int WindowManager::init_layers() 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) @@ -970,13 +962,13 @@ 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 string& area) { - if (!this->controller->surface_exists(surface_id)) + /* if (!this->controller->surface_exists(surface_id)) { HMI_ERROR("Surface %d does not exist", surface_id); return; @@ -1016,13 +1008,13 @@ void WindowManager::surface_set_layout(int surface_id, const string& area) this->area_info[surface_id].h = h; HMI_DEBUG("Surface %u now on layer %u with rect { %d, %d, %d, %d }", - surface_id, layer_id, x, y, w, h); + 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) @@ -1042,9 +1034,9 @@ void WindowManager::emit_syncdraw(char const *label, char const *area, int x, in 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) @@ -1066,14 +1058,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(); + this->id_alloc.lookup(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")) || @@ -1104,7 +1097,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 @@ -1112,18 +1105,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(); + this->id_alloc.lookup(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")) || @@ -1152,7 +1145,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 @@ -1160,7 +1153,7 @@ void WindowManager::deactivate(int id) this->emit_deactivated(old_role); this->emit_invisible(old_role); - } + // } } WMError WindowManager::setRequest(const string& appid, const string &role, const string &area, @@ -1325,14 +1318,14 @@ WMError WindowManager::doEndDraw(unsigned req_num) if(!g_app_list.contains(act.appid)){ ret = WMError::NOT_REGISTERED; } - ret = this->layoutChange(act); + 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->visibilityChange(act); + ret = this->lc->visibilityChange(act); if (ret != WMError::SUCCESS) { HMI_SEQ_WARNING(req_num, @@ -1340,10 +1333,10 @@ 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(); + this->lc->commitChange(); HMI_SEQ_INFO(req_num, "emit flushDraw"); @@ -1603,23 +1596,23 @@ int WindowManager::loadOldRoleDb() const char *WindowManager::check_surface_exist(const char *drawing_name) { - auto const &surface_id = this->lookup_id(drawing_name); + auto const &surface_id = this->id_alloc.lookup(string(drawing_name)); if (!surface_id) { 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("surface %d is detected", *surface_id); return nullptr;