X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=debbcbd3e48c62950402eba36047af955f4e6597;hb=refs%2Fheads%2Fsandbox%2Fknimitz%2Fset_role_pid_ver;hp=386524da673b8f91f14231197f7cbe163d579c94;hpb=9cfdd8937209e3e47b551e7a188add100cbae2e7;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 386524d..debbcbd 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" { @@ -161,6 +162,8 @@ App::App(wl::display *d) id_alloc{}, pending_events(false), policy{} + //g_app_list(new AppList()) + //g_app_list(std::make_unique()) { try { @@ -238,6 +241,8 @@ int App::init() return init_layers(); } +App::~App() = default; + int App::dispatch_pending_events() { if (this->pop_pending_events()) @@ -453,21 +458,22 @@ void App::stop_timer() } } -bool App::lm_release(const struct WMAction &action) +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(); auto const &surface_id = this->lookup_id(action.role.c_str()); if (!surface_id) { HMI_SEQ_ERROR(req_num, "Surface does not exist"); - return false; + return ret; } if (*surface_id == this->layers.main_surface) { HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface"); - return false; + return ret; } auto o_state = *this->layers.get_layout_state(*surface_id); @@ -475,7 +481,7 @@ bool App::lm_release(const struct WMAction &action) if (o_state == nullptr) { HMI_SEQ_ERROR(req_num, "Could not find layer for surface"); - return false; + return ret; } struct LayoutState &state = *o_state; @@ -483,7 +489,7 @@ bool App::lm_release(const struct WMAction &action) if (state.main == -1) { HMI_SEQ_ERROR(req_num, "No surface active"); - return false; + return ret; } // Check against main_surface, main_surface_name is the configuration item. @@ -491,12 +497,12 @@ bool App::lm_release(const struct WMAction &action) { HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id); //reply(nullptr); - return true; + return WMError::SUCCESS; } if ((state.main == *surface_id) && (state.sub == *surface_id)) { HMI_SEQ_ERROR(req_num, "Surface is not active"); - return false; + return ret; } if (state.main == *surface_id) @@ -546,10 +552,10 @@ bool App::lm_release(const struct WMAction &action) this->enqueue_flushdraw(state.main); }); } - return true; + return WMError::SUCCESS; } -bool App::lm_layout_change(const struct WMAction &action) +WMError App::lm_layout_change(const struct WMAction &action) { const char *msg = this->check_surface_exist(action.role.c_str()); @@ -559,21 +565,27 @@ bool App::lm_layout_change(const struct WMAction &action) if (msg) { HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); - //g_app_list.removeRequest(req_num); - return false; + return WMError::LAYOUT_CHANGE_FAIL; } this->lm_layout_change(action.role.c_str()); - return true; + return WMError::SUCCESS; } -bool App::do_transition(unsigned req_num) +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 = g_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 @@ -595,10 +607,10 @@ bool App::do_transition(unsigned req_num) { is_activate = false; } - bool ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + WMError ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); g_app_list.reqDump(); - if (!ret) + if (ret != WMError::SUCCESS) { HMI_SEQ_ERROR(req_num, "Failed to set action"); return ret; @@ -606,8 +618,14 @@ bool 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 : g_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); */ @@ -619,9 +637,10 @@ bool App::do_transition(unsigned req_num) { sync_draw_happen = true; ret = lm_layout_change(y); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(req_num, "Failed layout change: %s", y.appid.c_str()); + 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); break; // TODO: if transition fails, what should we do? @@ -642,11 +661,11 @@ bool App::do_transition(unsigned req_num) } } - if (!ret) + if (ret != WMError::SUCCESS) { //this->emit_error(req_num, 0 /*error_num*/, "error happens"); // test } - else if (ret && sync_draw_happen) + else if (sync_draw_happen) { this->set_timer(); } @@ -759,17 +778,20 @@ void App::lm_layout_change(const char *drawing_name) compositor::rect area_rect_main = this->area_info[state.main]; compositor::rect area_rect_sub = this->area_info[*surface_id]; // >>> HACK - HMI_WARNING("wm", "HACK!!!"); - std::string hack_appid = "hack"; + HMI_WARNING("wm", "HACK!!! mediaplayer and hvac is only supported for split"); + std::string request_role = drawing_name; + //std::string request_app = transform(request_role.begin(), request_role.end(), request_role.begin(), tolower); //hvac or mediaplayer + 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(), hack_appid, hack_role); // This process is illegal + //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 // >>> HACK this->emit_syncdraw(main.c_str(), str_area_main.c_str(), area_rect_main.x, area_rect_main.y, area_rect_main.w, area_rect_main.h); - this->emit_syncdraw(drawing_name, str_area_sub.c_str(), + this->emit_syncdraw(request_role.c_str(), str_area_sub.c_str(), area_rect_sub.x, area_rect_sub.y, area_rect_sub.w, area_rect_sub.h); this->enqueue_flushdraw(state.main); @@ -866,6 +888,14 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char auto client = g_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; + } + g_app_list.removeFloatingSurface(client->surfaceID(role)); + /* * Queueing Phase */ @@ -895,11 +925,11 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Do allocate tasks */ - bool ret = this->do_transition(new_req); + WMError ret = this->do_transition(new_req); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, "failed to do_transition"); + HMI_SEQ_ERROR(new_req, errorDescription(ret)); //this->emit_error() } } @@ -951,11 +981,11 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Do allocate tasks */ - bool ret = this->do_transition(new_req); + WMError ret = this->do_transition(new_req); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, "failed to do_transition"); + HMI_SEQ_ERROR(new_req, errorDescription(ret)); //this->emit_error() } } @@ -1002,7 +1032,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 = g_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) @@ -1024,7 +1062,10 @@ void App::process_request() { unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); - do_transition(req); + WMError rc = do_transition(req); + if(rc != WMError::SUCCESS){ + HMI_SEQ_ERROR(req, errorDescription(rc)); + } } void App::api_enddraw(char const *appid, char const *drawing_name) @@ -1108,6 +1149,10 @@ void App::send_event(char const *evname, char const *label, char const *area, */ void App::surface_created(uint32_t surface_id) { + // For set role function + HMI_DEBUG("wm", "Get surface pid"); + this->controller->get_surface_properties(surface_id); + auto layer_id = this->layers.get_layer_id(surface_id); if (!layer_id) { @@ -1120,6 +1165,7 @@ void App::surface_created(uint32_t surface_id) this->controller->layers[*layer_id]->add_surface(surface_id); this->layout_commit(); + // activate the main_surface right away /*if (surface_id == static_cast(this->layers.main_surface)) { HMI_DEBUG("wm", "Activating main_surface (%d)", surface_id); @@ -1142,6 +1188,12 @@ void App::surface_removed(uint32_t surface_id) g_app_list.removeSurface(surface_id); } +void App::surface_properties(unsigned surface_id, unsigned pid) +{ + HMI_DEBUG("wm", "get surface properties"); + g_app_list.addFloatingSurface(surface_id, pid); +} + void App::emit_activated(char const *label) { this->send_event(kListEventName[Event_Active], label); @@ -1259,6 +1311,98 @@ 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 = g_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 = 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()); + return ret; + } + + ret = true; + if (g_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 = g_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()); + 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 surface is already created + HMI_DEBUG("wm", "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; + if(rect.w < 0) + { + rect.w = this->controller->output_size.w + 1 + rect.w; + } + if(rect.h < 0) + { + rect.h = this->controller->output_size.h + 1 + rect.h; + } + this->controller->surfaces[surface]->set_source_rectangle(0, 0, rect.w, rect.h); + + this->controller->layers[*lid]->add_surface(surface); + this->layout_commit(); + + return ret; +} + result App::api_get_display_info() { // Check controller @@ -1483,6 +1627,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*/) {}