X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.cpp;h=59131438d1853ff594234f5995a2c0714f6e40cb;hb=5dd3cfcc31b87c26cfd8f5cd4ba437082e181f1b;hp=5bd597c8caf67579129626ea4f67962f64ea2818;hpb=5d5a780a405fdb71a85898d8d988f6ee1bf3b3e0;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 5bd597c..5913143 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "applist.hpp" #include "app.hpp" #include "json_helper.hpp" #include "layers.hpp" @@ -35,8 +36,8 @@ #include #include -#include "wm-client.hpp" -#include "applist.hpp" +#include "wm_client.hpp" + extern "C" { @@ -70,8 +71,6 @@ const char kKeyHeightMm[] = "height_mm"; static sd_event_source *g_timer_ev_src = nullptr; -static AppList g_app_list; - namespace { @@ -120,13 +119,13 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned req_num = g_app_list.currentRequestNumber(); + unsigned req_num = app_list->currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer expired remove Request"); - g_app_list.reqDump(); - g_app_list.removeRequest(req_num); - g_app_list.next(); - g_app_list.reqDump(); - if (g_app_list.haveRequest()) + app_list->reqDump(); + app_list->removeRequest(req_num); + app_list->next(); + app_list->reqDump(); + if (app_list->haveRequest()) { this->process_request(); } @@ -135,16 +134,16 @@ void App::timerHandler() void App::removeClient(const std::string &appid) { HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); - g_app_list.removeClient(appid); + app_list->removeClient(appid); } bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) { - if(!g_app_list.contains(appid)){ + if(!app_list->contains(appid)){ HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); return false; } - auto client = g_app_list.lookUpClient(appid); + auto client = app_list->lookUpClient(appid); return client->subscribe(req, evname); } @@ -160,7 +159,8 @@ App::App(wl::display *d) layers(), id_alloc{}, pending_events(false), - policy{} + policy{}, + app_list(std::make_unique()) { try { @@ -238,6 +238,8 @@ int App::init() return init_layers(); } +App::~App() = default; + int App::dispatch_pending_events() { if (this->pop_pending_events()) @@ -423,7 +425,7 @@ void App::layout_commit() void App::set_timer() { - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); + HMI_SEQ_DEBUG(app_list->currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) { // firsttime set into sd_event @@ -444,7 +446,7 @@ void App::set_timer() void App::stop_timer() { - unsigned req_num = g_app_list.currentRequestNumber(); + unsigned req_num = app_list->currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer stop"); int rc = sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_OFF); if (rc < 0) @@ -457,7 +459,7 @@ WMError App::lm_release(const struct WMAction &action) { //auto const &surface_id = this->lookup_id(drawing_name); WMError ret = WMError::LAYOUT_CHANGE_FAIL; - unsigned req_num = g_app_list.currentRequestNumber(); + unsigned req_num = app_list->currentRequestNumber(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { @@ -559,7 +561,7 @@ WMError App::lm_layout_change(const struct WMAction &action) TODO: emit syncDraw with application*/ if (msg) { - HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); + HMI_SEQ_DEBUG(app_list->currentRequestNumber(), msg); return WMError::LAYOUT_CHANGE_FAIL; } this->lm_layout_change(action.role.c_str()); @@ -572,20 +574,27 @@ WMError App::do_transition(unsigned req_num) * Check Policy */ // get current trigger - auto trigger = g_app_list.getRequest(req_num); + bool found; bool is_activate = true; + auto trigger = app_list->getRequest(req_num, &found); + if(!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, errorDescription(err)); + return err; + } /* get new status from Policy Manager (json_object*?) newLayout = checkPolicy(trigger); (vector&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout) for(const auto& x : actions){ - g_app_list.setAciton(req_num, x) + app_list->setAciton(req_num, x) } or - translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num); + translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num); /* The following error check is not necessary because main.cpp will reject the message form not registered object } */ @@ -595,8 +604,8 @@ WMError App::do_transition(unsigned req_num) { is_activate = false; } - WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); - g_app_list.reqDump(); + WMError ret = app_list->setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + app_list->reqDump(); if (ret != WMError::SUCCESS) { @@ -606,8 +615,14 @@ WMError App::do_transition(unsigned req_num) // layer manager task bool sync_draw_happen = false; - for (const auto &y : g_app_list.getActions(req_num)) + for (const auto &y : app_list->getActions(req_num, &found)) { + if (!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err)); + return err; + } /* do_task(y); */ @@ -623,11 +638,11 @@ WMError App::do_transition(unsigned req_num) { HMI_SEQ_ERROR(req_num, "%s: appid: %s, role: %s, area: %s", errorDescription(ret), y.appid.c_str(), y.role.c_str(), y.area.c_str()); - g_app_list.removeRequest(req_num); + app_list->removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* g_app_list.lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ + /* app_list->lookUpClient(y.appid)->emit_syncdraw(y.role, y.area); */ } else { @@ -635,11 +650,11 @@ WMError App::do_transition(unsigned req_num) if (!ret) { HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str()); - g_app_list.removeRequest(req_num); + app_list->removeRequest(req_num); break; // TODO: if transition fails, what should we do? } - /* g_app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ + /* app_list->lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ } } @@ -653,7 +668,7 @@ WMError App::do_transition(unsigned req_num) } else { - g_app_list.removeRequest(req_num); // HACK!!! + app_list->removeRequest(req_num); // HACK!!! } return ret; } @@ -766,9 +781,9 @@ void App::lm_layout_change(const char *drawing_name) std::string hack_appid = "navigation"; std::string hack_role = main; std::string hack_area = str_area_main; - g_app_list.setAction(g_app_list.currentRequestNumber(), hack_appid, hack_role, hack_area, true); - //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), request_role, request_role); - //g_app_list.setEndDrawFinished(g_app_list.currentRequestNumber(), hack_appid, hack_role); // This process is illegal + app_list->setAction(app_list->currentRequestNumber(), hack_appid, hack_role, hack_area, true); + //app_list->setEndDrawFinished(app_list->currentRequestNumber(), request_role, request_role); + //app_list->setEndDrawFinished(app_list->currentRequestNumber(), hack_appid, hack_role); // This process is illegal // >>> HACK this->emit_syncdraw(main.c_str(), str_area_main.c_str(), area_rect_main.x, area_rect_main.y, @@ -862,19 +877,27 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char std::string role = drawing_name; std::string area = drawing_area; - if (!g_app_list.contains(id)) + if (!app_list->contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = g_app_list.lookUpClient(id); + auto client = app_list->lookUpClient(id); + + unsigned srfc = client->surfaceID(role); + if(srfc == INVALID_SURFACE_ID){ + HMI_ERROR("wm", "role should be set with surface"); + reply("role should be set with surface"); + return; + } + app_list->removeFloatingSurface(client->surfaceID(role)); /* * Queueing Phase */ - unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); + unsigned current = app_list->currentRequestNumber(); + unsigned requested_num = app_list->getRequestNumber(id); if (requested_num != 0) { HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); @@ -883,8 +906,8 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char } WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE); - unsigned new_req = g_app_list.addAllocateRequest(req); - g_app_list.reqDump(); + unsigned new_req = app_list->addAllocateRequest(req); + app_list->reqDump(); HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); @@ -919,18 +942,18 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co std::string role = drawing_name; std::string area = ""; //drawing_area; - if (!g_app_list.contains(id)) + if (!app_list->contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = g_app_list.lookUpClient(id); + auto client = app_list->lookUpClient(id); /* * Queueing Phase */ - unsigned current = g_app_list.currentRequestNumber(); - unsigned requested_num = g_app_list.getRequestNumber(id); + unsigned current = app_list->currentRequestNumber(); + unsigned requested_num = app_list->getRequestNumber(id); if (requested_num != 0) { HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", id.c_str(), role.c_str(), area.c_str()); @@ -939,8 +962,8 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co } WMRequest req = WMRequest(id, role, area, Task::TASK_RELEASE); - unsigned new_req = g_app_list.addAllocateRequest(req); - g_app_list.reqDump(); + unsigned new_req = app_list->addAllocateRequest(req); + app_list->reqDump(); HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); @@ -1006,7 +1029,15 @@ void App::lm_enddraw(const char *drawing_name) void App::do_enddraw(unsigned req_num) { // get actions - auto actions = g_app_list.getActions(req_num); + bool found; + auto actions = app_list->getActions(req_num, &found); + if (!found) + { + WMError err = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, errorDescription(err)); + return; + } + HMI_SEQ_INFO(req_num, "do endDraw"); for (const auto &act : actions) @@ -1019,14 +1050,14 @@ void App::do_enddraw(unsigned req_num) /* do { // emit flush Draw - //emitFlushDrawToAll(&g_app_list, req_num); + //emitFlushDrawToAll(&app_list, req_num); // emit status change event - } while (!g_app_list.requestFinished());*/ + } while (!app_list->requestFinished());*/ } void App::process_request() { - unsigned req = g_app_list.currentRequestNumber(); + unsigned req = app_list->currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); WMError rc = do_transition(req); if(rc != WMError::SUCCESS){ @@ -1038,8 +1069,8 @@ void App::api_enddraw(char const *appid, char const *drawing_name) { std::string id(appid); std::string role(drawing_name); - unsigned current_req = g_app_list.currentRequestNumber(); - bool result = g_app_list.setEndDrawFinished(current_req, id, role); + unsigned current_req = app_list->currentRequestNumber(); + bool result = app_list->setEndDrawFinished(current_req, id, role); if (!result) { @@ -1047,7 +1078,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (g_app_list.endDrawFullfilled(current_req)) + if (app_list->endDrawFullfilled(current_req)) { // do task for endDraw //this->stop_timer(); @@ -1055,10 +1086,10 @@ void App::api_enddraw(char const *appid, char const *drawing_name) this->stop_timer(); - g_app_list.removeRequest(current_req); + app_list->removeRequest(current_req); HMI_SEQ_INFO(current_req, "Finish request"); - g_app_list.next(); - if (g_app_list.haveRequest()) + app_list->next(); + if (app_list->haveRequest()) { this->process_request(); } @@ -1127,6 +1158,10 @@ void App::surface_created(uint32_t surface_id) this->controller->layers[*layer_id]->add_surface(surface_id); this->layout_commit(); + // For set role function + HMI_DEBUG("wm", "Get surface pid"); + this->controller->get_surface_properties(surface_id); + // activate the main_surface right away /*if (surface_id == static_cast(this->layers.main_surface)) { HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id); @@ -1146,7 +1181,13 @@ void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - g_app_list.removeSurface(surface_id); + app_list->removeSurface(surface_id); +} + +void App::surface_properties(unsigned surface_id, unsigned pid) +{ + HMI_DEBUG("wm", "get surface properties"); + this->app_list->addFloatingSurface(surface_id, pid); } void App::emit_activated(char const *label) @@ -1215,8 +1256,8 @@ result App::api_request_surface(char const *appid, char const *drawing_name // add client into the db std::string appid_str(appid); std::string role(drawing_name); - //g_app_list.addClient(appid_str, role); - g_app_list.addClient(appid_str, *lid, id, role); + //app_list->addClient(appid_str, role); + app_list->addClient(appid_str, *lid, id, role); return Ok(id); } @@ -1266,6 +1307,86 @@ char const *App::api_request_surface(char const *appid, char const *drawing_name return nullptr; } +/** + * This function is substitute of requestSurface + * If surface creation is faster than application request of this function, + * WM will bind surfaceID with application and role. + * If surface creation is slower than application request of thie function, + * WM will put Client into pending list. + * + * Note : + * Application can request with pid but this is temporary solution for now. + * This will be removed. + * */ +bool App::api_set_role(char const *appid, char const *drawing_name, unsigned pid){ + std::string id = appid; + std::string role = drawing_name; + unsigned surface = 0; + WMError wm_err = WMError::UNKNOWN; + bool ret = false; + + // get layer ID which role should be in + auto lid = this->layers.get_layer_id(role); + if (!lid) + { + /** + * register drawing_name as fallback and make it displayed. + */ + lid = this->layers.get_layer_id(std::string("Fallback")); + HMI_DEBUG("wm", "%s is not registered in layers.json, then fallback as normal app", role.c_str()); + if (!lid) + { + HMI_ERROR("wm", "Drawing name does not match any role, Fallback is disabled"); + return ret; + } + } + + if(0 != pid){ + // search floating surfaceID from pid if pid is designated. + // It is not good that application request with its pid + wm_err = app_list->popFloatingSurface(pid, &surface); + } + else{ + // get floating surface with appid. If WM queries appid from pid, + // WM can bind surface and role with appid(not implemented yet) + //wm_err = app_list->popFloatingSurface(id); + } + if(wm_err != WMError::SUCCESS){ + HMI_ERROR("wm", "No floating surface for app: %s", id.c_str()); + app_list->addFloatingClient(id, *lid, role); + HMI_NOTICE("wm", "%s : Waiting for surface creation", id.c_str()); + return ret; + } + + ret = true; + if (app_list->contains(id)) + { + HMI_INFO("wm", "Add role: %s with surface: %d. Client %s has multi surfaces.", + role.c_str(), surface, id.c_str()); + wm_err = app_list->appendRole(id, role, surface); + if(wm_err != WMError::SUCCESS){ + HMI_INFO("wm", errorDescription(wm_err)); + } + } + else{ + HMI_INFO("wm", "Create new client: %s, surface: %d into layer: %d with role: %s", + id.c_str(), surface, *lid, role.c_str()); + app_list->addClient(id, *lid, surface, role); + } + + // register pair drawing_name and ivi_id + this->id_alloc.register_name_id(role.c_str(), surface); + this->layers.add_surface(surface, *lid); + + // this surface is already created + HMI_DEBUG("wm", "surface_id is %u, layer_id is %u", surface, *lid); + + this->controller->layers[*lid]->add_surface(surface); + this->layout_commit(); + + return ret; +} + result App::api_get_display_info() { // Check controller @@ -1490,6 +1611,11 @@ void controller_hooks::surface_removed(uint32_t surface_id) this->app->surface_removed(surface_id); } +void controller_hooks::surface_properties(uint32_t surface_id, uint32_t pid) +{ + this->app->surface_properties(surface_id, pid); +} + void controller_hooks::surface_visibility(uint32_t /*surface_id*/, uint32_t /*v*/) {}