X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=c30223c98195302341d8b02ee0bec1ff7120c328;hb=eb892f6103c8bb2d95e6fd5274d2bac7d7f0b6fb;hp=1802c338d6e8b7ef66da6a96a574b3612ce134d9;hpb=a181459365cdf50a72b26b1f770577096ba19d4a;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 1802c33..c30223c 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" @@ -46,7 +46,7 @@ extern "C" namespace wm { -const unsigned TIME_OUT = 10000000UL; /* 10s */ +const unsigned kTimeOut = 10000000UL; /* 10s */ /* DrawingArea name used by "{layout}.{area}" */ const char kNameLayoutNormal[] = "normal"; @@ -68,11 +68,9 @@ const char kKeyHeightPixel[] = "height_pixel"; const char kKeyWidthMm[] = "width_mm"; const char kKeyHeightMm[] = "height_mm"; -static const std::string task_allocate = "allocate"; -static const std::string task_release = "release"; -static sd_event_source *timer_ev_src = nullptr; +static sd_event_source *g_timer_ev_src = nullptr; -static AppList app_list; +static AppList g_app_list; namespace { @@ -122,31 +120,26 @@ processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata) void App::timerHandler() { - unsigned seq = app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer expired remove Request"); - app_list.req_dump(); - app_list.removeRequest(seq); - app_list.next(); - app_list.req_dump(); - if (app_list.haveRequest()) - { - this->process_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(req_num); + this->processNextRequest(); } void App::removeClient(const std::string &appid) { HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); - app_list.removeClient(appid); + g_app_list.removeClient(appid); } bool App::subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname) { - if(!app_list.contains(appid)){ + if(!g_app_list.contains(appid)){ HMI_DEBUG("wm", "Client %s is not registered", appid.c_str()); return false; } - auto client = app_list.lookUpClient(appid); + auto client = g_app_list.lookUpClient(appid); return client->subscribe(req, evname); } @@ -362,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)) { @@ -399,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); @@ -423,14 +416,14 @@ void App::layout_commit() this->display->flush(); } -void App::set_timer() +void App::setTimer() { - HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate"); - if (timer_ev_src == nullptr) + HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); + if (g_timer_ev_src == nullptr) { // firsttime set into sd_event - int ret = sd_event_add_time(afb_daemon_get_event_loop(), &timer_ev_src, - CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 1, processTimerHandler, this); + int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src, + CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this); if (ret < 0) { HMI_ERROR("wm", "Could't set timer"); @@ -439,37 +432,38 @@ void App::set_timer() else { // update timer limitation after second time - sd_event_source_set_time(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT); - sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT); + sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut); + sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT); } } -void App::stop_timer() +void App::stopTimer() { - unsigned seq = app_list.currentSequenceNumber(); - HMI_SEQ_DEBUG(seq, "Timer stop"); - int rc = sd_event_source_set_enabled(timer_ev_src, SD_EVENT_OFF); + 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 = 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); @@ -477,7 +471,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; @@ -485,7 +479,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. @@ -493,12 +487,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) @@ -548,113 +542,183 @@ 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(app_list.currentSequenceNumber(), msg); - //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; +} + +WMError App::doTransition(unsigned 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->startTransition(req_num); + return ret; } -bool App::do_transition(unsigned req_num) +WMError App::checkPolicy(unsigned req_num) { /* * Check Policy */ // get current trigger - auto trigger = 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){ - 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; + + unsigned curernt_sid = state.main; + bool can_split = this->can_split(state, *surface_id); - or + 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 + + /* get new status from Policy Manager */ + 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 = "navigation"; + + 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 + bool visible = true; + bool end_draw_finished = false; + WMAction new_act{add_name, add_role, add_area, visible, end_draw_finished}; + WMError ret = g_app_list.setAction(req_num, new_act); + if (ret != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req_num, "Failed to set action"); + return ret; + } + g_app_list.reqDump(); + } + } + // >>>> This will be removed - translator.inputActionFromLayout(newLayout, currentLayout, &app_list, req_num); + // Set invisible task + this->setInvisibleTask(trigger.role, can_split); - /* 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 (TASK_RELEASE == trigger.task) - { - is_activate = false; - } - bool ret = app_list.setAction(req_num, trigger.appid, trigger.role, trigger.area, is_activate); - app_list.req_dump(); + ret = g_app_list.setAction(req_num, trigger.appid, trigger.role, req_area, is_activate); + g_app_list.reqDump(); + + return ret; +} - if (!ret) +WMError App::startTransition(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 : 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()); - app_list.removeRequest(req_num); - break; - // TODO: if transition fails, what should we do? - } - /* 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()); - app_list.removeRequest(req_num); - break; - // TODO: if transition fails, what should we do? - } - /* 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) + if (sync_draw_happen) { - //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test - } - else if (ret && sync_draw_happen) - { - this->set_timer(); + this->setTimer(); } else { - 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; } @@ -760,10 +824,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); @@ -840,61 +915,77 @@ const char *App::check_surface_exist(const char *drawing_name) //reply(nullptr); } -void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area, + Task task, unsigned* req_num) { - ST(); - - /* - * Check Phase - */ - - std::string id = appid; - std::string role = drawing_name; - std::string area = drawing_area; - - if (!app_list.contains(id)) + if (!g_app_list.contains(appid)) { - reply("app doesn't request 'requestSurface' yet"); - return; + return WMError::NOT_REGISTERED; } - auto client = app_list.lookUpClient(id); + auto client = g_app_list.lookUpClient(appid); /* * Queueing Phase */ - unsigned current = app_list.currentSequenceNumber(); - unsigned requested_num = app_list.getSequenceNumber(id); + unsigned current = g_app_list.currentRequestNumber(); + unsigned requested_num = g_app_list.getRequestNumber(appid); 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()); - reply("already requested"); - return; + HMI_SEQ_INFO(requested_num, "%s %s %s request is already queued", appid.c_str(), role.c_str(), area.c_str()); + return REQ_REJECTED; } - WMRequest req = WMRequest(id, role, area, Task::TASK_ALLOCATE); - unsigned new_req = app_list.addAllocateRequest(req); - app_list.req_dump(); + WMRequest req = WMRequest(appid, role, area, task); + unsigned new_req = g_app_list.addAllocateRequest(req); + *req_num = new_req; + g_app_list.reqDump(); - HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); + HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", appid.c_str(), role.c_str(), area.c_str()); + + return WMError::SUCCESS; +} + +void App::api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply) +{ + ST(); + + std::string id = appid; + std::string role = drawing_name; + std::string area = drawing_area; + Task task = Task::TASK_ALLOCATE; + unsigned req_num = 0; + WMError ret = WMError::UNKNOWN; + + ret = this->setRequest(id, role, area, task, &req_num); + + if(ret != WMError::SUCCESS) + { + HMI_ERROR("wm", errorDescription(ret)); + reply("Failed to set request"); + return; + } reply(nullptr); - if (new_req != current) + if (req_num != g_app_list.currentRequestNumber()) { // Add request, then invoked after the previous task is finished - HMI_SEQ_DEBUG(new_req, "request is accepted"); + HMI_SEQ_DEBUG(req_num, "request is accepted"); return; } /* * Do allocate tasks */ - bool ret = this->do_transition(new_req); + ret = this->doTransition(req_num); - if (!ret) + if (ret != WMError::SUCCESS) { - HMI_SEQ_ERROR(new_req, "failed to do_transition"); //this->emit_error() + HMI_SEQ_ERROR(req_num, errorDescription(ret)); + g_app_list.removeRequest(req_num); + g_app_list.next(); + g_app_list.reqDump(); } } @@ -909,18 +1000,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 (!app_list.contains(id)) + if (!g_app_list.contains(id)) { reply("app doesn't request 'requestSurface' yet"); return; } - auto client = app_list.lookUpClient(id); + auto client = g_app_list.lookUpClient(id); /* * Queueing Phase */ - unsigned current = app_list.currentSequenceNumber(); - unsigned requested_num = 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()); @@ -929,8 +1020,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 = app_list.addAllocateRequest(req); - app_list.req_dump(); + unsigned new_req = g_app_list.addAllocateRequest(req); + g_app_list.reqDump(); HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); @@ -945,11 +1036,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->doTransition(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() } } @@ -993,70 +1086,231 @@ void App::lm_enddraw(const char *drawing_name) } } -void App::do_enddraw(unsigned request_seq) +WMError App::doEndDraw(unsigned req_num) { // get actions - auto actions = app_list.getActions(request_seq); - HMI_SEQ_INFO(request_seq, "do endDraw"); + bool found; + auto actions = g_app_list.getActions(req_num, &found); + WMError ret = WMError::SUCCESS; + if (!found) + { + 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) { - HMI_SEQ_DEBUG(request_seq, "visible %s", act.role.c_str()); - this->lm_enddraw(act.role.c_str()); + // 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()); } - HMI_SEQ_INFO(request_seq, "emit flushDraw"); - /* do + HMI_SEQ_INFO(req_num, "emit flushDraw"); + + for(const auto &act_flush : actions) { - // emit flush Draw - //emitFlushDrawToAll(&app_list, request_seq); - // emit status change event - } while (!app_list.requestFinished());*/ + if(act_flush.visible) + { + this->emit_flushdraw(act_flush.role.c_str()); + } + } } -void App::process_request() +void App::processRequest() { - unsigned req = app_list.currentSequenceNumber(); + unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); - do_transition(req); + WMError rc = doTransition(req); + if(rc != WMError::SUCCESS) + { + HMI_SEQ_ERROR(req, errorDescription(rc)); + } +} + +WMError App::setSurfaceSize(unsigned surface, const std::string &area) +{ + // 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(act.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); - unsigned current_seq = app_list.currentSequenceNumber(); - bool result = app_list.setEndDrawFinished(current_seq, id, role); + 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 (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->stopTimer(); + WMError ret = this->doEndDraw(current_req); - this->stop_timer(); - - app_list.removeRequest(current_seq); - HMI_SEQ_INFO(current_seq, "Finish request"); - app_list.next(); - if (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 { - HMI_SEQ_INFO(current_seq, "Wait other App call endDraw"); + HMI_SEQ_INFO(current_req, "Wait other App call endDraw"); return; } } +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) @@ -1133,7 +1387,7 @@ void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - app_list.removeSurface(surface_id); + g_app_list.removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1151,6 +1405,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); @@ -1202,8 +1464,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); - //app_list.addClient(appid_str, role); - app_list.addClient(appid_str, *lid, id, role); + //g_app_list.addClient(appid_str, role); + g_app_list.addClient(appid_str, *lid, id, role); return Ok(id); }