X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=48c674002af05b0e75928cde301f1f469a2d3c9e;hb=91a38260c68db9cf9732a905680523bba820079d;hp=d44986ed3f08a493be11276b9881b5b77fabbf38;hpb=1be43a5f46ffe04d530e093077337c6582fd81d1;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index d44986e..48c6740 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -124,12 +124,7 @@ void App::timerHandler() 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()) - { - this->process_request(); - } + this->processNextRequest(); } void App::removeClient(const std::string &appid) @@ -360,7 +355,7 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) h = this->controller->output_size.h + 1 + h; } - if (sub_surface_id) + /* if (sub_surface_id) { if (o_layer_id != this->layers.get_layer_id(*sub_surface_id)) { @@ -397,7 +392,7 @@ void App::surface_set_layout(int surface_id, optional sub_surface_id) this->area_info[*sub_surface_id].y = y; this->area_info[*sub_surface_id].w = w; this->area_info[*sub_surface_id].h = h; - } + } */ HMI_DEBUG("wm", "surface_set_layout for surface %u on layer %u", surface_id, layer_id); @@ -421,7 +416,7 @@ void App::layout_commit() this->display->flush(); } -void App::set_timer() +void App::setTimer() { HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) @@ -442,7 +437,7 @@ void App::set_timer() } } -void App::stop_timer() +void App::stopTimer() { unsigned req_num = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer stop"); @@ -550,7 +545,7 @@ WMError App::lm_release(const struct WMAction &action) return WMError::SUCCESS; } -WMError 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()); @@ -561,28 +556,28 @@ WMError App::lm_layout_change(const struct WMAction &action) } this->lm_layout_change(action.role.c_str()); return WMError::SUCCESS; -} +} */ -WMError App::do_transition(unsigned req_num) +WMError App::doTransition(unsigned req_num) { - HMI_SEQ_DEBUG(req_num, "check next state"); - WMError ret = this->check_policy(req_num); + HMI_SEQ_DEBUG(req_num, "check policy"); + WMError ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { return ret; } HMI_SEQ_DEBUG(req_num, "Start transition."); - ret = this->start_transition(req_num); + ret = this->startTransition(req_num); return ret; } -WMError App::check_policy(unsigned req_num) +WMError App::checkPolicy(unsigned req_num) { /* * Check Policy */ // get current trigger - bool found; + bool found, split; WMError ret = WMError::LAYOUT_CHANGE_FAIL; auto trigger = g_app_list.getRequest(req_num, &found); if (!found) @@ -590,17 +585,17 @@ WMError App::check_policy(unsigned req_num) ret = WMError::NO_ENTRY; return ret; } - bool is_activate = (trigger.task == Task::TASK_ALLOCATE); std::string req_area = trigger.area; // >>>> Compatible with current window manager until policy manager coming - if (is_activate) + if (trigger.task == Task::TASK_ALLOCATE) { + HMI_SEQ_DEBUG(req_num, "Check split or not"); const char *msg = this->check_surface_exist(trigger.role.c_str()); if (msg) { - HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), msg); + HMI_SEQ_ERROR(req_num, msg); ret = WMError::LAYOUT_CHANGE_FAIL; return ret; } @@ -610,10 +605,11 @@ WMError App::check_policy(unsigned req_num) struct LayoutState &state = *o_state; unsigned curernt_sid = state.main; - bool can_split = this->can_split(state, *surface_id); + bool split = this->can_split(state, *surface_id); - if (can_split) + if (split) { + HMI_SEQ_DEBUG(req_num, "Split happens"); // Get current visible role std::string add_role = this->lookup_name(state.main).value(); // Set next area @@ -631,7 +627,15 @@ WMError App::check_policy(unsigned req_num) 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); + bool visible = true; + bool end_draw_finished = false; + WMAction split_action{ + add_name, + add_role, + add_area, + visible, + end_draw_finished}; + WMError ret = g_app_list.setAction(req_num, split_action); if (ret != WMError::SUCCESS) { HMI_SEQ_ERROR(req_num, "Failed to set action"); @@ -640,18 +644,29 @@ WMError App::check_policy(unsigned req_num) g_app_list.reqDump(); } } - // >>>> This will be removed + else + { + HMI_SEQ_DEBUG(req_num, "split doesn't happen"); + } + + // Set invisible task(Remove if policy manager finish) + ret = this->setInvisibleTask(trigger.role, split); + if(ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set invisible task: %s", errorDescription(ret)); + return ret; + } /* get new status from Policy Manager */ HMI_SEQ_NOTICE(req_num, "ATM, Policy manager does't exist, then set WMAction as is"); - ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate); + ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, trigger.task); g_app_list.reqDump(); return ret; } -WMError App::start_transition(unsigned req_num) +WMError App::startTransition(unsigned req_num) { bool sync_draw_happen = false; bool found = false; @@ -678,7 +693,7 @@ WMError App::start_transition(unsigned req_num) if (sync_draw_happen) { - this->set_timer(); + this->setTimer(); } else { @@ -697,7 +712,188 @@ WMError App::start_transition(unsigned req_num) return ret; } -void App::lm_layout_change(const char *drawing_name) +WMError App::setInvisibleTask(const std::string &role, bool split) +{ + unsigned req = g_app_list.currentRequestNumber(); + HMI_SEQ_DEBUG(req, "set current visible app to invisible task"); + // This task is copied from original actiavete surface + const char *drawing_name = role.c_str(); + auto const &surface_id = this->lookup_id(drawing_name); + auto layer_id = this->layers.get_layer_id(*surface_id); + auto o_state = *this->layers.get_layout_state(*surface_id); + struct LayoutState &state = *o_state; + std::string add_name, add_role; + std::string add_area = ""; + int surface; + bool visible = false; + bool end_draw_finished = true; + bool found = false; + + for (auto const &l : this->layers.mapping) + { + if (l.second.layer_id <= *layer_id) + { + continue; + } + if (l.second.state.main != -1) + { + //this->deactivate(l.second.state.main); + surface = l.second.state.main; + add_role = *this->id_alloc.lookup(surface); + add_name = g_app_list.getAppID(surface, add_role, &found); + if(!found){ + return WMError::NOT_REGISTERED; + } + HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, act); + l.second.state.main = -1; + } + + if (l.second.state.sub != -1) + { + //this->deactivate(l.second.state.sub); + surface = l.second.state.sub; + add_role = *this->id_alloc.lookup(surface); + add_name = g_app_list.getAppID(surface, add_role, &found); + if (!found) + { + return WMError::NOT_REGISTERED; + } + HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str()); + WMAction act{add_name, add_role, add_area, visible, end_draw_finished}; + g_app_list.setAction(req, act); + l.second.state.sub = -1; + } + } + + // change current state here, but this is hack + auto layer = this->layers.get_layer(*layer_id); + + if (state.main == -1) + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + //this->surface_set_layout(*surface_id); + state = nl; + + //compositor::rect area_rect = this->area_info[*surface_id]; + }); + } + else + { + if (0 == strcmp(drawing_name, "HomeScreen")) + { + // Nothing To do + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + }); + } + else + { + if (split) + { + this->try_layout( + state, + LayoutState{state.main, *surface_id}, + [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutSplit); + std::string main = + std::move(*this->id_alloc.lookup(state.main)); + if (state.sub != *surface_id) + { + if (state.sub != -1) + { + //this->deactivate(state.sub); + WMAction deact_sub; + deact_sub.role = main; + deact_sub.area = add_area; + deact_sub.appid = g_app_list.getAppID(state.sub, main, &found); + if(!found){ + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + + /* std::string str_area_main = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); + 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); + // >>> HACK */ + }); + } + else + { + this->try_layout( + state, LayoutState{*surface_id}, [&](LayoutState const &nl) { + HMI_DEBUG("wm", "Layout: %s", kNameLayoutNormal); + + //this->surface_set_layout(*surface_id); + if (state.main != *surface_id) + { + // this->deactivate(state.main); + WMAction deact_main; + deact_main.role = std::move(*this->id_alloc.lookup(state.main)); + ; + deact_main.area = add_area; + deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found); + if (!found) + { + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_main.visible = visible; + deact_main.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_main); + } + if (state.sub != -1) + { + if (state.sub != *surface_id) + { + //this->deactivate(state.sub); + WMAction deact_sub; + deact_sub.role = std::move(*this->id_alloc.lookup(state.sub)); + ; + deact_sub.area = add_area; + deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); + if (!found) + { + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + return WMError::NOT_REGISTERED; + } + deact_sub.visible = visible; + deact_sub.end_draw_finished = end_draw_finished; + HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist"); + g_app_list.setAction(req, deact_sub); + } + } + state = nl; + }); + } + } + } + + return WMError::SUCCESS; +} + +/* void App::lm_layout_change(const char *drawing_name) { auto const &surface_id = this->lookup_id(drawing_name); auto layer_id = this->layers.get_layer_id(*surface_id); @@ -851,7 +1047,7 @@ void App::lm_layout_change(const char *drawing_name) } } } -} +} */ const char *App::check_surface_exist(const char *drawing_name) { @@ -889,7 +1085,7 @@ const char *App::check_surface_exist(const char *drawing_name) //reply(nullptr); } -WMError App::set_request(const std::string& appid, const std::string &role, const std::string &area, +WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area, Task task, unsigned* req_num) { if (!g_app_list.contains(appid)) @@ -931,7 +1127,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char unsigned req_num = 0; WMError ret = WMError::UNKNOWN; - ret = this->set_request(id, role, area, task, &req_num); + ret = this->setRequest(id, role, area, task, &req_num); if(ret != WMError::SUCCESS) { @@ -951,7 +1147,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Do allocate tasks */ - ret = this->do_transition(req_num); + ret = this->doTransition(req_num); if (ret != WMError::SUCCESS) { @@ -1010,7 +1206,7 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Do allocate tasks */ - WMError ret = this->do_transition(new_req); + WMError ret = this->doTransition(new_req); if (ret != WMError::SUCCESS) { @@ -1044,7 +1240,7 @@ void App::check_flushdraw(int surface_id) } } -void App::lm_enddraw(const char *drawing_name) +/* void App::lm_enddraw(const char *drawing_name) { HMI_DEBUG("wm", "end draw %s", drawing_name); for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) @@ -1058,75 +1254,196 @@ void App::lm_enddraw(const char *drawing_name) this->emit_flushdraw(drawing_name); } } -} +} */ -void App::do_enddraw(unsigned req_num) +WMError App::doEndDraw(unsigned req_num) { // get actions bool found; auto actions = g_app_list.getActions(req_num, &found); + WMError ret = WMError::SUCCESS; if (!found) { - WMError err = WMError::NO_ENTRY; - HMI_SEQ_ERROR(req_num, errorDescription(err)); - return; + ret = WMError::NO_ENTRY; + return ret; } HMI_SEQ_INFO(req_num, "do endDraw"); + // layout change and make it visible + + // Temporary action + /* auto itr = actions.cend(); + this->currentAppInvisible(itr->role); */ for (const auto &act : actions) { + // layout change + if(!g_app_list.contains(act.appid)){ + ret = WMError::NOT_REGISTERED; + } + ret = this->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); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); + return ret; + } HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str()); - this->lm_enddraw(act.role.c_str()); + //this->lm_enddraw(act.role.c_str()); } HMI_SEQ_INFO(req_num, "emit flushDraw"); - /* do + + for(const auto &act_flush : actions) { - // emit flush Draw - //emitFlushDrawToAll(&g_app_list, req_num); - // emit status change event - } while (!g_app_list.requestFinished());*/ + if(act_flush.visible) + { + this->emit_flushdraw(act_flush.role.c_str()); + } + } + + return ret; } -void App::process_request() +WMError App::setSurfaceSize(unsigned surface, const std::string &area) { - unsigned req = g_app_list.currentRequestNumber(); - HMI_SEQ_DEBUG(req, "Do next request"); - WMError rc = do_transition(req); - if(rc != WMError::SUCCESS){ - HMI_SEQ_ERROR(req, errorDescription(rc)); + // Actually this function is under Layout Manager + /* compositor::rect size = this->lm.getAreaSize(area); // compositor::rect size = this->lm_.getAreaSize(area); + + if (!this->controller->surface_exists(surface)) + { + // Block until all pending request are processed by wayland display server + // because waiting for the surface of new app is created + this->display->roundtrip(); } + auto &s = this->controller->surfaces[surface]; + s->set_destination_rectangle(size.x, size.y, size.w, size.h); + this->layout_commit(); + + // Update area information + this->area_info[surface].x = size.x; + this->area_info[surface].y = size.y; + this->area_info[surface].w = size.w; + this->area_info[surface].h = size.h; + HMI_DEBUG("wm", "Surface %d rect { %d, %d, %d, %d }", + surface, size.x, size.y, size.w, size.h); */ + this->surface_set_layout(surface); + + return WMError::SUCCESS; +} + +WMError App::layoutChange(const WMAction &action) +{ + if (action.visible == false) + { + return WMError::SUCCESS; + } + auto client = g_app_list.lookUpClient(action.appid); + unsigned surface = client->surfaceID(action.role); + if (surface == 0) + { + HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), + "client doesn't have surface with role(%s)", action.role.c_str()); + return WMError::NOT_REGISTERED; + } + // Layout Manager + WMError ret = this->setSurfaceSize(surface, action.area); + return ret; +} + +/* void App::currentAppInvisible(const std::string &role) +{ + const char *drawing_name = role.c_str(); + auto const &surface_id = this->lookup_id(drawing_name); + auto layer_id = this->layers.get_layer_id(*surface_id); + auto o_state = *this->layers.get_layout_state(*surface_id); + struct LayoutState &state = *o_state; + + // disable layers that are above our current layer + for (auto const &l : this->layers.mapping) + { + if (l.second.layer_id <= *layer_id) + { + continue; + } + + bool flush = false; + if (l.second.state.main != -1) + { + this->deactivate(l.second.state.main); + l.second.state.main = -1; + flush = true; + } + + if (l.second.state.sub != -1) + { + this->deactivate(l.second.state.sub); + l.second.state.sub = -1; + flush = true; + } + + if (flush) + { + this->layout_commit(); + } + } +} */ + +WMError App::visibilityChange(const WMAction &action) +{ + auto client = g_app_list.lookUpClient(action.appid); + unsigned surface = client->surfaceID(action.role); + if(surface == 0) + { + HMI_SEQ_ERROR(g_app_list.currentRequestNumber(), + "client doesn't have surface with role(%s)", action.role.c_str()); + return WMError::NOT_REGISTERED; + } + + if (action.visible) + { + this->activate(surface); // Layout Manager task + } + else + { + this->deactivate(surface); // Layout Manager task + } + return WMError::SUCCESS; } void App::api_enddraw(char const *appid, char const *drawing_name) { - std::string id(appid); - std::string role(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); if (!result) { - HMI_ERROR("wm", "%s doesn't have Window Resource", id.c_str()); + HMI_ERROR("wm", "%s is not in transition state", id.c_str()); return; } if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw - //this->stop_timer(); - this->do_enddraw(current_req); - - this->stop_timer(); + this->stopTimer(); + WMError ret = this->doEndDraw(current_req); - g_app_list.removeRequest(current_req); - HMI_SEQ_INFO(current_req, "Finish request"); - g_app_list.next(); - if (g_app_list.haveRequest()) + if(ret != WMError::SUCCESS) { - this->process_request(); + //this->emit_error(); } + HMI_SEQ_INFO(current_req, "Finish request status: %s", errorDescription(ret)); + + g_app_list.removeRequest(current_req); + + this->processNextRequest(); } else { @@ -1135,6 +1452,26 @@ void App::api_enddraw(char const *appid, char const *drawing_name) } } +void App::processNextRequest() +{ + g_app_list.next(); + g_app_list.reqDump(); + unsigned req_num = g_app_list.currentRequestNumber(); + if (g_app_list.haveRequest()) + { + HMI_SEQ_DEBUG(req_num, "Process next request"); + WMError rc = doTransition(req_num); + if (rc != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, errorDescription(rc)); + } + } + else + { + HMI_SEQ_DEBUG(req_num, "Nothing Request. Waiting Request"); + } +} + void App::api_ping() { this->dispatch_pending_events(); } void App::send_event(char const *evname, char const *label)