X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=ba64671189f67a07834f2b74809fbc5d2f2ce08b;hb=c4d50e105fd1204bdf6cac88300d667c1af3d682;hp=d4c36f9327096720d190b07bb515a7612fb2909e;hpb=8f01fbeeca1a6f3d10ea42b312191532a4a830d4;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index d4c36f9..ba64671 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -397,7 +397,7 @@ void App::setTimer() { // firsttime set into sd_event int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src, - CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); + CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); if (ret < 0) { HMI_ERROR("wm", "Could't set timer"); @@ -482,7 +482,8 @@ WMError App::lm_release(const struct WMAction &action) state = nl; this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + std::string str_area = + std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); compositor::rect area_rect = this->area_info[state.sub]; this->emit_syncdraw(sub.c_str(), str_area.c_str(), area_rect.x, area_rect.y, area_rect.w, area_rect.h); @@ -509,10 +510,11 @@ WMError App::lm_release(const struct WMAction &action) state = nl; this->layout_commit(); - std::string str_area = std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); + std::string str_area = + std::string(kNameLayoutNormal) + "." + std::string(kNameAreaFull); compositor::rect area_rect = this->area_info[state.main]; this->emit_syncdraw(main.c_str(), str_area.c_str(), - area_rect.x, area_rect.y, area_rect.w, area_rect.h); + area_rect.x, area_rect.y, area_rect.w, area_rect.h); this->enqueue_flushdraw(state.main); }); } @@ -578,7 +580,8 @@ WMError App::checkPolicy(unsigned req_num) std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); // Change request area req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); - HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", trigger.area, req_area); + HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", + trigger.area, req_area); // set another action std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found); if (!found) @@ -627,7 +630,8 @@ WMError App::checkPolicy(unsigned req_num) HMI_SEQ_NOTICE(req_num, "Hack. This process will be removed. Change HomeScreen code!!"); req_area = "fullscreen"; } - TaskVisible task_visible = (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE; + TaskVisible task_visible = + (trigger.task == Task::TASK_ALLOCATE) ? TaskVisible::VISIBLE : TaskVisible::INVISIBLE; ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, task_visible); g_app_list.reqDump(); @@ -644,7 +648,8 @@ WMError App::startTransition(unsigned req_num) if (!found) { ret = WMError::NO_ENTRY; - HMI_SEQ_ERROR(req_num, "Window Manager bug :%s : Action is not set", errorDescription(ret)); + HMI_SEQ_ERROR(req_num, + "Window Manager bug :%s : Action is not set", errorDescription(ret)); return ret; } @@ -887,7 +892,8 @@ WMError App::setRequest(const std::string& appid, const std::string &role, const unsigned requested_num = g_app_list.getRequestNumber(appid); if (requested_num != 0) { - HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str()); + HMI_SEQ_INFO(requested_num, + "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str()); return REQ_REJECTED; } @@ -901,7 +907,8 @@ WMError App::setRequest(const std::string& appid, const std::string &role, const return WMError::SUCCESS; } -void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +void App::api_activate_surface(char const *appid, char const *drawing_name, + char const *drawing_area, const reply_func &reply) { ST(); @@ -943,7 +950,8 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char } } -void App::api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply) +void App::api_deactivate_surface(char const *appid, char const *drawing_name, + const reply_func &reply) { ST(); @@ -1035,13 +1043,15 @@ WMError App::doEndDraw(unsigned req_num) ret = this->layoutChange(act); if(ret != WMError::SUCCESS) { - HMI_SEQ_WARNING(req_num, "Failed to manipulate surfaces while state change : %s", errorDescription(ret)); + 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)); + 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()); @@ -1596,13 +1606,6 @@ void App::deactivate(int id) } } -void App::deactivate_main_surface() -{ - this->layers.main_surface = -1; - std::string appid = "HomeScreen"; - this->api_deactivate_surface(appid.c_str(), this->layers.main_surface_name.c_str(), [](const char *) {}); -} - bool App::can_split(struct LayoutState const &state, int new_id) { if (state.main != -1 && state.main != new_id)