X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=8832cdaa1a2b745c2a2a77fb178dceae29834798;hb=77b239e85360594820534afe5cb79c7d60721f40;hp=1645bfe13a3e6b5afc9fbecbd78e9dd3328360c2;hpb=d78ae3cd8f316d1830cde4d611b8e42f90dbcc11;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 1645bfe..8832cda 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -35,7 +35,7 @@ #include #include -#include "wm-client.hpp" +#include "wm_client.hpp" #include "applist.hpp" extern "C" @@ -120,10 +120,10 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned seq = g_app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer expired remove Request"); + unsigned req_num = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req_num, "Timer expired remove Request"); g_app_list.reqDump(); - g_app_list.removeRequest(seq); + g_app_list.removeRequest(req_num); g_app_list.next(); g_app_list.reqDump(); if (g_app_list.haveRequest()) @@ -423,7 +423,7 @@ void App::layout_commit() void App::set_timer() { - HMI_SEQ_DEBUG(g_app_list.currentSequenceNumber(), "Timer set activate"); + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) { // firsttime set into sd_event @@ -444,30 +444,31 @@ void App::set_timer() void App::stop_timer() { - unsigned seq = g_app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer stop"); + unsigned req_num = g_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) { - HMI_SEQ_ERROR(seq, "Timer stop failed"); + HMI_SEQ_ERROR(req_num, "Timer stop failed"); } } -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); - unsigned req_num = g_app_list.currentSequenceNumber(); + 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 +476,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 +484,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 +492,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,113 +547,152 @@ 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()); - /* - lm_.updateLayout(action); - TODO: emit syncDraw with application*/ if (msg) { - HMI_SEQ_DEBUG(g_app_list.currentSequenceNumber(), msg); - //g_app_list.removeRequest(req_num); - return false; + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), msg); + 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) +{ + HMI_SEQ_DEBUG(req_num, "check next state"); + WMError ret = this->check_policy(req_num); + if (ret != WMError::SUCCESS) + { + return ret; + } + HMI_SEQ_DEBUG(req_num, "Start transition."); + ret = this->start_transition(req_num); + return ret; +} + +WMError App::check_policy(unsigned req_num) { /* * Check Policy */ // get current trigger - auto trigger = g_app_list.getRequest(req_num); - bool is_activate = true; + bool found; + WMError ret = WMError::LAYOUT_CHANGE_FAIL; + auto trigger = g_app_list.getRequest(req_num, &found); + if (!found) + { + ret = WMError::NO_ENTRY; + return ret; + } + bool is_activate = (trigger.task == Task::TASK_ALLOCATE); + std::string req_area = trigger.area; - /* get new status from Policy Manager + // >>>> Compatible with current window manager until policy manager coming + if (is_activate) + { + const char *msg = this->check_surface_exist(trigger.role.c_str()); - (json_object*?) newLayout = checkPolicy(trigger); - (vector&) auto actions = translator.inputActionFromLayout(newLayout, currentLayout) - for(const auto& x : actions){ - g_app_list.setAciton(req_num, x) - } + if (msg) + { + HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), 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; - or + unsigned curernt_sid = state.main; + bool can_split = this->can_split(state, *surface_id); - translator.inputActionFromLayout(newLayout, currentLayout, &g_app_list, req_num); + if (can_split) + { + // 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); + // 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 : %s", 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 + WMError ret = g_app_list.setAction(req_num, add_name, add_role, add_area); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set action"); + return ret; + } + g_app_list.reqDump(); + } + } + // >>>> This will be removed - /* The following error check is not necessary because main.cpp will reject the message form not registered object - } */ + /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); - if (trigger.task == Task::TASK_RELEASE) - { - is_activate = false; - } - bool ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); + ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate); g_app_list.reqDump(); - if (!ret) + return ret; +} + +WMError App::start_transition(unsigned req_num) +{ + bool sync_draw_happen = false; + bool found = false; + WMError ret = WMError::SUCCESS; + auto actions = g_app_list.getActions(req_num, &found); + if (!found) { - HMI_SEQ_ERROR(req_num, "Failed to set action"); + ret = WMError::NO_ENTRY; + HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret)); return ret; } - // layer manager task - bool sync_draw_happen = false; - for (const auto &y : g_app_list.getActions(req_num)) - { - /* - do_task(y); - */ - /* TODO - but current we can't do do_task, - so divide the processing into lm_layout_change and lm_release - */ + for (const auto &y : actions) + { if (y.visible) { sync_draw_happen = true; - ret = lm_layout_change(y); - if (!ret) - { - HMI_SEQ_ERROR(req_num, "Failed layout change: %s", y.appid.c_str()); - g_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); */ - } - else - { - ret = lm_release(y); - if (!ret) - { - HMI_SEQ_ERROR(req_num, "Failed release resource: %s", y.appid.c_str()); - g_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); */ + this->emit_syncdraw(y.role, y.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); */ } } - if (!ret) - { - //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test - } - else if (ret && sync_draw_happen) + if (sync_draw_happen) { this->set_timer(); } else { - g_app_list.removeRequest(req_num); // HACK!!! + // deactivate only, no syncDraw + // Make it deactivate here + for (const auto &z : actions) + { + if (g_app_list.contains(z.appid)) + { + auto client = g_app_list.lookUpClient(z.appid); + this->deactivate(client->surfaceID(z.role)); + } + } + ret = NO_LAYOUT_CHANGE; } return ret; } @@ -758,10 +798,21 @@ void App::lm_layout_change(const char *drawing_name) std::string str_area_sub = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); 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!!! 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(), 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); @@ -861,8 +912,8 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Queueing Phase */ - unsigned current = g_app_list.currentSequenceNumber(); - unsigned requested_num = g_app_list.getSequenceNumber(id); + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_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()); @@ -887,12 +938,15 @@ 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"); //this->emit_error() + HMI_SEQ_ERROR(new_req, errorDescription(ret)); + g_app_list.removeRequest(new_req); + g_app_list.next(); + g_app_list.reqDump(); } } @@ -917,8 +971,8 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Queueing Phase */ - unsigned current = g_app_list.currentSequenceNumber(); - unsigned requested_num = g_app_list.getSequenceNumber(id); + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_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()); @@ -943,11 +997,13 @@ 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)); + g_app_list.removeRequest(new_req); + g_app_list.next(); //this->emit_error() } } @@ -991,40 +1047,51 @@ void App::lm_enddraw(const char *drawing_name) } } -void App::do_enddraw(unsigned request_seq) +void App::do_enddraw(unsigned req_num) { // get actions - auto actions = g_app_list.getActions(request_seq); - HMI_SEQ_INFO(request_seq, "do endDraw"); + 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) { - HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str()); + HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); this->lm_enddraw(act.role.c_str()); } - HMI_SEQ_INFO(request_seq, "emit flushDraw"); + HMI_SEQ_INFO(req_num, "emit flushDraw"); /* do { // emit flush Draw - //emitFlushDrawToAll(&g_app_list, request_seq); + //emitFlushDrawToAll(&g_app_list, req_num); // emit status change event } while (!g_app_list.requestFinished());*/ } void App::process_request() { - unsigned req = g_app_list.currentSequenceNumber(); + 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) { std::string id(appid); std::string role(drawing_name); - unsigned current_seq = g_app_list.currentSequenceNumber(); - bool result = g_app_list.setEndDrawFinished(current_seq, id, role); + unsigned current_req = g_app_list.currentRequestNumber(); + bool result = g_app_list.setEndDrawFinished(current_req, id, role); if (!result) { @@ -1032,16 +1099,16 @@ void App::api_enddraw(char const *appid, char const *drawing_name) return; } - if (g_app_list.endDrawFullfilled(current_seq)) + if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw //this->stop_timer(); - this->do_enddraw(current_seq); + this->do_enddraw(current_req); this->stop_timer(); - g_app_list.removeRequest(current_seq); - HMI_SEQ_INFO(current_seq, "Finish request"); + g_app_list.removeRequest(current_req); + HMI_SEQ_INFO(current_req, "Finish request"); g_app_list.next(); if (g_app_list.haveRequest()) { @@ -1050,7 +1117,7 @@ void App::api_enddraw(char const *appid, char const *drawing_name) } else { - HMI_SEQ_INFO(current_seq, "Wait other App call endDraw"); + HMI_SEQ_INFO(current_req, "Wait other App call endDraw"); return; } } @@ -1149,6 +1216,14 @@ void App::emit_syncdraw(char const *label, char const *area, int x, int y, int w this->send_event(kListEventName[Event_SyncDraw], label, area, x, y, w, h); } +void App::emit_syncdraw(const std::string &role, const std::string &area) +{ + int x = 0, y = 0, w = 0, h = 0; + //this->lm_get_area_info(area, &x, &y, &w, &h); + this->send_event(kListEventName[Event_SyncDraw], + role.c_str(), area.c_str(), x, y, w, h); +} + void App::emit_flushdraw(char const *label) { this->send_event(kListEventName[Event_FlushDraw], label);