X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=be53808acfb328cc3df230d3ff15ad4d10c24bf8;hb=0602a4156ef549a2a229ba32b141f508230b43ad;hp=5021c05a031c683617fdb0ddccffc33b959c2120;hpb=39f0040a8518bf10ba96f2888a37f65faa3ede3d;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 5021c05..be53808 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -35,7 +35,7 @@ #include #include -#include "windowmanager-client.hpp" +#include "wm-client.hpp" #include "applist.hpp" extern "C" @@ -46,7 +46,7 @@ extern "C" namespace wm { -const unsigned TIME_OUT = 1000000UL; /* 1s */ +const unsigned TIME_OUT = 10000000UL; /* 10s */ /* DrawingArea name used by "{layout}.{area}" */ const char kNameLayoutNormal[] = "normal"; @@ -124,14 +124,21 @@ 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(); } } +void App::removeClient(const std::string &appid){ + HMI_DEBUG("wm", "Remove clinet %s from list", appid.c_str()); + app_list.removeClient(appid); +} + /** * App Impl */ @@ -407,11 +414,11 @@ void App::layout_commit() void App::set_timer(){ HMI_SEQ_DEBUG(app_list.currentSequenceNumber(), "Timer set activate"); - if (timer_ev_src != nullptr) + if (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) + TIME_OUT, 0, processTimerHandler, this); + CLOCK_REALTIME, time(NULL) * (1000000UL) + TIME_OUT, 1, processTimerHandler, this); if (ret < 0) { HMI_ERROR("wm", "Could't set timer"); @@ -420,7 +427,7 @@ void App::set_timer(){ else { // update timer limitation after second time - sd_event_source_set_time(timer_ev_src, time(NULL) + TIME_OUT); + sd_event_source_set_time(timer_ev_src, time(NULL) * (1000000UL) + TIME_OUT); sd_event_source_set_enabled(timer_ev_src, SD_EVENT_ONESHOT); } } @@ -436,6 +443,97 @@ void App::stop_timer(){ bool App::lm_release(const struct WMAction &action) { + //auto const &surface_id = this->lookup_id(drawing_name); + unsigned req_num = app_list.currentSequenceNumber(); + 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; + } + + if (*surface_id == this->layers.main_surface) + { + HMI_SEQ_ERROR(req_num, "Cannot deactivate main_surface"); + return false; + } + + auto o_state = *this->layers.get_layout_state(*surface_id); + + if (o_state == nullptr) + { + HMI_SEQ_ERROR(req_num, "Could not find layer for surface"); + return false; + } + + struct LayoutState &state = *o_state; + + if (state.main == -1) + { + HMI_SEQ_ERROR(req_num, "No surface active"); + return false; + } + + // Check against main_surface, main_surface_name is the configuration item. + if (*surface_id == this->layers.main_surface) + { + HMI_SEQ_DEBUG(req_num, "Refusing to deactivate main_surface %d", *surface_id); + //reply(nullptr); + return true; + } + if ((state.main == *surface_id) && (state.sub == *surface_id)) + { + HMI_SEQ_ERROR(req_num, "Surface is not active"); + return false; + } + + if (state.main == *surface_id) + { + if (state.sub != -1) + { + this->try_layout( + state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) { + std::string sub = std::move(*this->lookup_name(state.sub)); + + this->deactivate(*surface_id); + this->surface_set_layout(state.sub); + state = nl; + + this->layout_commit(); + 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); + this->enqueue_flushdraw(state.sub); + }); + } + else + { + this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) { + this->deactivate(*surface_id); + state = nl; + this->layout_commit(); + }); + } + } + else if (state.sub == *surface_id) + { + this->try_layout( + state, LayoutState{state.main, -1}, [&](LayoutState const &nl) { + std::string main = std::move(*this->lookup_name(state.main)); + + this->deactivate(*surface_id); + this->surface_set_layout(state.main); + state = nl; + + this->layout_commit(); + 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); + this->enqueue_flushdraw(state.main); + }); + } return true; } @@ -493,14 +591,20 @@ bool App::do_transition(unsigned req_num) return ret; } - /*client->emit_syncdraw(role); */ - // layer manager task + bool sync_draw_happen = false; for (const auto &y : app_list.getActions(req_num)) { - // do_task(y); but current we can't do this + /* + do_task(y); + */ + /* TODO + but current we can't do do_task, + so divide the processing into lm_layout_change and lm_release + */ 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()); @@ -508,6 +612,7 @@ bool App::do_transition(unsigned 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); @@ -518,14 +623,19 @@ bool App::do_transition(unsigned req_num) break; // TODO: if transition fails, what should we do? } + /* app_list.lookUpClient(y.appid)->emit_invisible(y.role, y.area); */ } } - if (ret) { - this->set_timer(); - } else { + if(!ret){ //this->emit_error(request_seq, 0 /*error_num*/, "error happens"); // test } + else if (ret && sync_draw_happen){ + this->set_timer(); + } + else{ + app_list.removeRequest(req_num); // HACK!!! + } return ret; } @@ -801,108 +911,23 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co HMI_SEQ_DEBUG(current, "%s start sequence with %s, %s", id.c_str(), role.c_str(), area.c_str()); + reply(nullptr); if (new_req != current) { // Add request, then invoked after the previous task is finished HMI_SEQ_DEBUG(new_req, "request is accepted"); - reply(nullptr); return; } /* * Do allocate tasks */ - //bool ret = this->do_transition(new_req); - - auto const &surface_id = this->lookup_id(drawing_name); - if (!surface_id) - { - reply("Surface does not exist"); - return; - } - - if (*surface_id == this->layers.main_surface) - { - reply("Cannot deactivate main_surface"); - return; - } - - auto o_state = *this->layers.get_layout_state(*surface_id); - - if (o_state == nullptr) - { - reply("Could not find layer for surface"); - return; - } - - struct LayoutState &state = *o_state; - - if (state.main == -1) - { - reply("No surface active"); - return; - } - - // Check against main_surface, main_surface_name is the configuration item. - if (*surface_id == this->layers.main_surface) - { - HMI_DEBUG("wm", "Refusing to deactivate main_surface %d", *surface_id); - reply(nullptr); - return; - } - if ((state.main == *surface_id) && (state.sub == *surface_id)) - { - reply("Surface is not active"); - return; - } - reply(nullptr); - - if (state.main == *surface_id) - { - if (state.sub != -1) - { - this->try_layout( - state, LayoutState{state.sub, -1}, [&](LayoutState const &nl) { - std::string sub = std::move(*this->lookup_name(state.sub)); - - this->deactivate(*surface_id); - this->surface_set_layout(state.sub); - state = nl; + bool ret = this->do_transition(new_req); - this->layout_commit(); - 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); - this->enqueue_flushdraw(state.sub); - }); - } - else - { - this->try_layout(state, LayoutState{-1, -1}, [&](LayoutState const &nl) { - this->deactivate(*surface_id); - state = nl; - this->layout_commit(); - }); - } - } - else if (state.sub == *surface_id) + if (!ret) { - this->try_layout( - state, LayoutState{state.main, -1}, [&](LayoutState const &nl) { - std::string main = std::move(*this->lookup_name(state.main)); - - this->deactivate(*surface_id); - this->surface_set_layout(state.main); - state = nl; - - this->layout_commit(); - 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); - this->enqueue_flushdraw(state.main); - }); + HMI_SEQ_ERROR(new_req, "failed to do_transition"); + //this->emit_error() } } @@ -990,6 +1015,8 @@ void App::api_enddraw(char const *appid, char const *drawing_name) //this->stop_timer(); this->do_enddraw(current_seq); + this->stop_timer(); + app_list.removeRequest(current_seq); HMI_SEQ_INFO(current_seq, "Finish request"); app_list.next(); @@ -1075,28 +1102,7 @@ void App::surface_removed(uint32_t surface_id) { HMI_DEBUG("wm", "surface_id is %u", surface_id); - // We cannot normally deactivate the main_surface, so be explicit - // about it: - if (int(surface_id) == this->layers.main_surface) - { - this->deactivate_main_surface(); - } - else - { - auto drawing_name = this->lookup_name(surface_id); - if (drawing_name) - { - std::string appid = ""; - /* auto = lookUpClient(surface_id); - appid = client->appID(); - - */ - this->api_deactivate_surface(appid.c_str(), drawing_name->c_str(), [](const char *) {}); - } - } - - this->id_alloc.remove_id(surface_id); - this->layers.remove_surface(surface_id); + app_list.removeSurface(surface_id); } void App::emit_activated(char const *label) @@ -1165,7 +1171,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, role); + app_list.addClient(appid_str, *lid, id, role); return Ok(id); }